summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--core/launcher/launcher.cpp27
2 files changed, 15 insertions, 13 deletions
diff --git a/Rules.make b/Rules.make
index ab77abf..5fd8d90 100644
--- a/Rules.make
+++ b/Rules.make
@@ -49,24 +49,25 @@ $(QTDIR)/stamp-headers :
49 touch $@ 49 touch $@
50 50
51$(QTDIR)/stamp-headers-x11 : 51$(QTDIR)/stamp-headers-x11 :
52 @-rm -f $(QTDIR)/stamp-headers* 52 @-rm -f $(QTDIR)/stamp-headers*
53 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 53 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
54 touch $@ 54 touch $@
55 55
56$(OPIEDIR)/stamp-headers : 56$(OPIEDIR)/stamp-headers :
57 @-rm -f $(OPIEDIR)/stamp-headers* 57 @-rm -f $(OPIEDIR)/stamp-headers*
58 mkdir -p $(TOPDIR)/include/qpe \ 58 mkdir -p $(TOPDIR)/include/qpe \
59 $(TOPDIR)/include/qtopia \ 59 $(TOPDIR)/include/qtopia \
60 $(TOPDIR)/include/opie \ 60 $(TOPDIR)/include/opie \
61 $(TOPDIR)/include/opie2 \
61 $(TOPDIR)/include/qtopia/private 62 $(TOPDIR)/include/qtopia/private
62 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 63 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
63 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 64 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
64 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 65 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
65 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 66 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
66 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 67 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
67 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 68 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
68 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 69 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
69 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 70 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
70 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 71 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
71 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 72 #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
72 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 73 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 0205622..b612aa2 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -372,32 +372,33 @@ LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm,
372 connect( view, SIGNAL(clicked(const AppLnk*)), 372 connect( view, SIGNAL(clicked(const AppLnk*)),
373 this, SIGNAL(clicked(const AppLnk*))); 373 this, SIGNAL(clicked(const AppLnk*)));
374 connect( view, SIGNAL(rightPressed(AppLnk*)), 374 connect( view, SIGNAL(rightPressed(AppLnk*)),
375 this, SIGNAL(rightPressed(AppLnk*))); 375 this, SIGNAL(rightPressed(AppLnk*)));
376 ids.append(id); 376 ids.append(id);
377 categoryBar->addTab( new CategoryTab( pm, label ) ); 377 categoryBar->addTab( new CategoryTab( pm, label ) );
378 stack->addWidget( view, tabs++ ); 378 stack->addWidget( view, tabs++ );
379 return view; 379 return view;
380} 380}
381 381
382void CategoryTabWidget::updateLink(const QString& linkfile) 382void CategoryTabWidget::updateLink(const QString& linkfile)
383{ 383{
384 // LauncherView* view; 384 int i=0;
385 qApp->processEvents(); 385 LauncherView* view;
386// while ((view = (LauncherView*)stack->widget(i++))) { 386 //qApp->processEvents();
387// if ( view->removeLink(linkfile) ) 387 while ((view = (LauncherView*)stack->widget(i++))) {
388// break; 388 if ( view->removeLink(linkfile) )
389// } 389 break;
390 // addItem(linkfile); 390 }
391 fileSel->reparse(); 391 addItem(linkfile);
392 docview->updateTools();
392} 393}
393 394
394void CategoryTabWidget::paletteChange( const QPalette &p ) 395void CategoryTabWidget::paletteChange( const QPalette &p )
395{ 396{
396 QVBox::paletteChange( p ); 397 QVBox::paletteChange( p );
397 QPalette pal = palette(); 398 QPalette pal = palette();
398 pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) ); 399 pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
399 pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); 400 pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
400 categoryBar->setPalette( pal ); 401 categoryBar->setPalette( pal );
401 categoryBar->update(); 402 categoryBar->update();
402} 403}
403 404
@@ -1332,24 +1333,24 @@ void Launcher::preloadApps()
1332 cfg.setGroup("Preload"); 1333 cfg.setGroup("Preload");
1333 QStringList apps = cfg.readListEntry("Apps",','); 1334 QStringList apps = cfg.readListEntry("Apps",',');
1334 for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) { 1335 for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
1335#ifndef QT_NO_COP 1336#ifndef QT_NO_COP
1336 QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()"); 1337 QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
1337#endif 1338#endif
1338 } 1339 }
1339} 1340}
1340 1341
1341DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName) 1342DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName)
1342 : OFileSelector(parent,mode,selector,dirName,fileName) 1343 : OFileSelector(parent,mode,selector,dirName,fileName)
1343{ 1344{
1344 setYesCancelVisible(false); 1345 //setYesCancelVisible(false);
1345 setToolbarVisible(false); 1346 //setToolbarVisible(false);
1346 setPermissionBarVisible(false); 1347 //setPermissionBarVisible(false);
1347 setLineEditVisible(false) ; 1348 //setLineEditVisible(false) ;
1348 //setChooserVisible( bool chooser ); 1349 //setChooserVisible( bool chooser );
1349 1350
1350} 1351}
1351 1352
1352DocumentTab::~DocumentTab() { 1353DocumentTab::~DocumentTab() {
1353 1354
1354} 1355}
1355 1356