summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp1188
-rw-r--r--core/launcher/launcher.h31
2 files changed, 637 insertions, 582 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index bcc2495..d9fc8e4 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -24,2 +24,4 @@
+//#include <opie/ofiledialog.h>
+#include <opie/ofileselector.h>
#include <qpe/qcopenvelope_qws.h>
@@ -91,3 +93,3 @@ namespace {
if(tmpMime )
- mimes.append("audio/*" );
+ mimes.append("audio/*" );
@@ -95,3 +97,3 @@ namespace {
if(tmpMime )
- mimes.append("image/*" );
+ mimes.append("image/*" );
@@ -99,3 +101,3 @@ namespace {
if(tmpMime )
- mimes.append("text/*");
+ mimes.append("text/*");
@@ -103,3 +105,3 @@ namespace {
if(tmpMime )
- mimes.append("video/*" );
+ mimes.append("video/*" );
}
@@ -118,3 +120,3 @@ public:
CategoryTab( const QIconSet &icon, const QString &text=QString::null )
- : QTab( icon, text )
+ : QTab( icon, text )
{
@@ -138,5 +140,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 );
@@ -148,5 +150,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 );
}
@@ -158,4 +160,4 @@ void CategoryTabWidget::showTab(const QString& id)
if ( categoryBar ) {
- int idx = ids.findIndex( id );
- categoryBar->setCurrentTab( idx );
+ int idx = ids.findIndex( id );
+ categoryBar->setCurrentTab( idx );
}
@@ -165,33 +167,33 @@ void CategoryTabWidget::addItem( const QString& linkfile )
{
- int i=0;
- AppLnk *app = new AppLnk(linkfile);
- if ( !app->isValid() ) {
- delete app;
- app=0;
- }
- 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++;
- }
- }
-
- QCopEnvelope e("QPE/TaskBar","reloadApps()");
+ int i=0;
+ AppLnk *app = new AppLnk(linkfile);
+ if ( !app->isValid() ) {
+ delete app;
+ app=0;
+ }
+ 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++;
+ }
+ }
+
+ QCopEnvelope e("QPE/TaskBar","reloadApps()");
}
@@ -199,5 +201,5 @@ void CategoryTabWidget::addItem( const QString& linkfile )
void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
- AppLnkSet* docFolder, const QList<FileSystem> &fs)
+ AppLnkSet* /*docFolder*/, const QList<FileSystem> & /*fs*/)
{
- QString current;
+ QString current;
if ( categoryBar ) {
@@ -224,6 +226,6 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
for ( QStringList::Iterator it=types.begin(); it!=types.end(); ++it) {
- if ( !(*it).isEmpty() ) {
- (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
- setTabAppearance( *it, cfg );
- }
+ if ( !(*it).isEmpty() ) {
+ (void)newView(*it,rootFolder->typePixmap(*it),rootFolder->typeName(*it));
+ setTabAppearance( *it, cfg );
+ }
}
@@ -232,14 +234,14 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
while ( (l=it.current()) ) {
- 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;
+ 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;
}
@@ -247,3 +249,3 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
for (int i=0; i<tabs; i++)
- ((LauncherView*)stack->widget(i))->sort();
+ ((LauncherView*)stack->widget(i))->sort();
@@ -253,11 +255,21 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- docview = newView( "Documents", // No tr
- pm, tr("Documents"));
- docview->populate( docFolder, QString::null );
- docFolder->detachChildren();
- docview->setFileSystems(fs);
- docview->setToolsEnabled(TRUE);
- setTabAppearance( "Documents", cfg ); // No tr
- connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
+ //ljpotter
+ CategoryTab *catTab ;
+ catTab = new CategoryTab( pm, "Documents" );
+
+ categoryBar->addTab( catTab );
+
+ fileSel = new DocumentTab( stack, 4, 0, "/","");
+ stack->addWidget( fileSel, tabs++ );
+
+ // fileSel->hide();
+
+ connect( fileSel, SIGNAL( fileSelected( const DocLnk & )),
+ this, SLOT(clickie(const DocLnk&)) );
+
+// connect( fileSel, SIGNAL( fileSelected( const QString & )),
+// this, SLOT(clickie(const QString&)) );
+
+ connect( categoryBar, SIGNAL(selected(int)), stack, SLOT(raiseWidget(int)) );
@@ -275,2 +287,3 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
+
QCopEnvelope e("QPE/TaskBar","reloadApps()");
@@ -278,2 +291,12 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
+void CategoryTabWidget::clickie(const DocLnk &lnk) {
+ lnk.execute();
+ // fileSel->reparse();
+}
+
+void CategoryTabWidget::clickie(const QString &appStr) {
+// DocLnk lnk(appStr);
+// lnk.execute();
+}
+
void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
@@ -289,10 +312,10 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
if ( view == "List" ) // No tr
- v->setViewMode( LauncherView::List );
+ v->setViewMode( LauncherView::List );
QString bgType = cfg.readEntry( "BackgroundType", "Image" );
if ( bgType == "Image" ) { // No tr
- QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
- v->setBackgroundType( LauncherView::Image, pm );
+ QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
+ v->setBackgroundType( LauncherView::Image, pm );
} else if ( bgType == "SolidColor" ) {
- QString c = cfg.readEntry( "BackgroundColor" );
- v->setBackgroundType( LauncherView::SolidColor, c );
+ QString c = cfg.readEntry( "BackgroundColor" );
+ v->setBackgroundType( LauncherView::SolidColor, c );
}
@@ -300,8 +323,8 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
if ( textCol.isEmpty() )
- v->setTextColor( QColor() );
+ v->setTextColor( QColor() );
else
- v->setTextColor( QColor(textCol) );
+ 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) );
+ v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
@@ -310,19 +333,16 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg )
if ( tabCol.isEmpty() )
- tab->bgColor = QColor();
+ tab->bgColor = QColor();
else
- tab->bgColor = QColor(tabCol);
+ tab->bgColor = QColor(tabCol);
QString tabTextCol = cfg.readEntry( "TabTextColor" );
if ( tabTextCol.isEmpty() )
- tab->fgColor = QColor();
+ tab->fgColor = QColor();
else
- tab->fgColor = QColor(tabTextCol);
+ tab->fgColor = QColor(tabTextCol);
}
-void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs)
-{
- docview->populate( docFolder, QString::null );
- docFolder->detachChildren();
- docview->setFileSystems(fs);
- docview->updateTools();
-}
+//void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/)
+//{
+ // docFolder->detachChildren();
+//}
@@ -337,3 +357,3 @@ void CategoryTabWidget::tabProperties()
if ( rv >= 0 && rv != view->viewMode() ) {
- view->setViewMode( (LauncherView::ViewMode)rv );
+ view->setViewMode( (LauncherView::ViewMode)rv );
}
@@ -345,3 +365,3 @@ QString CategoryTabWidget::getAllDocLinkInfo() const
{
- return docview->getAllDocLinkInfo();
+ return "";
}
@@ -352,5 +372,5 @@ 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);
@@ -363,11 +383,10 @@ void CategoryTabWidget::updateLink(const QString& linkfile)
{
- int i=0;
- LauncherView* view;
- qApp->processEvents();
- while ((view = (LauncherView*)stack->widget(i++))) {
- if ( view->removeLink(linkfile) )
- break;
- }
- addItem(linkfile);
- docview->updateTools();
+ // LauncherView* view;
+ qApp->processEvents();
+// while ((view = (LauncherView*)stack->widget(i++))) {
+// if ( view->removeLink(linkfile) )
+// break;
+// }
+ // addItem(linkfile);
+ fileSel->reparse();
}
@@ -387,6 +406,6 @@ 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-1; i++)
+ ((LauncherView*)stack->widget(i))->setBusy(FALSE);
}
@@ -401,4 +420,4 @@ void CategoryTabWidget::setBusyIndicatorType ( const QString &type )
{
- for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
- view ( *it )-> setBusyIndicatorType ( type );
+ for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it )
+ view ( *it )-> setBusyIndicatorType ( type );
}
@@ -421,3 +440,3 @@ void CategoryTabBar::layoutTabs()
if ( !count() )
- return;
+ return;
@@ -437,68 +456,68 @@ void CategoryTabBar::layoutTabs()
for ( int i = 0; i < count(); i++ ) {
- 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;
+ 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;
+ mode = HideBackText;
for ( int i = 0; i < count(); i++ ) {
- 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() );
- }
+ 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() );
+ }
}
@@ -526,9 +545,9 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
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;
+ 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;
}
@@ -547,3 +566,3 @@ void CategoryTabBar::paint( QPainter * p, QTab * t, bool selected ) const
if ( selected )
- f.setBold( TRUE );
+ f.setBold( TRUE );
p->setFont( f );
@@ -551,7 +570,7 @@ 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;
+ pal.setColor( QPalette::Active, QColorGroup::Foreground, ct->fgColor );
+ pal.setColor( QPalette::Inactive, QColorGroup::Foreground, ct->fgColor );
+ that->setUpdatesEnabled( FALSE );
+ that->setPalette( pal );
+ setPal = TRUE;
}
@@ -560,4 +579,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();
}
@@ -566,12 +585,12 @@ 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 );
+ that->unsetPalette();
+ that->setUpdatesEnabled( TRUE );
}
@@ -581,3 +600,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
{
@@ -588,11 +607,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 );
}
@@ -602,3 +621,3 @@ void CategoryTabBar::paintLabel( QPainter* p, const QRect&,
if ( r.width() < 20 )
- return;
+ return;
@@ -606,13 +625,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() );
}
@@ -644,7 +663,8 @@ 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*)));
+
@@ -682,4 +702,4 @@ 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();
}
@@ -692,5 +712,5 @@ void Launcher::showMaximized()
if ( isVisibleWindow( winId() ) )
- doMaximize();
+ doMaximize();
else
- QTimer::singleShot( 20, this, SLOT(doMaximize()) );
+ QTimer::singleShot( 20, this, SLOT(doMaximize()) );
}
@@ -712,8 +732,8 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
- AppLnk *app = it.current();
- if ( app->type() == "Folder" ) // No tr
- updateMimeTypes((AppLnkSet *)app);
- else {
- MimeType::registerApp(*app);
- }
+ AppLnk *app = it.current();
+ if ( app->type() == "Folder" ) // No tr
+ updateMimeTypes((AppLnkSet *)app);
+ else {
+ MimeType::registerApp(*app);
+ }
}
@@ -734,113 +754,114 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
{
-
- OWait *owait = new OWait();
- Global::statusMessage( tr( "Finding documents" ) );
-
- owait->show();
- qApp->processEvents();
-
- delete docsFolder;
- docsFolder = new DocLnkSet;
-
- DocLnkSet *tmp = 0;
- QString home = QString(getenv("HOME")) + "/Documents";
- tmp = new DocLnkSet( home , QString::null);
- docsFolder->appendFrom( *tmp );
- delete tmp;
-
- // RAM documents
- StorageInfo storage;
- const QList<FileSystem> &fileSystems = storage.fileSystems();
- QListIterator<FileSystem> it ( fileSystems );
-
- for ( ; it.current(); ++it ) {
- if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
- tmp = new DocLnkSet( (*it)->path(), QString::null );
- docsFolder->appendFrom( *tmp );
- delete tmp;
- }
- }
-
- Config mediumCfg( "medium");
- mediumCfg.setGroup("main");
- // a) -zecke we don't want to check
- if(!mediumCfg.readBoolEntry("use", true ) )
+ OWait *owait = new OWait();
+ Global::statusMessage( tr( "Finding documents" ) );
+
+ owait->show();
+ qApp->processEvents();
+ if(docsFolder) delete docsFolder;
+ docsFolder = new DocLnkSet;
+ DocLnkSet *tmp = 0;
+ QString home = QString(getenv("HOME")) + "/Documents";
+ tmp = new DocLnkSet( home , QString::null);
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+
+ // RAM documents
+ StorageInfo storage;
+ const QList<FileSystem> &fileSystems = storage.fileSystems();
+ QListIterator<FileSystem> it ( fileSystems );
+
+ for ( ; it.current(); ++it ) {
+ if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
+ tmp = new DocLnkSet( (*it)->path(), QString::null );
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+ }
+ }
+
+ Config mediumCfg( "medium");
+ mediumCfg.setGroup("main");
+ // a) -zecke we don't want to check
+ if(!mediumCfg.readBoolEntry("use", true ) ) {
+ owait->hide();
+ delete owait;
return;
+ }
+ // find out wich filesystems are new in this round
+ // We will do this by having a timestamp inside each mountpoint
+ // if the current timestamp doesn't match this is a new file system and
+ // come up with our MediumMountGui :) let the hacking begin
+ int stamp = uidgen.generate();
- // find out wich filesystems are new in this round
- // We will do this by having a timestamp inside each mountpoint
- // if the current timestamp doesn't match this is a new file system and
- // come up with our MediumMountGui :) let the hacking begin
- int stamp = uidgen.generate();
+ QString newStamp = QString::number( stamp ); // generates newtime Stamp
- QString newStamp = QString::number( stamp ); // generates newtime Stamp
-
- // b)
- if( mediumCfg.readBoolEntry("global", true ) ){
+ // b)
+ if( mediumCfg.readBoolEntry("global", true ) ){
QString mime = configToMime(&mediumCfg).join(";");
for( it.toFirst(); it.current(); ++it ){
- if( (*it)->isRemovable() ){
- tmp = new DocLnkSet( (*it)->path(), mime );
- docsFolder->appendFrom( *tmp );
- delete tmp;
- }
+ if( (*it)->isRemovable() ){
+ tmp = new DocLnkSet( (*it)->path(), mime );
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+ }
} // done
+ owait->hide();
+ delete owait;
return; // save the else
- }
- // c) zecke
- for ( it.toFirst(); it.current(); ++it ) {
+ }
+ // c) zecke
+ for ( it.toFirst(); it.current(); ++it ) {
if ( (*it)->isRemovable() ) { // let's find out if we should search on it
- Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
- cfg.setGroup("main");
- QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
- /** This medium is uptodate
- */
- if( stamp == m_timeStamp ){ // ok we know this card
- cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
- // we need to scan the list now. Hopefully the cache will be there
- // read the mimetypes from the config and search for documents
- QStringList mimetypes = configToMime( &cfg);
- //qApp->processEvents();
+ Config cfg( (*it)->path() + "/.opiestorage.cf", Config::File);
+ cfg.setGroup("main");
+ QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
+ /** This medium is uptodate
+ */
+ if( stamp == m_timeStamp ){ // ok we know this card
+ cfg.writeEntry("timestamp", newStamp ); //just write a new timestamp
+ // we need to scan the list now. Hopefully the cache will be there
+ // read the mimetypes from the config and search for documents
+ QStringList mimetypes = configToMime( &cfg);
+ //qApp->processEvents();
+ Global::statusMessage( tr( "Searching documents" ) );
+ tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") );
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+
+ } else { // come up with the gui cause this a new card
+ MediumMountGui medium(&cfg, (*it)->path() );
+ if( medium.check() ){ // we did not ask before or ask again is off
+ /** c2) */
+ if( medium.exec() ){ // he clicked yes so search it
+ // speicher
+ //cfg.read(); // cause of a race we need to reread - fixed
+ cfg.setGroup("main");
+ cfg.writeEntry("timestamp", newStamp );
+ cfg.write();
+
+ //qApp->processEvents();
+ tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+ }// no else
+ /** c1) */
+ } else { // we checked
+ // do something different see what we need to do
+ // let's see if we should check the device
+ cfg.setGroup("main" );
+ bool check = cfg.readBoolEntry("autocheck", true );
+ if( check ){ // find the documents
+
+ //qApp->processEvents();
Global::statusMessage( tr( "Searching documents" ) );
- tmp = new DocLnkSet( (*it)->path(), mimetypes.join(";") );
- docsFolder->appendFrom( *tmp );
- delete tmp;
-
- }else{ // come up with the gui cause this a new card
- MediumMountGui medium(&cfg, (*it)->path() );
- if( medium.check() ){ // we did not ask before or ask again is off
- /** c2) */
- if( medium.exec() ){ // he clicked yes so search it
- // speicher
- //cfg.read(); // cause of a race we need to reread - fixed
- cfg.setGroup("main");
- cfg.writeEntry("timestamp", newStamp );
- cfg.write();
-
- //qApp->processEvents();
- tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
- docsFolder->appendFrom( *tmp );
- delete tmp;
- }// no else
- /** c1) */
- }else{ // we checked
- // do something different see what we need to do
- // let's see if we should check the device
- cfg.setGroup("main" );
- bool check = cfg.readBoolEntry("autocheck", true );
- if( check ){ // find the documents
-
- //qApp->processEvents();
- Global::statusMessage( tr( "Searching documents" ) );
- tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
- docsFolder->appendFrom( *tmp );
- delete tmp;
- }
- }
- }
- }
- }
- m_timeStamp = newStamp;
- owait->hide();
- delete owait;
+ tmp = new DocLnkSet( (*it)->path(), configToMime(&cfg ).join(";") );
+ docsFolder->appendFrom( *tmp );
+ delete tmp;
+ }
+ }
+ }
+ }
+ }
+ m_timeStamp = newStamp;
+ owait->hide();
+ delete owait;
}
@@ -850,3 +871,2 @@ void Launcher::updateTabs()
MimeType::updateApplications(); // ### reads all applnks twice
-
delete rootFolder;
@@ -861,4 +881,4 @@ void Launcher::updateDocs()
{
- loadDocs();
- tabs->updateDocs(docsFolder,storage->fileSystems());
+ loadDocs();
+ // tabs->updateDocs(docsFolder,storage->fileSystems());
}
@@ -884,13 +904,13 @@ void Launcher::select( const AppLnk *appLnk )
if ( appLnk->type() == "Folder" ) { // No tr
- // Not supported: flat is simpler for the user
+ // 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();
}
@@ -907,14 +927,14 @@ void Launcher::properties( AppLnk *appLnk )
if ( appLnk->type() == "Folder" ) { // No tr
- // Not supported: flat is simpler for the user
+ // 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);
+ }
}
@@ -927,11 +947,11 @@ void Launcher::updateLink(const QString& link)
if (link.isNull()) {
- updateTabs();
- notify_sm = true;
+ updateTabs();
+ notify_sm = true;
}
else if (link.isEmpty()) {
- updateDocs();
+ updateDocs();
}
else {
- tabs->updateLink(link);
- notify_sm = true;
+ tabs->updateLink(link);
+ notify_sm = true;
}
@@ -939,3 +959,3 @@ void Launcher::updateLink(const QString& link)
if ( notify_sm )
- QCopEnvelope e ( "QPE/TaskBar", "reloadApps()" );
+ QCopEnvelope e ( "QPE/TaskBar", "reloadApps()" );
}
@@ -944,59 +964,59 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
{
- QDataStream stream( data, IO_ReadOnly );
+ QDataStream stream( data, IO_ReadOnly );
if ( msg == "linkChanged(QString)" ) {
- QString link;
- stream >> link;
- if ( in_lnk_props ) {
- got_lnk_change = TRUE;
- lnk_change = link;
- } else {
- updateLink(link);
- }
+ 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 );
+ 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;
+ 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" );
+ QString home = getenv( "HOME" );
#ifndef QT_NO_COP
- QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
- e << home;
- int locked = (int) Desktop::screenLocked();
- e << locked;
+ QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
+ e << home;
+ int locked = (int) Desktop::screenLocked();
+ e << locked;
#endif
@@ -1052,75 +1072,75 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
else if ( msg == "sendVersionInfo()" ) {
- QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" );
- QString v2 = QString::fromLatin1("1.4");
- e << v2;
- //qDebug("version %s\n", line.latin1());
+ QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" );
+ QString v2 = QString::fromLatin1("1.4");
+ e << v2;
+ //qDebug("version %s\n", line.latin1());
} else if ( msg == "sendCardInfo()" ) {
#ifndef QT_NO_COP
- QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
+ 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;
+ 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;
#ifndef QT_NO_COP
- e << s;
+ e << s;
#endif
} else if ( msg == "sendSyncDate(QString)" ) {
- QString app;
- stream >> app;
- Config cfg( "qpe" );
- cfg.setGroup("SyncDate");
+ 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 );
+ 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() );
+ //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();
+ loadDocs();
@@ -1131,54 +1151,54 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
-// 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
- }
-
- //qDebug( "sending length %d", contents.length() );
+// 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
+ }
+
+ //qDebug( "sending length %d", contents.length() );
#ifndef QT_NO_COP
- QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" );
- e << contents;
+ 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() );
- delete docsFolder;
- docsFolder = 0;
+ delete docsFolder;
+ docsFolder = 0;
#ifdef QWS
} else if ( msg == "setMouseProto(QString)" ) {
- QString mice;
- stream >> mice;
- setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
- qwsServer->openMouse();
+ 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();
+ QString kb;
+ stream >> kb;
+ setenv("QWS_KEYBOARD",kb.latin1(),1);
+ qwsServer->openKeyboard();
#endif
@@ -1196,54 +1216,54 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
{
- QDataStream stream( data, IO_ReadOnly );
+ 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 );
+ 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 );
+ 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) );
+ 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) )
- if ( !fam. isEmpty ( ))
- tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
- else
- tabs->view(id)->unsetViewFont();
- qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
+ QString id;
+ stream >> id;
+ QString fam;
+ stream >> fam;
+ int size;
+ stream >> size;
+ int weight;
+ stream >> weight;
+ int italic;
+ stream >> italic;
+ if ( tabs->view(id) )
+ if ( !fam. isEmpty ( ))
+ tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+ else
+ tabs->view(id)->unsetViewFont();
+ qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
}
else if ( msg == "setBusyIndicatorType(QString)" ) {
- QString type;
- stream >> type;
- tabs->setBusyIndicatorType(type);
+ QString type;
+ stream >> type;
+ tabs->setBusyIndicatorType(type);
}
else if ( msg == "home()" ) {
- if ( isVisibleWindow( winId ( )))
- nextView ( );
- else
- raise ( );
+ if ( isVisibleWindow( winId ( )))
+ nextView ( );
+ else
+ raise ( );
@@ -1255,6 +1275,6 @@ void Launcher::storageChanged()
if ( in_lnk_props ) {
- got_lnk_change = TRUE;
- lnk_change = QString::null;
+ got_lnk_change = TRUE;
+ lnk_change = QString::null;
} else {
- updateLink( QString::null );
+ updateLink( QString::null );
}
@@ -1267,3 +1287,3 @@ bool Launcher::mkdir(const QString &localPath)
if (fullDir.exists())
- return true;
+ return true;
@@ -1279,4 +1299,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();
}
@@ -1284,21 +1304,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);
- }
-
- 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;
- }
- }
+ // 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());
+
+ if (!checkDir.mkdir(checkedPath)) {
+ qDebug("Unable to make directory %s", checkedPath.latin1());
+ return FALSE;
+ }
+ }
@@ -1315,3 +1335,3 @@ void Launcher::preloadApps()
#ifndef QT_NO_COP
- QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
+ QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
#endif
@@ -1319 +1339,17 @@ void Launcher::preloadApps()
}
+
+DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
+ : OFileSelector(parent,mode,selector,dirName,fileName)
+{
+ setYesCancelVisible(false);
+ setToolbarVisible(true);
+ setPermissionBarVisible(false);
+ setLineEditVisible(false) ;
+ //setChooserVisible( bool chooser );
+
+}
+
+DocumentTab::~DocumentTab() {
+
+}
+
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index c92ef5d..0616734 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -3,4 +3,3 @@
**
-** This file is part of the Qtopia Environment.
-**
+** This file is part of the Qtopia Environment.**
** This file may be distributed and/or modified under the terms of the
@@ -23,2 +22,6 @@
#include <qpe/config.h>
+#include <qpe/applnk.h>
+
+#include <opie/ofileselector.h>
+
#include <qmainwindow.h>
@@ -38,2 +41,13 @@ class SyncDialog;
+
+class DocumentTab : public OFileSelector
+{
+ Q_OBJECT
+public:
+ DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName);//, 4,0, "/","");
+~DocumentTab();
+private:
+
+};
+
class CategoryTabBar : public QTabBar
@@ -45,2 +59,4 @@ public:
+signals:
+
protected slots:
@@ -51,2 +67,3 @@ protected:
void paintLabel( QPainter* p, const QRect& br, QTab* t, bool has_focus ) const;
+
};
@@ -59,4 +76,4 @@ public:
void initializeCategories(AppLnkSet* rootFolder, AppLnkSet* docFolder,
- const QList<FileSystem> &);
- void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs);
+ const QList<FileSystem> &);
+// void updateDocs(AppLnkSet* docFolder, const QList<FileSystem> &fs);
void updateLink(const QString& linkfile);
@@ -66,2 +83,3 @@ public:
void setBusyIndicatorType ( const QString &type );
+ DocumentTab *fileSel;
signals:
@@ -70,3 +88,3 @@ signals:
void rightPressed(AppLnk*);
-
+ void ofileSel(const DocLnk &);
public slots:
@@ -75,3 +93,4 @@ public slots:
void showTab(const QString&);
-
+ void clickie(const DocLnk&);
+ void clickie(const QString &);
protected slots: