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/launcher.cpp | |
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 |
1 files changed, 292 insertions, 62 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 } |