-rw-r--r-- | core/launcher/launcher.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
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 | |||
@@ -336,104 +336,105 @@ void CategoryTabWidget::setTabAppearance( const QString &id, Config &cfg ) | |||
336 | tab->bgColor = QColor(tabCol); | 336 | tab->bgColor = QColor(tabCol); |
337 | QString tabTextCol = cfg.readEntry( "TabTextColor" ); | 337 | QString tabTextCol = cfg.readEntry( "TabTextColor" ); |
338 | if ( tabTextCol.isEmpty() ) | 338 | if ( tabTextCol.isEmpty() ) |
339 | tab->fgColor = QColor(); | 339 | tab->fgColor = QColor(); |
340 | else | 340 | else |
341 | tab->fgColor = QColor(tabTextCol); | 341 | tab->fgColor = QColor(tabTextCol); |
342 | } | 342 | } |
343 | 343 | ||
344 | //void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/) | 344 | //void CategoryTabWidget::updateDocs(AppLnkSet* docFolder, const QList<FileSystem> & /*fs*/) |
345 | //{ | 345 | //{ |
346 | // docFolder->detachChildren(); | 346 | // docFolder->detachChildren(); |
347 | //} | 347 | //} |
348 | 348 | ||
349 | void CategoryTabWidget::tabProperties() | 349 | void CategoryTabWidget::tabProperties() |
350 | { | 350 | { |
351 | LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() ); | 351 | LauncherView *view = (LauncherView*)stack->widget( categoryBar->currentTab() ); |
352 | QPopupMenu *m = new QPopupMenu( this ); | 352 | QPopupMenu *m = new QPopupMenu( this ); |
353 | m->insertItem( tr("Icon View"), LauncherView::Icon ); | 353 | m->insertItem( tr("Icon View"), LauncherView::Icon ); |
354 | m->insertItem( tr("List View"), LauncherView::List ); | 354 | m->insertItem( tr("List View"), LauncherView::List ); |
355 | m->setItemChecked( (int)view->viewMode(), TRUE ); | 355 | m->setItemChecked( (int)view->viewMode(), TRUE ); |
356 | int rv = m->exec( QCursor::pos() ); | 356 | int rv = m->exec( QCursor::pos() ); |
357 | if ( rv >= 0 && rv != view->viewMode() ) { | 357 | if ( rv >= 0 && rv != view->viewMode() ) { |
358 | view->setViewMode( (LauncherView::ViewMode)rv ); | 358 | view->setViewMode( (LauncherView::ViewMode)rv ); |
359 | } | 359 | } |
360 | 360 | ||
361 | delete m; | 361 | delete m; |
362 | } | 362 | } |
363 | 363 | ||
364 | QString CategoryTabWidget::getAllDocLinkInfo() const | 364 | QString CategoryTabWidget::getAllDocLinkInfo() const |
365 | { | 365 | { |
366 | return ""; | 366 | return ""; |
367 | } | 367 | } |
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); |
408 | else | 409 | else |
409 | for (int i=0; i<tabs-1; i++) | 410 | for (int i=0; i<tabs-1; i++) |
410 | ((LauncherView*)stack->widget(i))->setBusy(FALSE); | 411 | ((LauncherView*)stack->widget(i))->setBusy(FALSE); |
411 | } | 412 | } |
412 | 413 | ||
413 | LauncherView *CategoryTabWidget::view( const QString &id ) | 414 | LauncherView *CategoryTabWidget::view( const QString &id ) |
414 | { | 415 | { |
415 | int idx = ids.findIndex( id ); | 416 | int idx = ids.findIndex( id ); |
416 | return (LauncherView *)stack->widget(idx); | 417 | return (LauncherView *)stack->widget(idx); |
417 | } | 418 | } |
418 | 419 | ||
419 | void CategoryTabWidget::setBusyIndicatorType ( const QString &type ) | 420 | void CategoryTabWidget::setBusyIndicatorType ( const QString &type ) |
420 | { | 421 | { |
421 | for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it ) | 422 | for ( QStringList::Iterator it = ids. begin ( ); it != ids. end ( ); ++it ) |
422 | view ( *it )-> setBusyIndicatorType ( type ); | 423 | view ( *it )-> setBusyIndicatorType ( type ); |
423 | } | 424 | } |
424 | 425 | ||
425 | //=========================================================================== | 426 | //=========================================================================== |
426 | 427 | ||
427 | CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name ) | 428 | CategoryTabBar::CategoryTabBar( QWidget *parent, const char *name ) |
428 | : QTabBar( parent, name ) | 429 | : QTabBar( parent, name ) |
429 | { | 430 | { |
430 | setFocusPolicy( NoFocus ); | 431 | setFocusPolicy( NoFocus ); |
431 | connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) ); | 432 | connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) ); |
432 | } | 433 | } |
433 | 434 | ||
434 | CategoryTabBar::~CategoryTabBar() | 435 | CategoryTabBar::~CategoryTabBar() |
435 | { | 436 | { |
436 | } | 437 | } |
437 | 438 | ||
438 | void CategoryTabBar::layoutTabs() | 439 | void CategoryTabBar::layoutTabs() |
439 | { | 440 | { |
@@ -1296,60 +1297,60 @@ bool Launcher::mkdir(const QString &localPath) | |||
1296 | QString checkedPath; | 1297 | QString checkedPath; |
1297 | 1298 | ||
1298 | // didn't find any seps; weird, use the cur dir instead | 1299 | // didn't find any seps; weird, use the cur dir instead |
1299 | if (dirIndex == -1) { | 1300 | if (dirIndex == -1) { |
1300 | //qDebug("No seperators found in path %s", localPath.latin1()); | 1301 | //qDebug("No seperators found in path %s", localPath.latin1()); |
1301 | checkedPath = QDir::currentDirPath(); | 1302 | checkedPath = QDir::currentDirPath(); |
1302 | } | 1303 | } |
1303 | 1304 | ||
1304 | while (checkedPath != localPath) { | 1305 | while (checkedPath != localPath) { |
1305 | // no more seperators found, use the local path | 1306 | // no more seperators found, use the local path |
1306 | if (dirIndex == -1) | 1307 | if (dirIndex == -1) |
1307 | checkedPath = localPath; | 1308 | checkedPath = localPath; |
1308 | else { | 1309 | else { |
1309 | // the next directory to check | 1310 | // the next directory to check |
1310 | checkedPath = localPath.left(dirIndex) + "/"; | 1311 | checkedPath = localPath.left(dirIndex) + "/"; |
1311 | // advance the iterator; the next dir seperator | 1312 | // advance the iterator; the next dir seperator |
1312 | dirIndex = localPath.find(dirSeps, dirIndex+1); | 1313 | dirIndex = localPath.find(dirSeps, dirIndex+1); |
1313 | } | 1314 | } |
1314 | 1315 | ||
1315 | QDir checkDir(checkedPath); | 1316 | QDir checkDir(checkedPath); |
1316 | if (!checkDir.exists()) { | 1317 | if (!checkDir.exists()) { |
1317 | //qDebug("mkdir making dir %s", checkedPath.latin1()); | 1318 | //qDebug("mkdir making dir %s", checkedPath.latin1()); |
1318 | 1319 | ||
1319 | if (!checkDir.mkdir(checkedPath)) { | 1320 | if (!checkDir.mkdir(checkedPath)) { |
1320 | qDebug("Unable to make directory %s", checkedPath.latin1()); | 1321 | qDebug("Unable to make directory %s", checkedPath.latin1()); |
1321 | return FALSE; | 1322 | return FALSE; |
1322 | } | 1323 | } |
1323 | } | 1324 | } |
1324 | 1325 | ||
1325 | } | 1326 | } |
1326 | return TRUE; | 1327 | return TRUE; |
1327 | } | 1328 | } |
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 | ||