summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-26 17:37:50 (UTC)
committer sandman <sandman>2002-09-26 17:37:50 (UTC)
commitdf3a5b9afa34fa45d06e211f415f74c38017a917 (patch) (side-by-side diff)
tree3a5f5825badd598ba82227645cb2f00941265a07
parente7c2c104d59ef090fbc2f7dbcb052e22e0f5d591 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp910
-rw-r--r--core/launcher/launcher.h13
-rw-r--r--core/launcher/launcherview.cpp770
-rw-r--r--core/launcher/launcherview.h29
4 files changed, 1107 insertions, 615 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 ) :
@@ -120,5 +137,5 @@ void CategoryTabWidget::prevTab()
if ( categoryBar ) {
- int n = categoryBar->count();
- int tab = categoryBar->currentTab();
- if ( tab >= 0 )
+ int n = categoryBar->count();
+ int tab = categoryBar->currentTab();
+ if ( tab >= 0 )
categoryBar->setCurrentTab( (tab - 1 + n)%n );
@@ -130,5 +147,5 @@ void CategoryTabWidget::nextTab()
if ( categoryBar ) {
- int n = categoryBar->count();
+ int n = categoryBar->count();
int tab = categoryBar->currentTab();
- categoryBar->setCurrentTab( (tab + 1)%n );
+ categoryBar->setCurrentTab( (tab + 1)%n );
}
@@ -141,22 +158,30 @@ void CategoryTabWidget::addItem( const QString& linkfile )
if ( !app->isValid() ) {
- delete app;
- return;
+ delete app;
+ app=0;
}
- if ( !app->file().isEmpty() ) {
- // A document
- delete app;
- app = new DocLnk(linkfile);
- ((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
- return;
+ if ( !app || !app->file().isEmpty() ) {
+ // A document
+ delete app;
+ 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) {
- if ( !(*it).isEmpty() ) {
- QRegExp tf(*it,FALSE,TRUE);
- if ( tf.match(app->type()) >= 0 ) {
- ((LauncherView*)stack->widget(i))->addItem(app);
- return;
- }
- i++;
- }
+ if ( !(*it).isEmpty() ) {
+ QRegExp tf(*it,FALSE,TRUE);
+ if ( tf.match(app->type()) >= 0 ) {
+ ((LauncherView*)stack->widget(i))->addItem(app);
+ return;
+ }
+ i++;
+ }
}
+
+ QCopEnvelope e("QPE/TaskBar","reloadApps()");
}
@@ -164,3 +189,3 @@ void CategoryTabWidget::addItem( const QString& linkfile )
void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* docFolder, const QList<FileSystem> &fs)
+ AppLnkSet* docFolder, const QList<FileSystem> &fs)
{
@@ -179,7 +204,10 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
+ Config cfg("Launcher");
+
QStringList types = rootFolder->types();
for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
- if ( !(*it).isEmpty() ) {
- newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
- }
+ if ( !(*it).isEmpty() ) {
+ (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
+ setTabAppearance( *it, cfg );
+ }
}
@@ -188,14 +216,14 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
while ( (l=it.current()) ) {
- if ( l->type() == "Separator" ) {
- rootFolder->remove(l);
- delete l;
- } else {
- int i=0;
- for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
- if ( *it == l->type() )
- ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
- i++;
- }
- }
- ++it;
+ if ( l->type() == "Separator" ) { // No tr
+ rootFolder->remove(l);
+ delete l;
+ } else {
+ int i=0;
+ for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
+ if ( *it == l->type() )
+ ((LauncherView*)stack->widget(i))->addItem(l,FALSE);
+ i++;
+ }
+ }
+ ++it;
}
@@ -203,6 +231,10 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
for (int i=0; i<tabs; i++)
- ((LauncherView*)stack->widget(i))->sort();
+ ((LauncherView*)stack->widget(i))->sort();
// 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 )
@@ -232,7 +327,7 @@ LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm,
connect( view, SIGNAL(clicked(const AppLnk*)),
- this, SIGNAL(clicked(const AppLnk*)));
+ this, SIGNAL(clicked(const AppLnk*)));
connect( view, SIGNAL(rightPressed(AppLnk*)),
- this, SIGNAL(rightPressed(AppLnk*)));
+ this, SIGNAL(rightPressed(AppLnk*)));
ids.append(id);
- categoryBar->addTab( new QTab( pm, label ) );
+ categoryBar->addTab( new CategoryTab( pm, label ) );
stack->addWidget( view, tabs++ );
@@ -246,4 +341,4 @@ void CategoryTabWidget::updateLink(const QString& linkfile)
while ((view = (LauncherView*)stack->widget(i++))) {
- if ( view->removeLink(linkfile) )
- break;
+ if ( view->removeLink(linkfile) )
+ break;
}
@@ -266,8 +361,15 @@ void CategoryTabWidget::setBusy(bool on)
if ( on )
- ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
+ ((LauncherView*)stack->visibleWidget())->setBusy(TRUE);
else
- for (int i=0; i<tabs; i++)
- ((LauncherView*)stack->widget(i))->setBusy(FALSE);
+ for (int i=0; i<tabs; i++)
+ ((LauncherView*)stack->widget(i))->setBusy(FALSE);
}
+LauncherView *CategoryTabWidget::view( const QString &id )
+{
+ int idx = ids.findIndex( id );
+ return (LauncherView *)stack->widget(idx);
+}
+
+//===========================================================================
@@ -287,5 +389,7 @@ void CategoryTabBar::layoutTabs()
if ( !count() )
- return;
+ return;
// 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,55 +401,72 @@ 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) )) {
- if ( i != middleTab ) {
- // required += hiddenTabWidth + hframe - overlap;
- available -= hiddenTabWidth + hframe - overlap;
- if ( t->iconSet() != 0 )
- 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();
- }
+ t = tab(i);
+ int iw = fm.width( t->text() ) + hframe - overlap;
+ if ( i != middleTab ) {
+ available -= hiddenTabWidth + hframe - overlap;
+ if ( t->iconSet() != 0 )
+ available -= 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 ) {
- int w = hiddenTabWidth;
- 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;
-
- t->setRect( QRect(x, 0, w, h) );
- x += t->rect().width() - overlap;
- r = r.unite( t->rect() );
- } 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();
- }
- int h = QMAX( fm.height(), ih );
- h = QMAX( h, QApplication::globalStrut().height() );
-
- h += vframe;
- w += hframe;
-
- // t->setRect( QRect(x, 0, w * available/required, h) );
- t->setRect( QRect(x, 0, available, h) );
- x += t->rect().width() - overlap;
- r = r.unite( t->rect() );
- }
+ t = tab(i);
+ 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;
+ 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;
+
+ t->setRect( QRect(x, 0, w, h) );
+ x += t->rect().width() - overlap;
+ r = r.unite( t->rect() );
+ } else {
+ int ih = 0;
+ if ( t->iconSet() != 0 ) {
+ ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+ }
+ int h = QMAX( fm.height(), ih );
+ h = QMAX( h, QApplication::globalStrut().height() );
+
+ h += vframe;
+
+ t->setRect( QRect(x, 0, available, h) );
+ x += t->rect().width() - overlap;
+ r = r.unite( t->rect() );
+ }
}
@@ -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
@@ -382,5 +515,12 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
if ( selected )
- f.setBold( TRUE );
+ f.setBold( TRUE );
p->setFont( f );
+ 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;
@@ -388,4 +528,4 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
if ( t->iconSet() != 0 ) {
- iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
- ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+ iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
+ ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
}
@@ -394,9 +534,13 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
paintLabel( p, QRect( r.left() + (r.width()-w)/2 - 3,
- r.top() + (r.height()-h)/2, w, h ), t,
+ r.top() + (r.height()-h)/2, w, h ), t,
#if QT_VERSION >= 300
- t->identifier() == keyboardFocusTab()
+ t->identifier() == keyboardFocusTab()
#else
- t->identitifer() == keyboardFocusTab()
+ t->identitifer() == keyboardFocusTab()
#endif
- );
+ );
+ if ( setPal ) {
+ that->unsetPalette();
+ that->setUpdatesEnabled( TRUE );
+ }
}
@@ -405,3 +549,3 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
- QTab* t, bool has_focus ) const
+ QTab* t, bool has_focus ) const
{
@@ -412,11 +556,11 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
if ( t->iconSet() ) {
- // the tab has an iconset, draw it in the right mode
- QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
- if ( mode == QIconSet::Normal && has_focus )
- mode = QIconSet::Active;
- QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
- int pixw = pixmap.width();
- int pixh = pixmap.height();
- p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
- r.setLeft( r.left() + pixw + 5 );
+ // the tab has an iconset, draw it in the right mode
+ QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
+ if ( mode == QIconSet::Normal && has_focus )
+ mode = QIconSet::Active;
+ QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
+ int pixw = pixmap.width();
+ int pixh = pixmap.height();
+ p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
+ r.setLeft( r.left() + pixw + 5 );
}
@@ -426,3 +570,3 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
if ( r.width() < 20 )
- return;
+ return;
@@ -430,13 +574,13 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
#if defined(_WS_WIN32_)
- if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
- p->setPen( colorGroup().buttonText() );
- else
- p->setPen( colorGroup().foreground() );
+ if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
+ p->setPen( colorGroup().buttonText() );
+ else
+ p->setPen( colorGroup().foreground() );
#else
- p->setPen( colorGroup().foreground() );
+ p->setPen( colorGroup().foreground() );
#endif
- p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+ p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
} else {
- p->setPen( palette().disabled().foreground() );
- p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
+ p->setPen( palette().disabled().foreground() );
+ p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
}
@@ -459,5 +603,6 @@ 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
//uidgen.store( stamp );
- m_timeStamp = QString::number( stamp );
+ m_timeStamp = QString::number( stamp );
@@ -468,7 +613,7 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
connect( tabs, SIGNAL(selected(const QString&)),
- this, SLOT(viewSelected(const QString&)) );
+ this, SLOT(viewSelected(const QString&)) );
connect( tabs, SIGNAL(clicked(const AppLnk*)),
- this, SLOT(select(const AppLnk*)));
+ this, SLOT(select(const AppLnk*)));
connect( tabs, SIGNAL(rightPressed(AppLnk*)),
- this, SLOT(properties(AppLnk*)));
+ this, SLOT(properties(AppLnk*)));
@@ -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();
@@ -500,5 +651,6 @@ static bool isVisibleWindow(int wid)
for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
- if ( w->winId() == wid )
- return !w->isFullyObscured();
+ if ( w->winId() == wid )
+ return !w->isFullyObscured();
}
+#endif
return FALSE;
@@ -509,5 +661,5 @@ void Launcher::showMaximized()
if ( isVisibleWindow( winId() ) )
- doMaximize();
+ doMaximize();
else
- QTimer::singleShot( 20, this, SLOT(doMaximize()) );
+ QTimer::singleShot( 20, this, SLOT(doMaximize()) );
}
@@ -528,10 +680,11 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
- AppLnk *app = it.current();
- if ( app->type() == "Folder" )
- updateMimeTypes((AppLnkSet *)app);
- else {
- MimeType::registerApp(*app);
- }
+ AppLnk *app = it.current();
+ if ( app->type() == "Folder" ) // No tr
+ updateMimeTypes((AppLnkSet *)app);
+ else {
+ MimeType::registerApp(*app);
+ }
}
}
+
/** This is a HACK....
@@ -677,14 +830,14 @@ void Launcher::select( const AppLnk *appLnk )
{
- if ( appLnk->type() == "Folder" ) {
- // Not supported: flat is simpler for the user
+ if ( appLnk->type() == "Folder" ) { // No tr
+ // Not supported: flat is simpler for the user
} else {
- if ( appLnk->exec().isNull() ) {
- QMessageBox::information(this,tr("No application"),
- tr("<p>No application is defined for this document."
- "<p>Type is %1.").arg(appLnk->type()));
- return;
- }
- tabs->setBusy(TRUE);
- emit executing( appLnk );
- appLnk->execute();
+ if ( appLnk->exec().isNull() ) {
+ QMessageBox::information(this,tr("No application"),
+ tr("<p>No application is defined for this document."
+ "<p>Type is %1.").arg(appLnk->type()));
+ return;
+ }
+ tabs->setBusy(TRUE);
+ emit executing( appLnk );
+ appLnk->execute();
}
@@ -700,15 +853,15 @@ void Launcher::properties( AppLnk *appLnk )
{
- if ( appLnk->type() == "Folder" ) {
- // Not supported: flat is simpler for the user
+ if ( appLnk->type() == "Folder" ) { // No tr
+ // Not supported: flat is simpler for the user
} else {
- in_lnk_props = TRUE;
- got_lnk_change = FALSE;
- LnkProperties prop(appLnk);
- connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
- prop.showMaximized();
- prop.exec();
- in_lnk_props = FALSE;
- if ( got_lnk_change ) {
- updateLink(lnk_change);
- }
+ in_lnk_props = TRUE;
+ got_lnk_change = FALSE;
+ LnkProperties prop(appLnk);
+ connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+ prop.showMaximized();
+ prop.exec();
+ in_lnk_props = FALSE;
+ if ( got_lnk_change ) {
+ updateLink(lnk_change);
+ }
}
@@ -719,7 +872,7 @@ void Launcher::updateLink(const QString& link)
if (link.isNull())
- updateTabs();
+ updateTabs();
else if (link.isEmpty())
- updateDocs();
+ updateDocs();
else
- tabs->updateLink(link);
+ tabs->updateLink(link);
}
@@ -729,62 +882,59 @@ 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)" ) {
- QString link;
- stream >> link;
- if ( in_lnk_props ) {
- got_lnk_change = TRUE;
- lnk_change = link;
- } else {
- updateLink(link);
- }
+ if ( msg == "linkChanged(QString)" ) {
+ QString link;
+ stream >> link;
+ if ( in_lnk_props ) {
+ got_lnk_change = TRUE;
+ lnk_change = link;
+ } else {
+ updateLink(link);
+ }
} else if ( msg == "busy()" ) {
- emit busy();
+ emit busy();
} else if ( msg == "notBusy(QString)" ) {
- QString app;
- stream >> app;
- tabs->setBusy(FALSE);
- emit notBusy(app);
+ QString app;
+ stream >> app;
+ tabs->setBusy(FALSE);
+ emit notBusy(app);
} else if ( msg == "mkdir(QString)" ) {
- QString dir;
- stream >> dir;
- if ( !dir.isEmpty() )
- mkdir( dir );
+ QString dir;
+ stream >> dir;
+ if ( !dir.isEmpty() )
+ mkdir( dir );
} else if ( msg == "rdiffGenSig(QString,QString)" ) {
- QString baseFile, sigFile;
- stream >> baseFile >> sigFile;
- QRsync::generateSignature( baseFile, sigFile );
+ QString baseFile, sigFile;
+ stream >> baseFile >> sigFile;
+ QRsync::generateSignature( baseFile, sigFile );
} else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
- QString baseFile, sigFile, deltaFile;
- stream >> baseFile >> sigFile >> deltaFile;
- QRsync::generateDiff( baseFile, sigFile, deltaFile );
+ QString baseFile, sigFile, deltaFile;
+ stream >> baseFile >> sigFile >> deltaFile;
+ QRsync::generateDiff( baseFile, sigFile, deltaFile );
} else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
- QString baseFile, deltaFile;
- stream >> baseFile >> deltaFile;
- if ( !QFile::exists( baseFile ) ) {
- QFile f( baseFile );
- f.open( IO_WriteOnly );
- f.close();
- }
- QRsync::applyDiff( baseFile, deltaFile );
- QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
- e << baseFile;
+ QString baseFile, deltaFile;
+ stream >> baseFile >> deltaFile;
+ if ( !QFile::exists( baseFile ) ) {
+ QFile f( baseFile );
+ f.open( IO_WriteOnly );
+ f.close();
+ }
+ QRsync::applyDiff( baseFile, deltaFile );
+#ifndef QT_NO_COP
+ QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
+ e << baseFile;
+#endif
} else if ( msg == "rdiffCleanup()" ) {
- mkdir( "/tmp/rdiff" );
- QDir dir;
- dir.setPath( "/tmp/rdiff" );
- QStringList entries = dir.entryList();
- for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
- dir.remove( *it );
+ mkdir( "/tmp/rdiff" );
+ QDir dir;
+ dir.setPath( "/tmp/rdiff" );
+ QStringList entries = dir.entryList();
+ for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
+ dir.remove( *it );
} else if ( msg == "sendHandshakeInfo()" ) {
- QString home = getenv( "HOME" );
- QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
- e << home;
- int locked = (int) Desktop::screenLocked();
- e << locked;
- // register an app for autostart
- // if clear is send the list is cleared.
+ QString home = getenv( "HOME" );
+#ifndef QT_NO_COP
+ QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
+ e << home;
+ int locked = (int) Desktop::screenLocked();
+ e << locked;
+#endif
} else if ( msg == "autoStart(QString)" ) {
@@ -831,101 +981,134 @@ 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()" ) {
- QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
- const QList<FileSystem> &fs = storage->fileSystems();
- QListIterator<FileSystem> it ( fs );
- QString s;
- QString homeDir = getenv("HOME");
- QString hardDiskHome;
- for ( ; it.current(); ++it ) {
- 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" )
- s += (*it)->name() + "=" + homeDir + "/Documents "
- + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
- + " " + (*it)->options() + ";";
- else if ( (*it)->name().contains( tr("Hard Disk") ) &&
- homeDir.contains( (*it)->path() ) &&
- (*it)->path().length() > hardDiskHome.length() )
- hardDiskHome =
- (*it)->name() + "=" + homeDir + "/Documents "
- + QString::number( (*it)->availBlocks() * (*it)->blockSize() )
- + " " + (*it)->options() + ";";
- }
- if ( !hardDiskHome.isEmpty() )
- s += hardDiskHome;
+#ifndef QT_NO_COP
+ QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
+#endif
+ const QList<FileSystem> &fs = storage->fileSystems();
+ QListIterator<FileSystem> it ( fs );
+ QString s;
+ QString homeDir = getenv("HOME");
+ QString hardDiskHome, hardDiskHomePath;
+ for ( ; it.current(); ++it ) {
+ 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() * 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() * k4/4 )
+ + "K " + (*it)->options() + ";";
+ } else if ( (*it)->name().contains( "Hard Disk") &&
+ homeDir.contains( (*it)->path() ) &&
+ (*it)->path().length() > hardDiskHomePath.length() ) {
+ hardDiskHomePath = (*it)->path();
+ hardDiskHome =
+ (*it)->name() + "=" + homeDir + "/Documents "
+ + QString::number( (*it)->availBlocks() * k4/4 )
+ + "K " + (*it)->options() + ";";
+ }
+ }
+ if ( !hardDiskHome.isEmpty() )
+ s += hardDiskHome;
- e << s;
+#ifndef QT_NO_COP
+ e << s;
+#endif
} else if ( msg == "sendSyncDate(QString)" ) {
- QString app;
- stream >> app;
- Config cfg( "qpe" );
- cfg.setGroup("SyncDate");
- QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" );
- e << app << cfg.readEntry( app );
- //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(),
- //cfg.readEntry( app ).latin1() );
+ QString app;
+ stream >> app;
+ Config cfg( "qpe" );
+ 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(),
+ //cfg.readEntry( app ).latin1() );
} else if ( msg == "setSyncDate(QString,QString)" ) {
- QString app, date;
- stream >> app >> date;
- Config cfg( "qpe" );
- cfg.setGroup("SyncDate");
- cfg.writeEntry( app, date );
- //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
+ QString app, date;
+ stream >> app >> date;
+ Config cfg( "qpe" );
+ cfg.setGroup("SyncDate");
+ cfg.writeEntry( app, date );
+ //qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
} else if ( msg == "startSync(QString)" ) {
- QString what;
- stream >> what;
- delete syncDialog; syncDialog = 0;
- syncDialog = new SyncDialog( this, "syncProgress", FALSE,
- WStyle_Tool | WStyle_Customize |
- Qt::WStyle_StaysOnTop );
- syncDialog->showMaximized();
- syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
- connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
- SLOT( cancelSync() ) );
+ QString what;
+ stream >> what;
+ delete syncDialog; syncDialog = 0;
+ syncDialog = new SyncDialog( this, "syncProgress", FALSE,
+ WStyle_Tool | WStyle_Customize |
+ Qt::WStyle_StaysOnTop );
+ syncDialog->showMaximized();
+ syncDialog->whatLabel->setText( "<b>" + what + "</b>" );
+ connect( syncDialog->buttonCancel, SIGNAL( clicked() ),
+ SLOT( cancelSync() ) );
} else if ( msg == "stopSync()") {
- delete syncDialog; syncDialog = 0;
+ delete syncDialog; syncDialog = 0;
} else if ( msg == "getAllDocLinks()" ) {
- loadDocs();
-
- QString contents;
-
- for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
- DocLnk *doc = it.current();
- QFileInfo fi( doc->file() );
- if ( !fi.exists() )
- continue;
-
- bool fake = !doc->linkFileKnown();
- if ( !fake ) {
- QFile f( doc->linkFile() );
- if ( f.open( IO_ReadOnly ) ) {
- QTextStream ts( &f );
- ts.setEncoding( QTextStream::UnicodeUTF8 );
- contents += ts.read();
- f.close();
- } else
- fake = TRUE;
- }
- if (fake) {
- 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 += QString("Size = %1\n").arg( fi.size() );
- }
-
- //qDebug( "sending length %d", contents.length() );
- QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
- e << contents;
-
- qDebug( "================ \n\n%s\n\n===============",
- contents.latin1() );
+ loadDocs();
+
+ QString contents;
+
+// Categories cats;
+ for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
+ DocLnk *doc = it.current();
+ QFileInfo fi( doc->file() );
+ if ( !fi.exists() )
+ continue;
+
+ bool fake = !doc->linkFileKnown();
+ if ( !fake ) {
+ QFile f( doc->linkFile() );
+ if ( f.open( IO_ReadOnly ) ) {
+ QTextStream ts( &f );
+ ts.setEncoding( QTextStream::UnicodeUTF8 );
+ contents += ts.read();
+ f.close();
+ } else
+ fake = TRUE;
+ }
+ if (fake) {
+ contents += "[Desktop Entry]\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 += "File = "+doc->file()+"\n"; // No tr // (resolves path)
+ contents += QString("Size = %1\n").arg( fi.size() ); // No tr
+ }
- delete docsFolder;
- docsFolder = 0;
+ //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() );
+
+ delete docsFolder;
+ 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 );
+ }
}
@@ -941,6 +1169,6 @@ void Launcher::storageChanged()
if ( in_lnk_props ) {
- got_lnk_change = TRUE;
- lnk_change = "";
+ got_lnk_change = TRUE;
+ lnk_change = QString::null;
} else {
- updateDocs();
+ updateLink( QString::null );
}
@@ -953,3 +1181,3 @@ bool Launcher::mkdir(const QString &localPath)
if (fullDir.exists())
- return true;
+ return true;
@@ -965,4 +1193,4 @@ bool Launcher::mkdir(const QString &localPath)
if (dirIndex == -1) {
- //qDebug("No seperators found in path %s", localPath.latin1());
- checkedPath = QDir::currentDirPath();
+ //qDebug("No seperators found in path %s", localPath.latin1());
+ checkedPath = QDir::currentDirPath();
}
@@ -970,21 +1198,21 @@ bool Launcher::mkdir(const QString &localPath)
while (checkedPath != localPath) {
- // no more seperators found, use the local path
- if (dirIndex == -1)
- checkedPath = localPath;
- else {
- // the next directory to check
- checkedPath = localPath.left(dirIndex) + "/";
- // advance the iterator; the next dir seperator
- dirIndex = localPath.find(dirSeps, dirIndex+1);
- }
+ // no more seperators found, use the local path
+ if (dirIndex == -1)
+ checkedPath = localPath;
+ else {
+ // the next directory to check
+ checkedPath = localPath.left(dirIndex) + "/";
+ // advance the iterator; the next dir seperator
+ dirIndex = localPath.find(dirSeps, dirIndex+1);
+ }
- QDir checkDir(checkedPath);
- if (!checkDir.exists()) {
- //qDebug("mkdir making dir %s", checkedPath.latin1());
+ QDir checkDir(checkedPath);
+ if (!checkDir.exists()) {
+ //qDebug("mkdir making dir %s", checkedPath.latin1());
- if (!checkDir.mkdir(checkedPath)) {
- qDebug("Unable to make directory %s", checkedPath.latin1());
- return FALSE;
- }
- }
+ if (!checkDir.mkdir(checkedPath)) {
+ qDebug("Unable to make directory %s", checkedPath.latin1());
+ return FALSE;
+ }
+ }
@@ -1000,3 +1228,5 @@ void Launcher::preloadApps()
for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
- QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
+#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,22 +43,29 @@
#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 ) :
- QIconView(parent,name),
- tf(""),
- cf(0),
- bsy(0)
+ QIconView(parent,name),
+ tf(""),
+ cf(0),
+ bsy(0),
+ bigIcns(TRUE),
+ bgColor(white)
{
- sortmeth = Name;
- hidden.setAutoDelete(TRUE);
- ike = FALSE;
-
- Config config( "qpe" );
- config.setGroup( "Appearance" );
- iconText = QColor( config.readEntry( "LauncherIconText", "#000000" ) );
- background = QColor( config.readEntry( "LauncherBackground", "#FFFFFF" ) );
+ sortmeth = Name;
+ hidden.setAutoDelete(TRUE);
+ ike = FALSE;
+ calculateGrid( Bottom );
}
@@ -66,8 +75,8 @@ public:
#if 0 // debuggery
- QListIterator<AppLnk> it(hidden);
- AppLnk* l;
- while ((l=it.current())) {
- ++it;
- //qDebug("%p: hidden (should remove)",l);
- }
+ QListIterator<AppLnk> it(hidden);
+ AppLnk* l;
+ while ((l=it.current())) {
+ ++it;
+ //qDebug("%p: hidden (should remove)",l);
+ }
#endif
@@ -75,3 +84,5 @@ public:
+ QPixmap* busyPixmap() const { return (QPixmap*)&bpm; }
QIconViewItem* busyItem() const { return bsy; }
+ void setBigIcons( bool bi ) { bigIcns = bi; }
@@ -81,3 +92,3 @@ public:
{
- // We don't want rubberbanding (yet)
+ // We don't want rubberbanding (yet)
}
@@ -86,9 +97,34 @@ public:
{
- QIconViewItem *c = on ? currentItem() : 0;
- if ( bsy != c ) {
- QIconViewItem* o = bsy;
- bsy = c;
- if ( o ) o->repaint();
- if ( c ) c->repaint();
- }
+ QIconViewItem *c = on ? currentItem() : 0;
+ 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;
+ bsy = c;
+ if ( o ) o->repaint();
+ if ( c ) c->repaint();
+ }
}
@@ -98,9 +134,7 @@ public:
{
- ike = TRUE;
- if ( e->key() == Key_F33 ) {
- // "OK" button
- returnPressed(currentItem());
- }
- QIconView::keyPressEvent(e);
- ike = FALSE;
+ ike = TRUE;
+ if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space )
+ returnPressed(currentItem());
+ QIconView::keyPressEvent(e);
+ ike = FALSE;
}
@@ -115,6 +149,6 @@ public:
{
- mimes.clear();
- cats.clear();
- QIconView::clear();
- hidden.clear();
+ mimes.clear();
+ cats.clear();
+ QIconView::clear();
+ hidden.clear();
}
@@ -123,12 +157,21 @@ public:
{
- // QStringList c = app->categories();
- // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
- // cats.replace(*cit,(void*)1);
- // }
- QString maj=app->type();
- int sl=maj.find('/');
- if (sl>=0) {
- QString k = maj.left(sl);
- mimes.replace(k,(void*)1);
- }
+ // QStringList c = app->categories();
+ // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
+ // cats.replace(*cit,(void*)1);
+ // }
+ QString maj=app->type();
+ int sl=maj.find('/');
+ if (sl>=0) {
+ QString k;
+ k = maj.left(12) == "application/" ? maj : maj.left(sl);
+ mimes.replace(k,(void*)1);
+ }
+ }
+
+ void setBackgroundPixmap( const QPixmap &pm ) {
+ bgPixmap = pm;
+ }
+
+ void setBackgroundColor( const QColor &c ) {
+ bgColor = c;
}
@@ -137,59 +180,15 @@ public:
{
- 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);
- } 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->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
- (r.y() + contentsY()) % bg->height() ) );
- } else {
- p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
- }
+ if ( !bgPixmap.isNull() ) {
+ p->drawTiledPixmap( r, bgPixmap,
+ QPoint( (r.x() + contentsX()) % bgPixmap.width(),
+ (r.y() + contentsY()) % bgPixmap.height() ) );
+ } else {
+ p->fillRect( r, bgColor );
+ }
+ }
+
+ void setItemTextPos( ItemTextPos pos )
+ {
+ calculateGrid( pos );
+ QIconView::setItemTextPos( pos );
}
@@ -200,4 +199,4 @@ public:
{
- tf = QRegExp(typefilter,FALSE,TRUE);
- hideOrShowItems(resort);
+ tf = QRegExp(typefilter,FALSE,TRUE);
+ hideOrShowItems(resort);
}
@@ -206,10 +205,10 @@ public:
{
- Categories cat;
- cat.load( categoryFileName() );
- QString str;
- if ( catfilter == -2 )
- cf = 0;
- else
- cf = catfilter;
- hideOrShowItems(resort);
+ Categories cat;
+ cat.load( categoryFileName() );
+ QString str;
+ if ( catfilter == -2 )
+ cf = 0;
+ else
+ cf = catfilter;
+ hideOrShowItems(resort);
}
@@ -220,6 +219,6 @@ public:
{
- if ( sortmeth != m ) {
- sortmeth = m;
- sort();
- }
+ if ( sortmeth != m ) {
+ sortmeth = m;
+ sort();
+ }
}
@@ -228,16 +227,18 @@ public:
{
- switch (sortmeth) {
- case Name:
- return a->name().compare(b->name());
- case Date: {
- QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
- QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
- return fa.lastModified().secsTo(fb.lastModified());
- }
- case Type:
- return a->type().compare(b->type());
- }
- return 0;
+ switch (sortmeth) {
+ case Name:
+ return a->name().compare(b->name());
+ case Date: {
+ QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+ QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
+ return fa.lastModified().secsTo(fb.lastModified());
+ }
+ case Type:
+ return a->type().compare(b->type());
+ }
+ return 0;
}
+ QString getAllDocLinkInfo() const;
+
protected:
@@ -246,6 +247,29 @@ protected:
{
- QIconView::styleChange( old );
- //### duplicated code from LauncherView constructor
- int dw = QApplication::desktop()->width();
- setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
+ QIconView::styleChange( old );
+ calculateGrid( itemTextPos() );
+ }
+
+ void calculateGrid( ItemTextPos pos )
+ {
+ int dw = QApplication::desktop()->width();
+ 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,9 +302,9 @@ class LauncherItem : public QIconViewItem
public:
- LauncherItem( QIconView *parent, AppLnk* applnk );
+ LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
~LauncherItem()
{
- LauncherIconView* liv = (LauncherIconView*)iconView();
- if ( liv->busyItem() == this )
- liv->setBusy(FALSE);
- delete app;
+ LauncherIconView* liv = (LauncherIconView*)iconView();
+ if ( liv->busyItem() == this )
+ liv->setBusy(FALSE);
+ delete app;
}
@@ -291,22 +318,20 @@ public:
{
- LauncherIconView* liv = (LauncherIconView*)iconView();
- QBrush oldBrush( liv->itemTextBackground() );
- QColorGroup mycg( cg );
- if ( liv->currentItem() == this ) {
- liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
- mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
- }
- else {
- mycg.setColor( QColorGroup::Text, liv->iconText );
- }
-
- QIconViewItem::paintItem(p,mycg);
- if ( liv->currentItem() == this )
- 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);
- }
+ LauncherIconView* liv = (LauncherIconView*)iconView();
+ QBrush oldBrush( liv->itemTextBackground() );
+ QColorGroup mycg( cg );
+ if ( liv->currentItem() == this ) {
+ liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
+ mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
+ }
+ QIconViewItem::paintItem(p,mycg);
+ if ( liv->currentItem() == this )
+ liv->setItemTextBackground( oldBrush );
+ }
+
+ virtual QPixmap* pixmap () const
+ {
+ const LauncherIconView* liv = (LauncherIconView*)iconView();
+ if ( (const LauncherItem *)liv->busyItem() == this )
+ return liv->busyPixmap();
+ return QIconViewItem::pixmap();
}
@@ -318,5 +343,6 @@ protected:
-LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk )
- : QIconViewItem( parent, applnk->name(), applnk->bigPixmap() ),
- app(applnk) // Takes ownership
+LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
+ : QIconViewItem( parent, applnk->name(),
+ bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
+ app(applnk) // Takes ownership
{
@@ -335,4 +361,4 @@ QStringList LauncherIconView::mimeTypes() const
while (it.current()) {
- r.append(it.currentKey());
- ++it;
+ r.append(it.currentKey());
+ ++it;
}
@@ -347,9 +373,9 @@ void LauncherIconView::addItem(AppLnk* app, bool resort)
if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
- && (cf == 0 || app->categories().contains(cf)
- || cf == -1 && app->categories().count() == 0 ) )
- (void) new LauncherItem( this, app );
+ && (cf == 0 || app->categories().contains(cf)
+ || cf == -1 && app->categories().count() == 0 ) )
+ (void) new LauncherItem( this, app, bigIcns );
else
- hidden.append(app);
+ hidden.append(app);
if ( resort )
- sort();
+ sort();
}
@@ -362,4 +388,4 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
while (item) {
- addCatsAndMimes(item->appLnk());
- item = (LauncherItem*)item->nextItem();
+ addCatsAndMimes(item->appLnk());
+ item = (LauncherItem*)item->nextItem();
}
@@ -368,4 +394,4 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
while ((l=it.current())) {
- addCatsAndMimes(l);
- ++it;
+ addCatsAndMimes(l);
+ ++it;
}
@@ -381,7 +407,6 @@ void LauncherIconView::hideOrShowItems(bool resort)
while (item) {
- links.append(item->takeAppLnk());
- item = (LauncherItem*)item->nextItem();
+ links.append(item->takeAppLnk());
+ item = (LauncherItem*)item->nextItem();
}
- bool oldAutoArrange = autoArrange();
- setAutoArrange( FALSE );
+ viewport()->setUpdatesEnabled( FALSE );
clear();
@@ -390,8 +415,8 @@ void LauncherIconView::hideOrShowItems(bool resort)
while ((l=it.current())) {
- addItem(l,FALSE);
- ++it;
+ addItem(l,FALSE);
+ ++it;
}
- if ( resort )
- sort();
- setAutoArrange( oldAutoArrange );
+ viewport()->setUpdatesEnabled( TRUE );
+ if ( resort && !autoArrange() )
+ sort();
}
@@ -405,8 +430,11 @@ bool LauncherIconView::removeLink(const QString& linkfile)
while (item) {
- l = item->appLnk();
- if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
- delete item;
- did = TRUE;
- }
- item = (LauncherItem*)item->nextItem();
+ l = item->appLnk();
+ if ( l->linkFileKnown() && l->linkFile() == linkfile
+ || l->fileKnown() && (
+ l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) ) {
+ delete item;
+ did = TRUE;
+ }
+ item = (LauncherItem*)item->nextItem();
}
@@ -414,7 +442,9 @@ bool LauncherIconView::removeLink(const QString& linkfile)
while ((l=it.current())) {
- ++it;
- if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
- hidden.removeRef(l);
- did = TRUE;
- }
+ ++it;
+ if ( l->linkFileKnown() && l->linkFile() == linkfile
+ || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
+ hidden.removeRef(l);
+ did = TRUE;
+ }
}
@@ -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,20 +516,21 @@ 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 );
connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
- SLOT(itemClicked(int, QIconViewItem *)) );
+ SLOT(itemClicked(int, QIconViewItem *)) );
connect( icons, SIGNAL(selectionChanged()),
- SLOT(selectionChanged()) );
+ SLOT(selectionChanged()) );
connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
- SLOT(returnPressed(QIconViewItem *)) );
+ SLOT(returnPressed(QIconViewItem *)) );
connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
- SLOT(itemPressed(int, QIconViewItem *)) );
+ SLOT(itemPressed(int, QIconViewItem *)) );
tools = 0;
+ setBackgroundType( Ruled, QString::null );
}
@@ -461,20 +544,17 @@ void LauncherView::setToolsEnabled(bool y)
if ( !y != !tools ) {
- if ( y ) {
- tools = new QHBox(this);
+ if ( y ) {
+ tools = new QHBox(this);
- // Type filter
- typemb = new MenuButton(tools);
- typemb->setLabel(tr("Type: %1"));
- typemb->setFixedHeight ( 20 );
+ // Type filter
+ typemb = new QComboBox(tools);
- // Category filter
- catmb = new CategorySelect(tools);
- catmb->setFixedHeight ( 20 );
+ // Category filter
+ catmb = new CategorySelect(tools);
- updateTools();
- tools->show();
- } else {
- delete tools;
- tools = 0;
- }
+ updateTools();
+ tools->show();
+ } else {
+ delete tools;
+ tools = 0;
+ }
}
@@ -484,6 +564,6 @@ 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)),
- this, SLOT(showCategory(int)) );
+ this, SLOT(showCategory(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") ) {
- icons->setTypeFilter("",TRUE);
+ 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)
@@ -537,3 +754,3 @@ void LauncherView::resizeEvent(QResizeEvent *e)
if ( e->size().width() != e->oldSize().width() )
- sort();
+ sort();
}
@@ -546,2 +763,7 @@ void LauncherView::populate( AppLnkSet *folder, const QString& typefilter )
+QString LauncherView::getAllDocLinkInfo() const
+{
+ return icons->getAllDocLinkInfo();
+}
+
void LauncherView::selectionChanged()
@@ -550,6 +772,6 @@ void LauncherView::selectionChanged()
if ( item && item->isSelected() ) {
- AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
- if ( icons->inKeyEvent() ) // not for mouse press
- emit clicked( appLnk );
- item->setSelected(FALSE);
+ AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+ if ( icons->inKeyEvent() ) // not for mouse press
+ emit clicked( appLnk );
+ item->setSelected(FALSE);
}
@@ -560,4 +782,4 @@ void LauncherView::returnPressed( QIconViewItem *item )
if ( item ) {
- AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
- emit clicked( appLnk );
+ AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+ emit clicked( appLnk );
}
@@ -568,9 +790,9 @@ void LauncherView::itemClicked( int btn, QIconViewItem *item )
if ( item ) {
- AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
- if ( btn == LeftButton ) {
- // Make sure it's the item we execute that gets highlighted
- icons->setCurrentItem( item );
- emit clicked( appLnk );
- }
- item->setSelected(FALSE);
+ AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+ if ( btn == LeftButton ) {
+ // Make sure it's the item we execute that gets highlighted
+ icons->setCurrentItem( item );
+ emit clicked( appLnk );
+ }
+ item->setSelected(FALSE);
}
@@ -581,10 +803,10 @@ void LauncherView::itemPressed( int btn, QIconViewItem *item )
if ( item ) {
- AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
- if ( btn == RightButton )
- emit rightPressed( appLnk );
+ AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
+ if ( btn == RightButton )
+ emit rightPressed( appLnk );
/*
- else if ( btn == LeftButton )
- emit clicked( appLnk );
+ else if ( btn == LeftButton )
+ emit clicked( appLnk );
*/
- item->setSelected(FALSE);
+ item->setSelected(FALSE);
}
@@ -598,13 +820,11 @@ void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilte
while ( it.current() ) {
- // show only the icons for existing files
- if (!QFile(it.current()->file()).exists() & it.current()->file().left(4) != "http")
- {
- //maybe insert some .desktop file deletion code later
- //maybe dir specific
- }
- else
- {
- icons->addItem(*it,FALSE);
- }
- ++it;
+ // show only the icons for existing files
+ 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
+ //maybe dir specific
+ }
+ ++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;
};