author | sandman <sandman> | 2002-09-26 17:37:50 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-26 17:37:50 (UTC) |
commit | df3a5b9afa34fa45d06e211f415f74c38017a917 (patch) (side-by-side diff) | |
tree | 3a5f5825badd598ba82227645cb2f00941265a07 /core/launcher | |
parent | e7c2c104d59ef090fbc2f7dbcb052e22e0f5d591 (diff) | |
download | opie-df3a5b9afa34fa45d06e211f415f74c38017a917.zip opie-df3a5b9afa34fa45d06e211f415f74c38017a917.tar.gz opie-df3a5b9afa34fa45d06e211f415f74c38017a917.tar.bz2 |
Qtopia 1.6 merge:
Launcher tabs can now each have their own background, icon-size and font.
-rw-r--r-- | core/launcher/launcher.cpp | 354 | ||||
-rw-r--r-- | core/launcher/launcher.h | 13 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 470 | ||||
-rw-r--r-- | core/launcher/launcherview.h | 29 |
4 files changed, 679 insertions, 187 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index fd89410..dc81c9e 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp @@ -1,6 +1,5 @@ /********************************************************************** -** Copyright (c) 2002 Holger zecke Freyther -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -25,4 +24,5 @@ -#include <qpe/config.h> +#ifdef QWS #include <qpe/qcopenvelope_qws.h> +#endif #include <qpe/resource.h> @@ -36,5 +36,8 @@ -#include <qdatetime.h> +#include <qpe/version.h> + #include <qdir.h> +#ifdef QWS #include <qwindowsystem_qws.h> +#endif #include <qtimer.h> @@ -54,2 +57,3 @@ #include <qtextstream.h> +#include <qpopupmenu.h> @@ -73,7 +77,3 @@ #include "mediummountgui.h" -//#define SHOW_ALL - -// uidGen -// uidGen namespace { @@ -110,2 +110,19 @@ namespace { + +//#define SHOW_ALL + +class CategoryTab : public QTab +{ +public: + CategoryTab( const QIconSet &icon, const QString &text=QString::null ) + : QTab( icon, text ) + { + } + + QColor bgColor; + QColor fgColor; +}; + +//=========================================================================== + CategoryTabWidget::CategoryTabWidget( QWidget* parent ) : @@ -142,5 +159,5 @@ void CategoryTabWidget::addItem( const QString& linkfile ) delete app; - return; + app=0; } - if ( !app->file().isEmpty() ) { + if ( !app || !app->file().isEmpty() ) { // A document @@ -148,5 +165,11 @@ void CategoryTabWidget::addItem( const QString& linkfile ) app = new DocLnk(linkfile); + if ( app->fileKnown() ) { ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app); + } else { + ((LauncherView*)(stack->widget(ids.count()-1)))->sort(); + delete app; + } return; } + // An application for ( QStringList::Iterator it=ids.begin(); it!=ids.end(); ++it) { @@ -161,2 +184,4 @@ void CategoryTabWidget::addItem( const QString& linkfile ) } + + QCopEnvelope e("QPE/TaskBar","reloadApps()"); } @@ -179,2 +204,4 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, + Config cfg("Launcher"); + QStringList types = rootFolder->types(); @@ -182,3 +209,4 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, if ( !(*it).isEmpty() ) { - newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it)); + (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it)); + setTabAppearance( *it, cfg ); } @@ -188,3 +216,3 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, while ( (l=it.current()) ) { - if ( l->type() == "Separator" ) { + if ( l->type() == "Separator" ) { // No tr rootFolder->remove(l); @@ -206,3 +234,7 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, // all documents - docview = newView( QString::null, Resource::loadPixmap("DocsIcon"), tr("Documents")); + QImage img( Resource::loadImage( "DocsIcon" ) ); + QPixmap pm; + pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); + docview = newView( "Documents", // No tr + pm, tr("Documents")); docview->populate( docFolder, QString::null ); @@ -211,2 +243,3 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, docview->setToolsEnabled(TRUE); + setTabAppearance( "Documents", cfg ); // No tr @@ -220,2 +253,44 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder, +void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg ) +{ + QString grp( "Tab %1" ); // No tr + cfg.setGroup( grp.arg(id) ); + LauncherView *v = view( id ); + int idx = ids.findIndex( id ); + CategoryTab *tab = (CategoryTab *)categoryBar->tab( idx ); + + // View + QString view = cfg.readEntry( "View", "Icon" ); + if ( view == "List" ) // No tr + v->setViewMode( LauncherView::List ); + QString bgType = cfg.readEntry( "BackgroundType", "Ruled" ); + if ( bgType == "Image" ) { // No tr + QString pm = cfg.readEntry( "BackgroundImage", "wallpaper/marble" ); + v->setBackgroundType( LauncherView::Image, pm ); + } else if ( bgType == "SolidColor" ) { + QString c = cfg.readEntry( "BackgroundColor" ); + v->setBackgroundType( LauncherView::SolidColor, c ); + } + QString textCol = cfg.readEntry( "TextColor" ); + if ( textCol.isEmpty() ) + v->setTextColor( QColor() ); + else + v->setTextColor( QColor(textCol) ); + QStringList font = cfg.readListEntry( "Font", ',' ); + if ( font.count() == 4 ) + v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) ); + + // Tabs + QString tabCol = cfg.readEntry( "TabColor" ); + if ( tabCol.isEmpty() ) + tab->bgColor = QColor(); + else + tab->bgColor = QColor(tabCol); + QString tabTextCol = cfg.readEntry( "TabTextColor" ); + if ( tabTextCol.isEmpty() ) + tab->fgColor = QColor(); + else + tab->fgColor = QColor(tabTextCol); +} + void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs) @@ -228,2 +303,22 @@ void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> +void CategoryTabWidget::tabProperties() +{ + LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() ); + QPopupMenu *m = new QPopupMenu( this ); + m->insertItem( tr("Icon View"), LauncherView::Icon ); + m->insertItem( tr("List View"), LauncherView::List ); + m->setItemChecked( (int)view->viewMode(), TRUE ); + int rv = m->exec( QCursor::pos() ); + if ( rv >= 0 && rv != view->viewMode() ) { + view->setViewMode( (LauncherView::ViewMode)rv ); + } + + delete m; +} + +QString CategoryTabWidget::getAllDocLinkInfo() const +{ + return docview->getAllDocLinkInfo(); +} + LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label ) @@ -236,3 +331,3 @@ LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, ids.append(id); - categoryBar->addTab( new QTab( pm, label ) ); + categoryBar->addTab( new CategoryTab( pm, label ) ); stack->addWidget( view, tabs++ ); @@ -272,2 +367,9 @@ void CategoryTabWidget::setBusy(bool on) +LauncherView *CategoryTabWidget::view( const QString &id ) +{ + int idx = ids.findIndex( id ); + return (LauncherView *)stack->widget(idx); +} + +//=========================================================================== @@ -290,2 +392,4 @@ void CategoryTabBar::layoutTabs() // int percentFalloffTable[] = { 100, 70, 40, 12, 6, 3, 1, 0 }; + int available = width()-1; + QFontMetrics fm = fontMetrics(); int hiddenTabWidth = -7; @@ -294,3 +398,2 @@ void CategoryTabBar::layoutTabs() style().tabbarMetrics( this, hframe, vframe, overlap ); - QFontMetrics fm = fontMetrics(); int x = 0; @@ -298,9 +401,9 @@ void CategoryTabBar::layoutTabs() QTab *t; - int available = width()-1; int required = 0; + int eventabwidth = (width()-1)/count(); + enum Mode { HideBackText, Pack, Even } mode=Even; for ( int i = 0; i < count(); i++ ) { t = tab(i); - // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) { + int iw = fm.width( t->text() ) + hframe - overlap; if ( i != middleTab ) { - // required += hiddenTabWidth + hframe - overlap; available -= hiddenTabWidth + hframe - overlap; @@ -308,12 +411,33 @@ void CategoryTabBar::layoutTabs() available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width(); - } else { - required += fm.width( t->text() ) + hframe - overlap; - if ( t->iconSet() != 0 ) - required += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width(); - } } + if ( t->iconSet() != 0 ) + iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width(); + required += iw; + // As space gets tight, packed looks better than even. "10" must be at least 0. + if ( iw >= eventabwidth-10 ) + mode = Pack; + } + if ( mode == Pack && required > width()-1 ) + mode = HideBackText; for ( int i = 0; i < count(); i++ ) { t = tab(i); - // if (( i < (middleTab - 1) ) || ( i > (middleTab + 1) )) { - if ( i != middleTab ) { + if ( mode != HideBackText ) { + int w = fm.width( t->text() ); + int ih = 0; + if ( t->iconSet() != 0 ) { + w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width(); + ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height(); + } + int h = QMAX( fm.height(), ih ); + h = QMAX( h, QApplication::globalStrut().height() ); + + h += vframe; + w += hframe; + + QRect tr(x, 0, + mode == Even ? eventabwidth : w * (width()-1)/required, h); + t->setRect(tr); + x += tr.width() - overlap; + r = r.unite(tr); + } else if ( i != middleTab ) { int w = hiddenTabWidth; @@ -334,6 +458,4 @@ void CategoryTabBar::layoutTabs() } else { - int w = fm.width( t->text() ); int ih = 0; if ( t->iconSet() != 0 ) { - w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width(); ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height(); @@ -344,5 +466,3 @@ void CategoryTabBar::layoutTabs() h += vframe; - w += hframe; - // t->setRect( QRect(x, 0, w * available/required, h) ); t->setRect( QRect(x, 0, available, h) ); @@ -369,2 +489,15 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const { + CategoryTabBar *that = (CategoryTabBar *) this; + CategoryTab *ct = (CategoryTab *)t; + QPalette pal = palette(); + bool setPal = FALSE; + if ( ct->bgColor.isValid() ) { + pal.setColor( QPalette::Active, QColorGroup::Background, ct->bgColor ); + pal.setColor( QPalette::Active, QColorGroup::Button, ct->bgColor ); + pal.setColor( QPalette::Inactive, QColorGroup::Background, ct->bgColor ); + pal.setColor( QPalette::Inactive, QColorGroup::Button, ct->bgColor ); + that->setUpdatesEnabled( FALSE ); + that->setPalette( pal ); + setPal = TRUE; + } #if QT_VERSION >= 300 @@ -385,2 +518,9 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const + if ( ct->fgColor.isValid() ) { + pal.setColor( QPalette::Active, QColorGroup::Foreground, ct->fgColor ); + pal.setColor( QPalette::Inactive, QColorGroup::Foreground, ct->fgColor ); + that->setUpdatesEnabled( FALSE ); + that->setPalette( pal ); + setPal = TRUE; + } int iw = 0; @@ -401,2 +541,6 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const ); + if ( setPal ) { + that->unsetPalette(); + that->setUpdatesEnabled( TRUE ); + } } @@ -459,2 +603,3 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) docsFolder = 0; + int stamp = uidgen.generate(); // this is our timestamp to see which devices we know @@ -478,2 +623,5 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); + QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(launcherMessage(const QCString&, const QByteArray&)) ); #endif @@ -493,2 +641,4 @@ Launcher::~Launcher() { + delete rootFolder; + delete docsFolder; } @@ -497,2 +647,3 @@ static bool isVisibleWindow(int wid) { +#ifdef QWS const QList<QWSWindow> &list = qwsServer->clientWindows(); @@ -503,2 +654,3 @@ static bool isVisibleWindow(int wid) } +#endif return FALSE; @@ -529,3 +681,3 @@ void Launcher::updateMimeTypes(AppLnkSet* folder) AppLnk *app = it.current(); - if ( app->type() == "Folder" ) + if ( app->type() == "Folder" ) // No tr updateMimeTypes((AppLnkSet *)app); @@ -536,2 +688,3 @@ void Launcher::updateMimeTypes(AppLnkSet* folder) } + /** This is a HACK.... @@ -677,3 +830,3 @@ void Launcher::select( const AppLnk *appLnk ) { - if ( appLnk->type() == "Folder" ) { + if ( appLnk->type() == "Folder" ) { // No tr // Not supported: flat is simpler for the user @@ -700,3 +853,3 @@ void Launcher::properties( AppLnk *appLnk ) { - if ( appLnk->type() == "Folder" ) { + if ( appLnk->type() == "Folder" ) { // No tr // Not supported: flat is simpler for the user @@ -729,8 +882,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) QDataStream stream( data, IO_ReadOnly ); - if ( msg == "closing(QString)" ){ - QString app; - stream >> app; - //qWarning("app closed %s", app.latin1() ); - // MRUList::removeTask( app ); - }else if ( msg == "linkChanged(QString)" ) { + if ( msg == "linkChanged(QString)" ) { QString link; @@ -772,4 +920,6 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) QRsync::applyDiff( baseFile, deltaFile ); +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" ); e << baseFile; +#endif } else if ( msg == "rdiffCleanup()" ) { @@ -783,2 +933,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) QString home = getenv( "HOME" ); +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" ); @@ -787,4 +938,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) e << locked; - // register an app for autostart - // if clear is send the list is cleared. +#endif } else if ( msg == "autoStart(QString)" ) { @@ -831,4 +981,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) } + } else if ( msg == "sendVersionInfo()" ) { + QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); + QString v = QPE_VERSION; + QStringList l = QStringList::split( '.', v ); + QString v2 = l[0] + '.' + l[1]; + e << v2; + //qDebug("version %s\n", line.latin1()); } else if ( msg == "sendCardInfo()" ) { +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); +#endif const QList<FileSystem> &fs = storage->fileSystems(); @@ -837,20 +996,23 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) QString homeDir = getenv("HOME"); - QString hardDiskHome; + QString hardDiskHome, hardDiskHomePath; for ( ; it.current(); ++it ) { - if ( (*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) + int k4 = (*it)->blockSize()/256; + if ( (*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs") { s += (*it)->name() + "=" + (*it)->path() + "/Documents " - + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) - + " " + (*it)->options() + ";"; - else if ( (*it)->disk() == "/dev/mtdblock1" || - (*it)->disk() == "/dev/mtdblock/1" ) + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } else if ( (*it)->disk() == "/dev/mtdblock1" || + (*it)->disk() == "/dev/mtdblock/1" ) { s += (*it)->name() + "=" + homeDir + "/Documents " - + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) - + " " + (*it)->options() + ";"; - else if ( (*it)->name().contains( tr("Hard Disk") ) && + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } else if ( (*it)->name().contains( "Hard Disk") && homeDir.contains( (*it)->path() ) && - (*it)->path().length() > hardDiskHome.length() ) + (*it)->path().length() > hardDiskHomePath.length() ) { + hardDiskHomePath = (*it)->path(); hardDiskHome = (*it)->name() + "=" + homeDir + "/Documents " - + QString::number( (*it)->availBlocks() * (*it)->blockSize() ) - + " " + (*it)->options() + ";"; + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } } @@ -859,3 +1021,5 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) +#ifndef QT_NO_COP e << s; +#endif } else if ( msg == "sendSyncDate(QString)" ) { @@ -865,4 +1029,6 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) cfg.setGroup("SyncDate"); +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" ); e << app << cfg.readEntry( app ); +#endif //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(), @@ -894,2 +1060,3 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) +// Categories cats; for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) { @@ -913,8 +1080,10 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) contents += "[Desktop Entry]\n"; - contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n"; - contents += "File = "+doc->file()+"\n"; - contents += "Name = "+doc->name()+"\n"; - contents += "Type = "+doc->type()+"\n"; + contents += "Categories = " + // No tr +// cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr + Qtopia::Record::idsToString( doc->categories() ) + "\n"; + contents += "Name = "+doc->name()+"\n"; // No tr + contents += "Type = "+doc->type()+"\n"; // No tr } - contents += QString("Size = %1\n").arg( fi.size() ); + contents += "File = "+doc->file()+"\n"; // No tr // (resolves path) + contents += QString("Size = %1\n").arg( fi.size() ); // No tr } @@ -922,7 +1091,9 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) //qDebug( "sending length %d", contents.length() ); +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); e << contents; +#endif - qDebug( "================ \n\n%s\n\n===============", - contents.latin1() ); + //qDebug( "================ \n\n%s\n\n===============", + //contents.latin1() ); @@ -930,2 +1101,14 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) docsFolder = 0; +#ifdef QWS + } else if ( msg == "setMouseProto(QString)" ) { + QString mice; + stream >> mice; + setenv("QWS_MOUSE_PROTO",mice.latin1(),1); + qwsServer->openMouse(); + } else if ( msg == "setKeyboard(QString)" ) { + QString kb; + stream >> kb; + setenv("QWS_KEYBOARD",kb.latin1(),1); + qwsServer->openKeyboard(); +#endif } @@ -935,3 +1118,48 @@ void Launcher::cancelSync() { +#ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "cancelSync()" ); +#endif +} + +void Launcher::launcherMessage( const QCString &msg, const QByteArray &data) +{ + QDataStream stream( data, IO_ReadOnly ); + if ( msg == "setTabView(QString,int)" ) { + QString id; + stream >> id; + int mode; + stream >> mode; + if ( tabs->view(id) ) + tabs->view(id)->setViewMode( (LauncherView::ViewMode)mode ); + } else if ( msg == "setTabBackground(QString,int,QString)" ) { + QString id; + stream >> id; + int mode; + stream >> mode; + QString pixmapOrColor; + stream >> pixmapOrColor; + if ( tabs->view(id) ) + tabs->view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor ); + } else if ( msg == "setTextColor(QString,QString)" ) { + QString id; + stream >> id; + QString color; + stream >> color; + if ( tabs->view(id) ) + tabs->view(id)->setTextColor( QColor(color) ); + } else if ( msg == "setFont(QString,QString,int,int,int)" ) { + QString id; + stream >> id; + QString fam; + stream >> fam; + int size; + stream >> size; + int weight; + stream >> weight; + int italic; + stream >> italic; + if ( tabs->view(id) ) + tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); + qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic ); + } } @@ -942,5 +1170,5 @@ void Launcher::storageChanged() got_lnk_change = TRUE; - lnk_change = ""; + lnk_change = QString::null; } else { - updateDocs(); + updateLink( QString::null ); } @@ -1000,3 +1228,5 @@ void Launcher::preloadApps() for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) { +#ifndef QT_NO_COP QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()"); +#endif } diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h index d2efa58..e3881ea 100644 --- a/core/launcher/launcher.h +++ b/core/launcher/launcher.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -22,2 +22,3 @@ +#include <qpe/config.h> #include <qmainwindow.h> @@ -62,2 +63,4 @@ public: void setBusy(bool on); + QString getAllDocLinkInfo() const; + LauncherView *view( const QString &id ); @@ -72,3 +75,7 @@ public slots: +protected slots: + void tabProperties(); + protected: + void setTabAppearance( const QString &id, Config &cfg ); void paletteChange( const QPalette &p ); @@ -113,2 +120,3 @@ private slots: void systemMessage( const QCString &, const QByteArray &); + void launcherMessage( const QCString &, const QByteArray &); void storageChanged(); @@ -134,2 +142,3 @@ private: QString lnk_change; + QString m_timeStamp; diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index c54a00f..047fe45 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -25,3 +25,2 @@ #include <qpe/qpedebug.h> -#include <qpe/config.h> #include <qpe/categories.h> @@ -29,6 +28,9 @@ #include <qpe/menubutton.h> +#include <qpe/mimetype.h> #include <qpe/resource.h> #include <qpe/qpetoolbar.h> +//#include <qtopia/private/palmtoprecord.h> #include <qtimer.h> +#include <qtextstream.h> #include <qdict.h> @@ -41,8 +43,17 @@ #include <qtoolbutton.h> +#include <qimage.h> -class LauncherIconView : public QIconView { + +class BgPixmap +{ public: - QColor iconText; - QColor background; + BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} + QPixmap pm; + int ref; +}; +static QMap<QString,BgPixmap*> *bgCache = 0; + +class LauncherIconView : public QIconView { +public: LauncherIconView( QWidget* parent, const char* name=0 ) : @@ -51,3 +62,5 @@ public: cf(0), - bsy(0) + bsy(0), + bigIcns(TRUE), + bgColor(white) { @@ -56,7 +69,3 @@ public: ike = FALSE; - - Config config( "qpe" ); - config.setGroup( "Appearance" ); - iconText = QColor( config.readEntry( "LauncherIconText", "#000000" ) ); - background = QColor( config.readEntry( "LauncherBackground", "#FFFFFF" ) ); + calculateGrid( Bottom ); } @@ -75,3 +84,5 @@ public: + QPixmap* busyPixmap() const { return (QPixmap*)&bpm; } QIconViewItem* busyItem() const { return bsy; } + void setBigIcons( bool bi ) { bigIcns = bi; } @@ -88,2 +99,27 @@ public: if ( bsy != c ) { + if ( c ) { + QPixmap *src = c->pixmap(); + QImage img = src->convertToImage(); + QRgb* rgb; + int count; + if ( img.depth() == 32 ) { + rgb = (QRgb*)img.bits(); + count = img.bytesPerLine()/sizeof(QRgb)*img.height(); + } else { + rgb = img.colorTable(); + count = img.numColors(); + } + int rc, gc, bc; + colorGroup().highlight().rgb( &rc, &gc, &bc ); + int ri, gi, bi; + for ( int r = 0; r < count; r++, rgb++ ) { + int ri = (rc+qRed(*rgb))/2; + int gi = (gc+qGreen(*rgb))/2; + int bi = (bc+qBlue(*rgb))/2; + int ai = qAlpha(*rgb); + *rgb = qRgba(ri,gi,bi,ai); + } + + bpm.convertFromImage( img ); + } QIconViewItem* o = bsy; @@ -99,6 +135,4 @@ public: ike = TRUE; - if ( e->key() == Key_F33 ) { - // "OK" button + if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) returnPressed(currentItem()); - } QIconView::keyPressEvent(e); @@ -130,3 +164,4 @@ public: if (sl>=0) { - QString k = maj.left(sl); + QString k; + k = maj.left(12) == "application/" ? maj : maj.left(sl); mimes.replace(k,(void*)1); @@ -135,61 +170,25 @@ public: + void setBackgroundPixmap( const QPixmap &pm ) { + bgPixmap = pm; + } + + void setBackgroundColor( const QColor &c ) { + bgColor = c; + } + void drawBackground( QPainter *p, const QRect &r ) { - Config config("qpe"); - config.setGroup("Appearance"); - QString backgroundImage = config.readEntry("BackgroundImage","launcher/opie-background"); - // if (backgroundImage.isNull()) backgroundImage="launcher/opie-background"; - int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; - //int backgroundMode = 2; - - if ( backgroundMode == 1 ) { - - // Double buffer the background - static QPixmap *bg = NULL; - static QColor bgColor; - - if ( (bg == NULL) || (bgColor != colorGroup().button()) ) { - // Create a new background double buffer - if (bg == NULL) - bg = new QPixmap( width(), height() ); - bgColor = colorGroup().button(); - QPainter painter( bg ); - -// painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110)); - painter.fillRect( QRect( 0, 0, width(), height() ), background); - // Overlay the Qtopia logo in the center - QImage logo; - if (QFile::exists(backgroundImage)) { - logo = QImage(backgroundImage); + if ( !bgPixmap.isNull() ) { + p->drawTiledPixmap( r, bgPixmap, + QPoint( (r.x() + contentsX()) % bgPixmap.width(), + (r.y() + contentsY()) % bgPixmap.height() ) ); } else { - logo = Resource::loadImage(backgroundImage ); - } - if ( !logo.isNull() && config.readBoolEntry( "UseBackgroundImage", TRUE ) ) - painter.drawImage( (width() - logo.width()) / 2, - (height() - logo.height()) / 2, logo ); - } - - // Draw the double buffer to the widget (it is tiled for when the icon view is large) - p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), - (r.y() + contentsY()) % bg->height() ) ); - } else if ( backgroundMode == 2 ) { - static QPixmap *bg = 0; - static QColor bgColor; - if ( !bg || (bgColor != colorGroup().background()) ) { - bgColor = colorGroup().background(); - bg = new QPixmap( width(), 9 ); - QPainter painter( bg ); - for ( int i = 0; i < 3; i++ ) { - painter.setPen( colorGroup().background().light(130) ); - painter.drawLine( 0, i*3, width()-1, i*3 ); - painter.drawLine( 0, i*3+1, width()-1, i*3+1 ); - painter.setPen( colorGroup().background().light(105) ); - painter.drawLine( 0, i*3+2, width()-1, i*3+2 ); - } + p->fillRect( r, bgColor ); } - p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), - (r.y() + contentsY()) % bg->height() ) ); - } else { - p->fillRect( r, QBrush( colorGroup().background().light(110) ) ); } + + void setItemTextPos( ItemTextPos pos ) + { + calculateGrid( pos ); + QIconView::setItemTextPos( pos ); } @@ -242,2 +241,4 @@ public: + QString getAllDocLinkInfo() const; + protected: @@ -247,5 +248,28 @@ protected: QIconView::styleChange( old ); - //### duplicated code from LauncherView constructor + calculateGrid( itemTextPos() ); + } + + void calculateGrid( ItemTextPos pos ) + { int dw = QApplication::desktop()->width(); - setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240 + int viewerWidth = dw-style().scrollBarExtent().width(); + if ( pos == Bottom ) { + int cols = 3; + if ( viewerWidth <= 200 ) + cols = 2; + else if ( viewerWidth >= 400 ) + cols = viewerWidth/96; + setSpacing( 4 ); + setGridX( (viewerWidth-(cols+1)*spacing())/cols ); + setGridY( fontMetrics().height()*2+24 ); + } else { + int cols = 2; + if ( viewerWidth < 150 ) + cols = 1; + else if ( viewerWidth >= 400 ) + cols = viewerWidth/150; + setSpacing( 2 ); + setGridX( (viewerWidth-(cols+1)*spacing())/cols ); + setGridY( fontMetrics().height()+2 ); + } } @@ -261,3 +285,6 @@ private: bool ike; - + bool bigIcns; + QPixmap bgPixmap; + QPixmap bpm; + QColor bgColor; }; @@ -275,3 +302,3 @@ class LauncherItem : public QIconViewItem public: - LauncherItem( QIconView *parent, AppLnk* applnk ); + LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE ); ~LauncherItem() @@ -298,6 +325,2 @@ public: } - else { - mycg.setColor( QColorGroup::Text, liv->iconText ); - } - QIconViewItem::paintItem(p,mycg); @@ -305,8 +328,10 @@ public: liv->setItemTextBackground( oldBrush ); - if ( liv->busyItem() == this ) { - static QPixmap* busypm=0; - if ( !busypm ) - busypm = new QPixmap(Resource::loadPixmap("launching")); - p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm); } + + virtual QPixmap* pixmap () const + { + const LauncherIconView* liv = (LauncherIconView*)iconView(); + if ( (const LauncherItem *)liv->busyItem() == this ) + return liv->busyPixmap(); + return QIconViewItem::pixmap(); } @@ -318,4 +343,5 @@ protected: -LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk ) - : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ), +LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon ) + : QIconViewItem( parent, applnk->name(), + bigIcon ? applnk->bigPixmap() :applnk->pixmap() ), app(applnk) // Takes ownership @@ -349,3 +375,3 @@ void LauncherIconView::addItem(AppLnk* app, bool resort) || cf == -1 && app->categories().count() == 0 ) ) - (void) new LauncherItem( this, app ); + (void) new LauncherItem( this, app, bigIcns ); else @@ -384,4 +410,3 @@ void LauncherIconView::hideOrShowItems(bool resort) } - bool oldAutoArrange = autoArrange(); - setAutoArrange( FALSE ); + viewport()->setUpdatesEnabled( FALSE ); clear(); @@ -393,5 +418,5 @@ void LauncherIconView::hideOrShowItems(bool resort) } - if ( resort ) + viewport()->setUpdatesEnabled( TRUE ); + if ( resort && !autoArrange() ) sort(); - setAutoArrange( oldAutoArrange ); } @@ -406,3 +431,6 @@ bool LauncherIconView::removeLink(const QString& linkfile) l = item->appLnk(); - if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) { + if ( l->linkFileKnown() && l->linkFile() == linkfile + || l->fileKnown() && ( + l->file() == linkfile + || dl.isValid() && dl.file() == l->file() ) ) { delete item; @@ -415,3 +443,5 @@ bool LauncherIconView::removeLink(const QString& linkfile) ++it; - if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) { + if ( l->linkFileKnown() && l->linkFile() == linkfile + || l->file() == linkfile + || dl.isValid() && dl.file() == l->file() ) { hidden.removeRef(l); @@ -423,2 +453,55 @@ bool LauncherIconView::removeLink(const QString& linkfile) +static QString docLinkInfo(const Categories& cats, DocLnk* doc) +{ + QString contents; + + QFileInfo fi( doc->file() ); + if ( !fi.exists() ) + return contents; + + if ( doc->linkFileKnown() ) { + QString lfn = doc->linkFile(); + QFile f( lfn ); + if ( f.open( IO_ReadOnly ) ) { + QTextStream ts( &f ); + ts.setEncoding( QTextStream::UnicodeUTF8 ); + contents += ts.read(); + f.close(); + goto calcsize; + } + } + + contents += "[Desktop Entry]\n"; + contents += "Categories = " // No tr + + cats.labels("Document View", doc->categories()).join(";") + "\n"; // No tr + contents += "File = "+doc->file()+"\n"; // No tr + contents += "Name = "+doc->name()+"\n"; // No tr + contents += "Type = "+doc->type()+"\n"; // No tr + +calcsize: + contents += QString("Size = %1\n").arg( fi.size() ); // No tr + return contents; +} + +QString LauncherIconView::getAllDocLinkInfo() const +{ + QString contents; + LauncherItem* item = (LauncherItem*)firstItem(); + Categories cats; + while (item) { + DocLnk* doc = (DocLnk*)item->appLnk(); + contents += docLinkInfo(cats,doc); + item = (LauncherItem*)item->nextItem(); + } + QListIterator<AppLnk> it(hidden); + DocLnk* doc; + while ((doc=(DocLnk*)it.current())) { + contents += docLinkInfo(cats,doc); + ++it; + } + return contents; +} + +//=========================================================================== + LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) @@ -430,3 +513,2 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) - int dw = QApplication::desktop()->width(); icons->setItemsMovable( FALSE ); @@ -434,9 +516,9 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) icons->setSorting( TRUE ); - icons->setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240 - icons->setGridY( fontMetrics().height()*2+24 ); icons->setFrameStyle( QFrame::NoFrame ); - icons->setSpacing( 4 ); icons->setMargin( 0 ); - icons->setSelectionMode( QIconView::Multi ); + icons->setSelectionMode( QIconView::NoSelection ); icons->setBackgroundMode( PaletteBase ); + icons->setResizeMode( QIconView::Fixed ); + vmode = (ViewMode)-1; + setViewMode( Icon ); @@ -452,2 +534,3 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) tools = 0; + setBackgroundType( Ruled, QString::null ); } @@ -465,5 +548,3 @@ void LauncherView::setToolsEnabled(bool y) // Type filter - typemb = new MenuButton(tools); - typemb->setLabel(tr("Type: %1")); - typemb->setFixedHeight ( 20 ); + typemb = new QComboBox(tools); @@ -471,3 +552,2 @@ void LauncherView::setToolsEnabled(bool y) catmb = new CategorySelect(tools); - catmb->setFixedHeight ( 20 ); @@ -484,4 +564,4 @@ void LauncherView::updateTools() { - disconnect( typemb, SIGNAL(selected(const QString&)), - this, SLOT(showType(const QString&)) ); + disconnect( typemb, SIGNAL(activated(int)), + this, SLOT(showType(int)) ); disconnect( catmb, SIGNAL(signalSelected(int)), @@ -495,9 +575,29 @@ void LauncherView::updateTools() QStringList types; - types << tr("All"); - types << "--"; - types += icons->mimeTypes(); + typelist = icons->mimeTypes(); + for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) { + QString t = *it; + if ( t.left(12) == "application/" ) { + MimeType mt(t); + const AppLnk* app = mt.application(); + if ( app ) + t = app->name(); + else + t = t.mid(12); + } else { + t[0] = t[0].upper(); + } + types += tr("%1 files").arg(t); + } + types << tr("All types of file"); prev = typemb->currentText(); typemb->clear(); - typemb->insertItems(types); - typemb->select(prev); + typemb->insertStringList(types); + for (int i=0; i<typemb->count(); i++) { + if ( typemb->text(i) == prev ) { + typemb->setCurrentItem(i); + break; + } + } + if ( prev.isNull() ) + typemb->setCurrentItem(typemb->count()-1); @@ -506,3 +606,4 @@ void LauncherView::updateTools() QArray<int> vl( 0 ); - catmb->setCategories( vl, "Document View", tr("Document View") ); + catmb->setCategories( vl, "Document View", // No tr + tr("Document View") ); catmb->setRemoveCategoryEdit( TRUE ); @@ -510,3 +611,3 @@ void LauncherView::updateTools() - connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&))); + connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int))); connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); @@ -519,8 +620,11 @@ void LauncherView::sortBy(int s) -void LauncherView::showType(const QString& t) +void LauncherView::showType(int t) { - if ( t == tr("All") ) { + if ( t >= (int)typelist.count() ) { icons->setTypeFilter("",TRUE); } else { - icons->setTypeFilter(t+"/*",TRUE); + QString ty = typelist[t]; + if ( !ty.contains('/') ) + ty += "/*"; + icons->setTypeFilter(ty,TRUE); } @@ -533,2 +637,115 @@ void LauncherView::showCategory( int c ) +void LauncherView::setViewMode( ViewMode m ) +{ + if ( vmode != m ) { + bool bigIcons = m == Icon; + icons->viewport()->setUpdatesEnabled( FALSE ); + icons->setBigIcons( bigIcons ); + switch ( m ) { + case List: + icons->setItemTextPos( QIconView::Right ); + break; + case Icon: + icons->setItemTextPos( QIconView::Bottom ); + break; + } + icons->hideOrShowItems( FALSE ); + icons->viewport()->setUpdatesEnabled( TRUE ); + vmode = m; + } +} + +void LauncherView::setBackgroundType( BackgroundType t, const QString &val ) +{ + if ( !bgCache ) + bgCache = new QMap<QString,BgPixmap*>; + if ( bgCache->contains( bgName ) ) + (*bgCache)[bgName]->ref--; + + switch ( t ) { + case Ruled: { + bgName = QString("Ruled_%1").arg(colorGroup().background().name()); // No tr + QPixmap bg; + if ( bgCache->contains( bgName ) ) { + (*bgCache)[bgName]->ref++; + bg = (*bgCache)[bgName]->pm; + } else { + bg.resize( width(), 9 ); + QPainter painter( &bg ); + for ( int i = 0; i < 3; i++ ) { + painter.setPen( white ); + painter.drawLine( 0, i*3, width()-1, i*3 ); + painter.drawLine( 0, i*3+1, width()-1, i*3+1 ); + painter.setPen( colorGroup().background().light(105) ); + painter.drawLine( 0, i*3+2, width()-1, i*3+2 ); + } + painter.end(); + bgCache->insert( bgName, new BgPixmap(bg) ); + } + icons->setBackgroundPixmap( bg ); + break; + } + + case SolidColor: + icons->setBackgroundPixmap( QPixmap() ); + if ( val.isEmpty() ) { + icons->setBackgroundColor( colorGroup().base() ); + } else { + icons->setBackgroundColor( val ); + } + bgName = ""; + break; + + case Image: + bgName = val; + if ( bgCache->contains( bgName ) ) { + (*bgCache)[bgName]->ref++; + icons->setBackgroundPixmap( (*bgCache)[bgName]->pm ); + } else { + qDebug( "Loading image: %s", val.latin1() ); + QPixmap bg( Resource::loadPixmap( "wallpaper/" + val ) ); + if ( bg.isNull() ) { + QImageIO imgio; + imgio.setFileName( bgName ); + QSize ds = qApp->desktop()->size(); + QString param( "Scale( %1, %2, ScaleMin )" ); // No tr + imgio.setParameters( param.arg(ds.width()).arg(ds.height()).latin1() ); + imgio.read(); + bg = imgio.image(); + } + bgCache->insert( bgName, new BgPixmap(bg) ); + icons->setBackgroundPixmap( bg ); + } + break; + } + + // remove unreferenced backgrounds. + QMap<QString,BgPixmap*>::Iterator it = bgCache->begin(); + while ( it != bgCache->end() ) { + QMap<QString,BgPixmap*>::Iterator curr = it; + ++it; + if ( (*curr)->ref == 0 ) { + delete (*curr); + bgCache->remove( curr ); + } + } + + bgType = t; + icons->viewport()->update(); +} + +void LauncherView::setTextColor( const QColor &tc ) +{ + textCol = tc; + QColorGroup cg = icons->colorGroup(); + cg.setColor( QColorGroup::Text, tc ); + icons->setPalette( QPalette(cg,cg,cg) ); + icons->viewport()->update(); +} + +void LauncherView::setViewFont( const QFont &f ) +{ + icons->setFont( f ); +} + void LauncherView::resizeEvent(QResizeEvent *e) @@ -546,2 +763,7 @@ void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) +QString LauncherView::getAllDocLinkInfo() const +{ + return icons->getAllDocLinkInfo(); +} + void LauncherView::selectionChanged() @@ -599,4 +821,6 @@ void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilte // show only the icons for existing files - if (!QFile(it.current()->file()).exists() & it.current()->file().left(4) != "http") - { + if (QFile(it.current()->file()).exists() || ( it.current()->file().left(4) == "http" )) { + icons->addItem(*it,FALSE); + } + else { //maybe insert some .desktop file deletion code later @@ -604,6 +828,2 @@ void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilte } - else - { - icons->addItem(*it,FALSE); - } ++it; @@ -633 +853,13 @@ void LauncherView::setFileSystems(const QList<FileSystem> &) } + +void LauncherView::paletteChange( const QPalette &p ) +{ + icons->unsetPalette(); + QVBox::paletteChange( p ); + if ( bgType == Ruled ) + setBackgroundType( Ruled, QString::null ); + QColorGroup cg = icons->colorGroup(); + cg.setColor( QColorGroup::Text, textCol ); + icons->setPalette( QPalette(cg,cg,cg) ); +} + diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index 3aaef7e..2fb37b6 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -33,2 +33,3 @@ class QIconViewItem; class MenuButton; +class QComboBox; @@ -52,2 +53,16 @@ public: + QString getAllDocLinkInfo() const; + enum ViewMode { Icon, List }; + void setViewMode( ViewMode m ); + ViewMode viewMode() const { return vmode; } + + enum BackgroundType { Ruled, SolidColor, Image }; + void setBackgroundType( BackgroundType t, const QString & ); + BackgroundType backgroundType() const { return bgType; } + + void setTextColor( const QColor & ); + QColor textColor() const { return textCol; } + + void setViewFont( const QFont & ); + public slots: @@ -65,3 +80,3 @@ protected slots: void sortBy(int); - void showType(const QString&); + void showType(int); void showCategory( int ); @@ -71,2 +86,3 @@ protected: void internalPopulate( AppLnkSet *, const QString& categoryfilter ); + void paletteChange( const QPalette & ); @@ -76,4 +92,9 @@ private: LauncherIconView* icons; - MenuButton *typemb; + QComboBox *typemb; + QStringList typelist; CategorySelect *catmb; + ViewMode vmode; + BackgroundType bgType; + QString bgName; + QColor textCol; }; |