-rw-r--r-- | core/launcher/launcherview.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index e8741a2..7b20fdc 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -386,218 +386,227 @@ bool LauncherIconView::removeLink(const QString& linkfile) | |||
386 | || dl.isValid() && dl.file() == l->file() ) { | 386 | || dl.isValid() && dl.file() == l->file() ) { |
387 | delete item; | 387 | delete item; |
388 | did = TRUE; | 388 | did = TRUE; |
389 | } | 389 | } |
390 | item = (LauncherItem*)item->nextItem(); | 390 | item = (LauncherItem*)item->nextItem(); |
391 | } | 391 | } |
392 | QListIterator<AppLnk> it(hidden); | 392 | QListIterator<AppLnk> it(hidden); |
393 | while ((l=it.current())) { | 393 | while ((l=it.current())) { |
394 | ++it; | 394 | ++it; |
395 | if ( l->linkFileKnown() && l->linkFile() == linkfile | 395 | if ( l->linkFileKnown() && l->linkFile() == linkfile |
396 | || l->file() == linkfile | 396 | || l->file() == linkfile |
397 | || dl.isValid() && dl.file() == l->file() ) { | 397 | || dl.isValid() && dl.file() == l->file() ) { |
398 | hidden.removeRef(l); | 398 | hidden.removeRef(l); |
399 | did = TRUE; | 399 | did = TRUE; |
400 | } | 400 | } |
401 | } | 401 | } |
402 | return did; | 402 | return did; |
403 | } | 403 | } |
404 | 404 | ||
405 | LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) | 405 | LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) |
406 | : QVBox( parent, name, fl ) | 406 | : QVBox( parent, name, fl ) |
407 | { | 407 | { |
408 | icons = new LauncherIconView( this ); | 408 | icons = new LauncherIconView( this ); |
409 | setFocusProxy(icons); | 409 | setFocusProxy(icons); |
410 | QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold ); | 410 | QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold ); |
411 | 411 | ||
412 | int dw = QApplication::desktop()->width(); | 412 | int dw = QApplication::desktop()->width(); |
413 | icons->setItemsMovable( FALSE ); | 413 | icons->setItemsMovable( FALSE ); |
414 | icons->setAutoArrange( TRUE ); | 414 | icons->setAutoArrange( TRUE ); |
415 | icons->setSorting( TRUE ); | 415 | icons->setSorting( TRUE ); |
416 | icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 | 416 | icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240 |
417 | icons->setGridY( fontMetrics().height()*2+24 ); | 417 | icons->setGridY( fontMetrics().height()*2+24 ); |
418 | icons->setFrameStyle( QFrame::NoFrame ); | 418 | icons->setFrameStyle( QFrame::NoFrame ); |
419 | icons->setSpacing( 4 ); | 419 | icons->setSpacing( 4 ); |
420 | icons->setMargin( 0 ); | 420 | icons->setMargin( 0 ); |
421 | icons->setSelectionMode( QIconView::Multi ); | 421 | icons->setSelectionMode( QIconView::Multi ); |
422 | icons->setBackgroundMode( PaletteBase ); | 422 | icons->setBackgroundMode( PaletteBase ); |
423 | 423 | ||
424 | connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)), | 424 | connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)), |
425 | SLOT(itemClicked(int, QIconViewItem *)) ); | 425 | SLOT(itemClicked(int, QIconViewItem *)) ); |
426 | connect( icons, SIGNAL(selectionChanged()), | 426 | connect( icons, SIGNAL(selectionChanged()), |
427 | SLOT(selectionChanged()) ); | 427 | SLOT(selectionChanged()) ); |
428 | connect( icons, SIGNAL(returnPressed(QIconViewItem *)), | 428 | connect( icons, SIGNAL(returnPressed(QIconViewItem *)), |
429 | SLOT(returnPressed(QIconViewItem *)) ); | 429 | SLOT(returnPressed(QIconViewItem *)) ); |
430 | connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)), | 430 | connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)), |
431 | SLOT(itemPressed(int, QIconViewItem *)) ); | 431 | SLOT(itemPressed(int, QIconViewItem *)) ); |
432 | 432 | ||
433 | tools = 0; | 433 | tools = 0; |
434 | } | 434 | } |
435 | 435 | ||
436 | LauncherView::~LauncherView() | 436 | LauncherView::~LauncherView() |
437 | { | 437 | { |
438 | } | 438 | } |
439 | 439 | ||
440 | void LauncherView::setToolsEnabled(bool y) | 440 | void LauncherView::setToolsEnabled(bool y) |
441 | { | 441 | { |
442 | if ( !y != !tools ) { | 442 | if ( !y != !tools ) { |
443 | if ( y ) { | 443 | if ( y ) { |
444 | tools = new QHBox(this); | 444 | tools = new QHBox(this); |
445 | 445 | ||
446 | // Type filter | 446 | // Type filter |
447 | typemb = new MenuButton(tools); | 447 | typemb = new MenuButton(tools); |
448 | typemb->setLabel(tr("Type: %1")); | 448 | typemb->setLabel(tr("Type: %1")); |
449 | 449 | ||
450 | // Category filter | 450 | // Category filter |
451 | catmb = new CategorySelect(tools); | 451 | catmb = new CategorySelect(tools); |
452 | 452 | ||
453 | updateTools(); | 453 | updateTools(); |
454 | tools->show(); | 454 | tools->show(); |
455 | } else { | 455 | } else { |
456 | delete tools; | 456 | delete tools; |
457 | tools = 0; | 457 | tools = 0; |
458 | } | 458 | } |
459 | } | 459 | } |
460 | } | 460 | } |
461 | 461 | ||
462 | void LauncherView::updateTools() | 462 | void LauncherView::updateTools() |
463 | { | 463 | { |
464 | disconnect( typemb, SIGNAL(selected(const QString&)), | 464 | disconnect( typemb, SIGNAL(selected(const QString&)), |
465 | this, SLOT(showType(const QString&)) ); | 465 | this, SLOT(showType(const QString&)) ); |
466 | disconnect( catmb, SIGNAL(signalSelected(int)), | 466 | disconnect( catmb, SIGNAL(signalSelected(int)), |
467 | this, SLOT(showCategory(int)) ); | 467 | this, SLOT(showCategory(int)) ); |
468 | 468 | ||
469 | icons->updateCategoriesAndMimeTypes(); | 469 | icons->updateCategoriesAndMimeTypes(); |
470 | 470 | ||
471 | QString prev; | 471 | QString prev; |
472 | 472 | ||
473 | // Type filter | 473 | // Type filter |
474 | QStringList types; | 474 | QStringList types; |
475 | types << tr("All"); | 475 | types << tr("All"); |
476 | types << "--"; | 476 | types << "--"; |
477 | types += icons->mimeTypes(); | 477 | types += icons->mimeTypes(); |
478 | prev = typemb->currentText(); | 478 | prev = typemb->currentText(); |
479 | typemb->clear(); | 479 | typemb->clear(); |
480 | typemb->insertItems(types); | 480 | typemb->insertItems(types); |
481 | typemb->select(prev); | 481 | typemb->select(prev); |
482 | 482 | ||
483 | Categories cats( 0 ); | 483 | Categories cats( 0 ); |
484 | cats.load( categoryFileName() ); | 484 | cats.load( categoryFileName() ); |
485 | QArray<int> vl( 0 ); | 485 | QArray<int> vl( 0 ); |
486 | catmb->setCategories( vl, "Document View", tr("Document View") ); | 486 | catmb->setCategories( vl, "Document View", tr("Document View") ); |
487 | catmb->setRemoveCategoryEdit( TRUE ); | 487 | catmb->setRemoveCategoryEdit( TRUE ); |
488 | catmb->setAllCategories( TRUE ); | 488 | catmb->setAllCategories( TRUE ); |
489 | 489 | ||
490 | connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&))); | 490 | connect(typemb, SIGNAL(selected(const QString&)), this, SLOT(showType(const QString&))); |
491 | connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); | 491 | connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); |
492 | } | 492 | } |
493 | 493 | ||
494 | void LauncherView::sortBy(int s) | 494 | void LauncherView::sortBy(int s) |
495 | { | 495 | { |
496 | icons->setSortMethod((LauncherIconView::SortMethod)s); | 496 | icons->setSortMethod((LauncherIconView::SortMethod)s); |
497 | } | 497 | } |
498 | 498 | ||
499 | void LauncherView::showType(const QString& t) | 499 | void LauncherView::showType(const QString& t) |
500 | { | 500 | { |
501 | if ( t == tr("All") ) { | 501 | if ( t == tr("All") ) { |
502 | icons->setTypeFilter("",TRUE); | 502 | icons->setTypeFilter("",TRUE); |
503 | } else { | 503 | } else { |
504 | icons->setTypeFilter(t+"/*",TRUE); | 504 | icons->setTypeFilter(t+"/*",TRUE); |
505 | } | 505 | } |
506 | } | 506 | } |
507 | 507 | ||
508 | void LauncherView::showCategory( int c ) | 508 | void LauncherView::showCategory( int c ) |
509 | { | 509 | { |
510 | icons->setCategoryFilter( c, TRUE ); | 510 | icons->setCategoryFilter( c, TRUE ); |
511 | } | 511 | } |
512 | 512 | ||
513 | void LauncherView::resizeEvent(QResizeEvent *e) | 513 | void LauncherView::resizeEvent(QResizeEvent *e) |
514 | { | 514 | { |
515 | QVBox::resizeEvent( e ); | 515 | QVBox::resizeEvent( e ); |
516 | if ( e->size().width() != e->oldSize().width() ) | 516 | if ( e->size().width() != e->oldSize().width() ) |
517 | sort(); | 517 | sort(); |
518 | } | 518 | } |
519 | 519 | ||
520 | void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) | 520 | void LauncherView::populate( AppLnkSet *folder, const QString& typefilter ) |
521 | { | 521 | { |
522 | icons->clear(); | 522 | icons->clear(); |
523 | internalPopulate( folder, typefilter ); | 523 | internalPopulate( folder, typefilter ); |
524 | } | 524 | } |
525 | 525 | ||
526 | void LauncherView::selectionChanged() | 526 | void LauncherView::selectionChanged() |
527 | { | 527 | { |
528 | QIconViewItem* item = icons->currentItem(); | 528 | QIconViewItem* item = icons->currentItem(); |
529 | if ( item && item->isSelected() ) { | 529 | if ( item && item->isSelected() ) { |
530 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 530 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
531 | if ( icons->inKeyEvent() ) // not for mouse press | 531 | if ( icons->inKeyEvent() ) // not for mouse press |
532 | emit clicked( appLnk ); | 532 | emit clicked( appLnk ); |
533 | item->setSelected(FALSE); | 533 | item->setSelected(FALSE); |
534 | } | 534 | } |
535 | } | 535 | } |
536 | 536 | ||
537 | void LauncherView::returnPressed( QIconViewItem *item ) | 537 | void LauncherView::returnPressed( QIconViewItem *item ) |
538 | { | 538 | { |
539 | if ( item ) { | 539 | if ( item ) { |
540 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 540 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
541 | emit clicked( appLnk ); | 541 | emit clicked( appLnk ); |
542 | } | 542 | } |
543 | } | 543 | } |
544 | 544 | ||
545 | void LauncherView::itemClicked( int btn, QIconViewItem *item ) | 545 | void LauncherView::itemClicked( int btn, QIconViewItem *item ) |
546 | { | 546 | { |
547 | if ( item ) { | 547 | if ( item ) { |
548 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 548 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
549 | if ( btn == LeftButton ) { | 549 | if ( btn == LeftButton ) { |
550 | // Make sure it's the item we execute that gets highlighted | 550 | // Make sure it's the item we execute that gets highlighted |
551 | icons->setCurrentItem( item ); | 551 | icons->setCurrentItem( item ); |
552 | emit clicked( appLnk ); | 552 | emit clicked( appLnk ); |
553 | } | 553 | } |
554 | item->setSelected(FALSE); | 554 | item->setSelected(FALSE); |
555 | } | 555 | } |
556 | } | 556 | } |
557 | 557 | ||
558 | void LauncherView::itemPressed( int btn, QIconViewItem *item ) | 558 | void LauncherView::itemPressed( int btn, QIconViewItem *item ) |
559 | { | 559 | { |
560 | if ( item ) { | 560 | if ( item ) { |
561 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); | 561 | AppLnk *appLnk = ((LauncherItem *)item)->appLnk(); |
562 | if ( btn == RightButton ) | 562 | if ( btn == RightButton ) |
563 | emit rightPressed( appLnk ); | 563 | emit rightPressed( appLnk ); |
564 | /* | 564 | /* |
565 | else if ( btn == LeftButton ) | 565 | else if ( btn == LeftButton ) |
566 | emit clicked( appLnk ); | 566 | emit clicked( appLnk ); |
567 | */ | 567 | */ |
568 | item->setSelected(FALSE); | 568 | item->setSelected(FALSE); |
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||
572 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) | 572 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) |
573 | { | 573 | { |
574 | QListIterator<AppLnk> it( folder->children() ); | 574 | QListIterator<AppLnk> it( folder->children() ); |
575 | icons->setTypeFilter(typefilter,FALSE); | 575 | icons->setTypeFilter(typefilter,FALSE); |
576 | 576 | ||
577 | while ( it.current() ) { | 577 | while ( it.current() ) { |
578 | icons->addItem(*it,FALSE); | 578 | // show only the icons for existing files |
579 | if (!QFile(it.current()->file()).exists() ) | ||
580 | { | ||
581 | //maybe insert some .desktop file deletion code later | ||
582 | //maybe dir specific | ||
583 | } | ||
584 | else | ||
585 | { | ||
586 | icons->addItem(*it,FALSE); | ||
587 | } | ||
579 | ++it; | 588 | ++it; |
580 | } | 589 | } |
581 | 590 | ||
582 | icons->sort(); | 591 | icons->sort(); |
583 | } | 592 | } |
584 | 593 | ||
585 | bool LauncherView::removeLink(const QString& linkfile) | 594 | bool LauncherView::removeLink(const QString& linkfile) |
586 | { | 595 | { |
587 | return icons->removeLink(linkfile); | 596 | return icons->removeLink(linkfile); |
588 | } | 597 | } |
589 | 598 | ||
590 | void LauncherView::sort() | 599 | void LauncherView::sort() |
591 | { | 600 | { |
592 | icons->sort(); | 601 | icons->sort(); |
593 | } | 602 | } |
594 | 603 | ||
595 | void LauncherView::addItem(AppLnk* app, bool resort) | 604 | void LauncherView::addItem(AppLnk* app, bool resort) |
596 | { | 605 | { |
597 | icons->addItem(app,resort); | 606 | icons->addItem(app,resort); |
598 | } | 607 | } |
599 | 608 | ||
600 | void LauncherView::setFileSystems(const QList<FileSystem> &) | 609 | void LauncherView::setFileSystems(const QList<FileSystem> &) |
601 | { | 610 | { |
602 | // ### does nothing now... | 611 | // ### does nothing now... |
603 | } | 612 | } |