author | mickeyl <mickeyl> | 2003-08-13 12:24:47 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-08-13 12:24:47 (UTC) |
commit | 6e7dbb9320256c326cd19e7555b4309e71d039e3 (patch) (unidiff) | |
tree | 3a64f0284a7f9f2a2fdbacffde3e11eb768b79bc | |
parent | db952faa29fa56602b061ef4faff61cc57f71243 (diff) | |
download | opie-6e7dbb9320256c326cd19e7555b4309e71d039e3.zip opie-6e7dbb9320256c326cd19e7555b4309e71d039e3.tar.gz opie-6e7dbb9320256c326cd19e7555b4309e71d039e3.tar.bz2 |
make it at least compile. ljp, please look @ the doctab
-rw-r--r-- | Rules.make | 1 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 27 |
2 files changed, 15 insertions, 13 deletions
@@ -45,32 +45,33 @@ $(QTDIR)/stamp-headers : | |||
45 | ( cd $(QTDIR)/include; \ | 45 | ( cd $(QTDIR)/include; \ |
46 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ | 46 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
47 | qcopchannel_qws.h qwindowsystem_qws.h \ | 47 | qcopchannel_qws.h qwindowsystem_qws.h \ |
48 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 48 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
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 .; ) |
73 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 74 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
74 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 75 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
75 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 76 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
76 | touch $@ | 77 | touch $@ |
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 | |||
@@ -368,40 +368,41 @@ QString CategoryTabWidget::getAllDocLinkInfo() const | |||
368 | 368 | ||
369 | LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label ) | 369 | LauncherView* CategoryTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label ) |
370 | { | 370 | { |
371 | LauncherView* view = new LauncherView( stack ); | 371 | LauncherView* view = new LauncherView( stack ); |
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 | ||
382 | void CategoryTabWidget::updateLink(const QString& linkfile) | 382 | void 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 | ||
394 | void CategoryTabWidget::paletteChange( const QPalette &p ) | 395 | void 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 | ||
404 | void CategoryTabWidget::setBusy(bool on) | 405 | void CategoryTabWidget::setBusy(bool on) |
405 | { | 406 | { |
406 | if ( on ) | 407 | if ( on ) |
407 | ((LauncherView*)stack->visibleWidget())->setBusy(TRUE); | 408 | ((LauncherView*)stack->visibleWidget())->setBusy(TRUE); |
@@ -1328,28 +1329,28 @@ bool Launcher::mkdir(const QString &localPath) | |||
1328 | 1329 | ||
1329 | void Launcher::preloadApps() | 1330 | void Launcher::preloadApps() |
1330 | { | 1331 | { |
1331 | Config cfg("Launcher"); | 1332 | Config cfg("Launcher"); |
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 | ||
1341 | DocumentTab::DocumentTab( QWidget *parent, int mode, int selector, const QString &dirName, const QString &fileName) | 1342 | DocumentTab::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 | ||
1352 | DocumentTab::~DocumentTab() { | 1353 | DocumentTab::~DocumentTab() { |
1353 | 1354 | ||
1354 | } | 1355 | } |
1355 | 1356 | ||