Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 73 |
1 files changed, 50 insertions, 23 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 3efbb53..d4c5b42 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -1,49 +1,49 @@ | |||
1 | /* | 1 | /* |
2 | * GPLv2 zecke@handhelds.org | 2 | * GPLv2 zecke@handhelds.org |
3 | * No WArranty... | 3 | * No WArranty... |
4 | */ | 4 | */ |
5 | #include "mainwindow.h" | 5 | #include "mainwindow.h" |
6 | #include "imageview.h" | 6 | #include "imageview.h" |
7 | 7 | ||
8 | #include "iconview.h" | 8 | #include "iconview.h" |
9 | #include "filesystem.h" | 9 | #include "filesystem.h" |
10 | #include "imageinfoui.h" | 10 | #include "imageinfoui.h" |
11 | #include "viewmodebutton.h" | 11 | #include "viewmodebutton.h" |
12 | #include "basesetup.h" | 12 | #include "basesetup.h" |
13 | 13 | ||
14 | #include <iface/ifaceinfo.h> | 14 | #include <iface/ifaceinfo.h> |
15 | #include <iface/dirview.h> | 15 | #include <iface/dirview.h> |
16 | 16 | ||
17 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
18 | #include <opie2/owidgetstack.h> | 18 | #include <opie2/owidgetstack.h> |
19 | #include <opie2/oapplicationfactory.h> | 19 | #include <opie2/oapplicationfactory.h> |
20 | #include <opie2/otabwidget.h> | 20 | #include <opie2/otabwidget.h> |
21 | #include <opie2/okeyconfigwidget.h> | 21 | #include <opie2/okeyconfigwidget.h> |
22 | #include <opie2/owait.h> | 22 | #include <opie2/owait.h> |
23 | #include <opie2/oapplication.h> | 23 | #include <opie2/oapplication.h> |
24 | #include <opie2/oresource.h> | ||
24 | 25 | ||
25 | #include <qpe/resource.h> | ||
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | #include <qpe/ir.h> | 27 | #include <qpe/ir.h> |
28 | #include <qpe/storage.h> | 28 | #include <qpe/storage.h> |
29 | #include <qpe/applnk.h> | 29 | #include <qpe/applnk.h> |
30 | 30 | ||
31 | #include <qtoolbar.h> | 31 | #include <qtoolbar.h> |
32 | #include <qtoolbutton.h> | 32 | #include <qtoolbutton.h> |
33 | #include <qlayout.h> | 33 | #include <qlayout.h> |
34 | #include <qdialog.h> | 34 | #include <qdialog.h> |
35 | #include <qmap.h> | 35 | #include <qmap.h> |
36 | #include <qtimer.h> | 36 | #include <qtimer.h> |
37 | #include <qframe.h> | 37 | #include <qframe.h> |
38 | #include <qmenubar.h> | 38 | #include <qmenubar.h> |
39 | #include <qaction.h> | 39 | #include <qaction.h> |
40 | #include <qspinbox.h> | 40 | #include <qspinbox.h> |
41 | 41 | ||
42 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) | 42 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) |
43 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) | 43 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) |
44 | 44 | ||
45 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | 45 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) |
46 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) | 46 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) |
47 | { | 47 | { |
48 | setCaption( QObject::tr("Opie Eye" ) ); | 48 | setCaption( QObject::tr("Opie Eye" ) ); |
49 | m_cfg = new Opie::Core::OConfig("opie-eye"); | 49 | m_cfg = new Opie::Core::OConfig("opie-eye"); |
@@ -496,179 +496,204 @@ void PMainWindow::dirChanged() | |||
496 | m_dev.insert("Home directory",f); | 496 | m_dev.insert("Home directory",f); |
497 | fsMenu->insertItem("Home directory"); | 497 | fsMenu->insertItem("Home directory"); |
498 | } | 498 | } |
499 | const QList<FileSystem> &fs = m_storage->fileSystems(); | 499 | const QList<FileSystem> &fs = m_storage->fileSystems(); |
500 | QListIterator<FileSystem> it(fs ); | 500 | QListIterator<FileSystem> it(fs ); |
501 | for ( ; it.current(); ++it ) { | 501 | for ( ; it.current(); ++it ) { |
502 | const QString disk = (*it)->name(); | 502 | const QString disk = (*it)->name(); |
503 | const QString path = (*it)->path(); | 503 | const QString path = (*it)->path(); |
504 | m_dev.insert( disk, path ); | 504 | m_dev.insert( disk, path ); |
505 | fsMenu->insertItem( disk ); | 505 | fsMenu->insertItem( disk ); |
506 | } | 506 | } |
507 | } | 507 | } |
508 | 508 | ||
509 | void PMainWindow::showToolbar(bool how) | 509 | void PMainWindow::showToolbar(bool how) |
510 | { | 510 | { |
511 | if (!how) toolBar->hide(); | 511 | if (!how) toolBar->hide(); |
512 | else toolBar->show(); | 512 | else toolBar->show(); |
513 | if (autoSave) { | 513 | if (autoSave) { |
514 | m_cfg->writeEntry("showtoolbar",how); | 514 | m_cfg->writeEntry("showtoolbar",how); |
515 | } | 515 | } |
516 | } | 516 | } |
517 | 517 | ||
518 | void PMainWindow::setupActions() | 518 | void PMainWindow::setupActions() |
519 | { | 519 | { |
520 | m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true ); | 520 | m_aDirUp = new QAction( tr( "Go dir up" ), Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ), |
521 | 0, 0, this, 0, true ); | ||
521 | m_aDirUp->setToggleAction(false); | 522 | m_aDirUp->setToggleAction(false); |
522 | connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp())); | 523 | connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp())); |
523 | 524 | ||
524 | if ( Ir::supported() ) { | 525 | if ( Ir::supported() ) { |
525 | m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true ); | 526 | m_aBeam = new QAction( tr( "Beam file" ), Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ), |
527 | 0, 0, this, 0, true ); | ||
526 | m_aBeam->setToggleAction(false); | 528 | m_aBeam->setToggleAction(false); |
527 | connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam())); | 529 | connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam())); |
528 | } else { | 530 | } else { |
529 | m_aBeam = 0; | 531 | m_aBeam = 0; |
530 | } | 532 | } |
531 | 533 | ||
532 | m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true ); | 534 | m_aShowInfo = new QAction( tr( "Show imageinfo" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), |
535 | 0, 0, this, 0, true ); | ||
533 | m_aShowInfo->setToggleAction(false); | 536 | m_aShowInfo->setToggleAction(false); |
534 | connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo())); | 537 | connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo())); |
535 | 538 | ||
536 | m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true ); | 539 | m_aTrash = new QAction( tr( "Delete file" ), Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), |
540 | 0, 0, this, 0, true ); | ||
537 | m_aTrash->setToggleAction(false); | 541 | m_aTrash->setToggleAction(false); |
538 | connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash())); | 542 | connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash())); |
539 | 543 | ||
540 | m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true ); | 544 | m_aViewfile = new QAction( tr( "Display image" ), Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon), |
545 | 0, 0, this, 0, true ); | ||
541 | m_aViewfile->setToggleAction(false); | 546 | m_aViewfile->setToggleAction(false); |
542 | connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage())); | 547 | connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage())); |
543 | 548 | ||
544 | m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true ); | 549 | m_aStartSlide = new QAction( tr( "Start slideshow" ), Opie::Core::OResource::loadPixmap("play", Opie::Core::OResource::SmallIcon), |
550 | 0, 0, this, 0, true ); | ||
545 | m_aStartSlide->setToggleAction(false); | 551 | m_aStartSlide->setToggleAction(false); |
546 | connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide())); | 552 | connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide())); |
547 | 553 | ||
548 | m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true ); | 554 | m_aHideToolbar = new QAction( tr( "Show toolbar" ), Opie::Core::OResource::loadPixmap( "UtilsIcon", |
555 | Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true ); | ||
549 | m_aHideToolbar->setOn (true); | 556 | m_aHideToolbar->setOn (true); |
550 | connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool))); | 557 | connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool))); |
551 | 558 | ||
552 | m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true ); | 559 | m_aSetup = new QAction( tr( "Settings" ), Opie::Core::OResource::loadPixmap("SettingsIcon", Opie::Core::OResource::SmallIcon), |
560 | 0, 0, this, 0, true ); | ||
553 | m_aSetup->setToggleAction(false); | 561 | m_aSetup->setToggleAction(false); |
554 | connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig())); | 562 | connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig())); |
555 | 563 | ||
556 | m_gListViewMode = new QActionGroup(this,"Select listmode",true); | 564 | m_gListViewMode = new QActionGroup(this,"Select listmode",true); |
557 | connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*))); | 565 | connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*))); |
558 | 566 | ||
559 | m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true ); | 567 | m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", |
568 | Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); | ||
560 | m_aDirLong->setToggleAction(true); | 569 | m_aDirLong->setToggleAction(true); |
561 | m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true ); | 570 | m_aDirShort = new QAction( tr( "Thumbnail and name" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumbonly", |
571 | Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); | ||
562 | m_aDirShort->setToggleAction(true); | 572 | m_aDirShort->setToggleAction(true); |
563 | m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true ); | 573 | m_aDirName = new QAction( tr( "Name only" ), Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-textview", |
574 | Opie::Core::OResource::SmallIcon),0, 0, this, 0, true ); | ||
564 | m_aDirName->setToggleAction(true); | 575 | m_aDirName->setToggleAction(true); |
565 | int mode = m_cfg->readNumEntry("ListViewMode", 1); | 576 | int mode = m_cfg->readNumEntry("ListViewMode", 1); |
566 | if (mode < 1 || mode>3) mode = 1; | 577 | if (mode < 1 || mode>3) mode = 1; |
567 | switch (mode) { | 578 | switch (mode) { |
568 | case 3: | 579 | case 3: |
569 | m_aDirName->setOn(true); | 580 | m_aDirName->setOn(true); |
570 | break; | 581 | break; |
571 | case 2: | 582 | case 2: |
572 | m_aDirShort->setOn(true); | 583 | m_aDirShort->setOn(true); |
573 | break; | 584 | break; |
574 | case 1: | 585 | case 1: |
575 | default: | 586 | default: |
576 | m_aDirLong->setOn(true); | 587 | m_aDirLong->setOn(true); |
577 | } | 588 | } |
578 | m_gListViewMode->insert(m_aDirLong); | 589 | m_gListViewMode->insert(m_aDirLong); |
579 | m_gListViewMode->insert(m_aDirShort); | 590 | m_gListViewMode->insert(m_aDirShort); |
580 | m_gListViewMode->insert(m_aDirName); | 591 | m_gListViewMode->insert(m_aDirName); |
581 | 592 | ||
582 | m_gPrevNext = new QActionGroup(this,"imageprevnext",false); | 593 | m_gPrevNext = new QActionGroup(this,"imageprevnext",false); |
583 | m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true ); | 594 | m_aNext = new QAction( tr( "Next image" ),Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon), |
595 | 0, 0, this, 0, true ); | ||
584 | m_aNext->setToggleAction(false); | 596 | m_aNext->setToggleAction(false); |
585 | connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext())); | 597 | connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext())); |
586 | m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true ); | 598 | m_aPrevious = new QAction( tr( "Previous image" ),Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon), |
599 | 0, 0, this, 0, true ); | ||
587 | m_aPrevious->setToggleAction(false); | 600 | m_aPrevious->setToggleAction(false); |
588 | connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev())); | 601 | connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev())); |
589 | m_gPrevNext->insert(m_aPrevious); | 602 | m_gPrevNext->insert(m_aPrevious); |
590 | m_gPrevNext->insert(m_aNext); | 603 | m_gPrevNext->insert(m_aNext); |
591 | 604 | ||
592 | m_aFullScreen = new QAction( tr( "Show images fullscreen" ), | 605 | m_aFullScreen = new QAction( tr( "Show images fullscreen" ), |
593 | Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true ); | 606 | Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); |
594 | m_aFullScreen->setToggleAction(true); | 607 | m_aFullScreen->setToggleAction(true); |
595 | if (autoSave) { | 608 | if (autoSave) { |
596 | m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false)); | 609 | m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false)); |
597 | } else { | 610 | } else { |
598 | m_aFullScreen->setOn(false); | 611 | m_aFullScreen->setOn(false); |
599 | } | 612 | } |
600 | connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); | 613 | connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); |
601 | 614 | ||
602 | m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); | 615 | m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); |
603 | m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true ); | 616 | m_aAutoRotate = new QAction( tr( "Auto rotate images" ), |
617 | Opie::Core::OResource::loadPixmap( "rotate", Opie::Core::OResource::SmallIcon ), | ||
618 | 0, 0, this, 0, true ); | ||
604 | m_aAutoRotate->setToggleAction(true); | 619 | m_aAutoRotate->setToggleAction(true); |
605 | 620 | ||
606 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 621 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
607 | m_aAutoRotate->setOn(true); | 622 | m_aAutoRotate->setOn(true); |
608 | } else { | 623 | } else { |
609 | m_aAutoRotate->setOn(false); | 624 | m_aAutoRotate->setOn(false); |
610 | } | 625 | } |
611 | if (autoSave) { | 626 | if (autoSave) { |
612 | m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn())); | 627 | m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn())); |
613 | } | 628 | } |
614 | connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); | 629 | connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); |
615 | 630 | ||
616 | m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true ); | 631 | m_aUnscaled = new QAction( tr( "Show images unscaled" ), |
632 | Opie::Core::OResource::loadPixmap( "1to1", Opie::Core::OResource::SmallIcon ), | ||
633 | 0, 0, this, 0, true ); | ||
617 | m_aUnscaled->setToggleAction(true); | 634 | m_aUnscaled->setToggleAction(true); |
618 | connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); | 635 | connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); |
619 | if (autoSave) { | 636 | if (autoSave) { |
620 | m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false)); | 637 | m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false)); |
621 | } else { | 638 | } else { |
622 | m_aUnscaled->setOn(false); | 639 | m_aUnscaled->setOn(false); |
623 | } | 640 | } |
624 | 641 | ||
625 | m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true ); | 642 | m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), |
643 | Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ), | ||
644 | 0, 0, this, 0, true ); | ||
626 | m_aZoomer->setToggleAction(true); | 645 | m_aZoomer->setToggleAction(true); |
627 | if (autoSave) { | 646 | if (autoSave) { |
628 | m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true)); | 647 | m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true)); |
629 | } else { | 648 | } else { |
630 | m_aZoomer->setOn (true); | 649 | m_aZoomer->setOn (true); |
631 | } | 650 | } |
632 | connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool))); | 651 | connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool))); |
633 | m_gDisplayType->insert(m_aAutoRotate); | 652 | m_gDisplayType->insert(m_aAutoRotate); |
634 | m_gDisplayType->insert(m_aUnscaled); | 653 | m_gDisplayType->insert(m_aUnscaled); |
635 | m_gDisplayType->insert(m_aZoomer); | 654 | m_gDisplayType->insert(m_aZoomer); |
636 | 655 | ||
637 | m_hGroup = new QActionGroup(this,"actioncollection",false); | 656 | m_hGroup = new QActionGroup(this,"actioncollection",false); |
638 | m_hGroup->insert(m_aFullScreen); | 657 | m_hGroup->insert(m_aFullScreen); |
639 | 658 | ||
640 | if (!m_SmallWindow) { | 659 | if (!m_SmallWindow) { |
641 | m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true); | 660 | m_aForceSmall = new QAction(tr("Dont show seperate windows"), |
661 | Opie::Core::OResource::loadPixmap( "AppsIcon", Opie::Core::OResource::SmallIcon ), | ||
662 | 0, 0, this, 0, true); | ||
642 | m_aForceSmall->setToggleAction(true); | 663 | m_aForceSmall->setToggleAction(true); |
643 | connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool))); | 664 | connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool))); |
644 | } else { | 665 | } else { |
645 | m_aForceSmall = 0; | 666 | m_aForceSmall = 0; |
646 | } | 667 | } |
647 | m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); | 668 | m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); |
648 | connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); | 669 | connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); |
649 | m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); | 670 | m_IncBrightness = new QAction(tr("Increase brightness by 5"), |
650 | m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); | 671 | Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ), |
672 | 0, 0, this, 0, false); | ||
673 | m_DecBrightness = new QAction(tr("Decrease brightness by 5"), | ||
674 | Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ), | ||
675 | 0, 0, this, 0, false); | ||
651 | m_hBright = new QActionGroup(this,"actioncollection",false), | 676 | m_hBright = new QActionGroup(this,"actioncollection",false), |
652 | m_hBright->insert(m_setCurrentBrightness); | 677 | m_hBright->insert(m_setCurrentBrightness); |
653 | m_hBright->insert(m_IncBrightness); | 678 | m_hBright->insert(m_IncBrightness); |
654 | m_hBright->insert(m_DecBrightness); | 679 | m_hBright->insert(m_DecBrightness); |
655 | } | 680 | } |
656 | 681 | ||
657 | void PMainWindow::setupBrightness() | 682 | void PMainWindow::setupBrightness() |
658 | { | 683 | { |
659 | if (!m_disp) { | 684 | if (!m_disp) { |
660 | return; | 685 | return; |
661 | } | 686 | } |
662 | bool reshow=false; | 687 | bool reshow=false; |
663 | if (m_disp->isVisible()&&m_disp->fullScreen()) { | 688 | if (m_disp->isVisible()&&m_disp->fullScreen()) { |
664 | m_disp->hide(); | 689 | m_disp->hide(); |
665 | reshow = true; | 690 | reshow = true; |
666 | } | 691 | } |
667 | int lb = m_disp->Intensity(); | 692 | int lb = m_disp->Intensity(); |
668 | if (Valuebox(0,-100,100,lb,lb)) { | 693 | if (Valuebox(0,-100,100,lb,lb)) { |
669 | m_disp->setIntensity(lb,true); | 694 | m_disp->setIntensity(lb,true); |
670 | } | 695 | } |
671 | if (reshow) { | 696 | if (reshow) { |
672 | m_disp->showFullScreen(); | 697 | m_disp->showFullScreen(); |
673 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | 698 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); |
674 | } | 699 | } |
@@ -699,61 +724,63 @@ void PMainWindow::setupToolbar() | |||
699 | if (!m_SmallWindow) { | 724 | if (!m_SmallWindow) { |
700 | m_gPrevNext->addTo(toolBar); | 725 | m_gPrevNext->addTo(toolBar); |
701 | } else { | 726 | } else { |
702 | m_gPrevNext->setEnabled(false); | 727 | m_gPrevNext->setEnabled(false); |
703 | } | 728 | } |
704 | } | 729 | } |
705 | 730 | ||
706 | void PMainWindow::setupMenu() | 731 | void PMainWindow::setupMenu() |
707 | { | 732 | { |
708 | fileMenu = new QPopupMenu( menuBar() ); | 733 | fileMenu = new QPopupMenu( menuBar() ); |
709 | menuBar()->insertItem( tr( "File" ), fileMenu ); | 734 | menuBar()->insertItem( tr( "File" ), fileMenu ); |
710 | dispMenu = new QPopupMenu( menuBar() ); | 735 | dispMenu = new QPopupMenu( menuBar() ); |
711 | menuBar()->insertItem( tr( "Show" ), dispMenu ); | 736 | menuBar()->insertItem( tr( "Show" ), dispMenu ); |
712 | settingsMenu = new QPopupMenu( menuBar() ); | 737 | settingsMenu = new QPopupMenu( menuBar() ); |
713 | menuBar()->insertItem( tr( "Settings" ), settingsMenu ); | 738 | menuBar()->insertItem( tr( "Settings" ), settingsMenu ); |
714 | 739 | ||
715 | m_aViewfile->addTo(fileMenu); | 740 | m_aViewfile->addTo(fileMenu); |
716 | m_aShowInfo->addTo(fileMenu); | 741 | m_aShowInfo->addTo(fileMenu); |
717 | m_aStartSlide->addTo(fileMenu); | 742 | m_aStartSlide->addTo(fileMenu); |
718 | 743 | ||
719 | fileMenu->insertSeparator(); | 744 | fileMenu->insertSeparator(); |
720 | m_aDirUp->addTo( fileMenu ); | 745 | m_aDirUp->addTo( fileMenu ); |
721 | 746 | ||
722 | fsMenu = new QPopupMenu(fileMenu); | 747 | fsMenu = new QPopupMenu(fileMenu); |
723 | fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu); | 748 | fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ), |
749 | tr("Select filesystem"),fsMenu); | ||
724 | connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); | 750 | connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); |
725 | dirChanged(); | 751 | dirChanged(); |
726 | 752 | ||
727 | if ( m_aBeam ) { | 753 | if ( m_aBeam ) { |
728 | fileMenu->insertSeparator(); | 754 | fileMenu->insertSeparator(); |
729 | m_aBeam->addTo( fileMenu ); | 755 | m_aBeam->addTo( fileMenu ); |
730 | } | 756 | } |
731 | fileMenu->insertSeparator(); | 757 | fileMenu->insertSeparator(); |
732 | m_aTrash->addTo(fileMenu); | 758 | m_aTrash->addTo(fileMenu); |
733 | 759 | ||
734 | listviewMenu = new QPopupMenu(dispMenu); | 760 | listviewMenu = new QPopupMenu(dispMenu); |
735 | dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); | 761 | dispMenu->insertItem(Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", Opie::Core::OResource::SmallIcon), |
762 | tr("Listview mode"),listviewMenu); | ||
736 | m_gListViewMode->addTo(listviewMenu); | 763 | m_gListViewMode->addTo(listviewMenu); |
737 | dispMenu->insertSeparator(); | 764 | dispMenu->insertSeparator(); |
738 | m_aFullScreen->addTo(dispMenu); | 765 | m_aFullScreen->addTo(dispMenu); |
739 | m_gDisplayType->addTo(dispMenu); | 766 | m_gDisplayType->addTo(dispMenu); |
740 | dispMenu->insertSeparator(); | 767 | dispMenu->insertSeparator(); |
741 | m_gPrevNext->addTo(dispMenu); | 768 | m_gPrevNext->addTo(dispMenu); |
742 | dispMenu->insertSeparator(); | 769 | dispMenu->insertSeparator(); |
743 | m_hBright->addTo(dispMenu); | 770 | m_hBright->addTo(dispMenu); |
744 | m_hBright->setEnabled(false); | 771 | m_hBright->setEnabled(false); |
745 | 772 | ||
746 | if (m_aForceSmall) { | 773 | if (m_aForceSmall) { |
747 | dispMenu->insertSeparator(); | 774 | dispMenu->insertSeparator(); |
748 | m_aForceSmall->addTo(dispMenu); | 775 | m_aForceSmall->addTo(dispMenu); |
749 | } | 776 | } |
750 | 777 | ||
751 | m_aSetup->addTo(settingsMenu); | 778 | m_aSetup->addTo(settingsMenu); |
752 | m_aHideToolbar->addTo(settingsMenu); | 779 | m_aHideToolbar->addTo(settingsMenu); |
753 | } | 780 | } |
754 | 781 | ||
755 | void PMainWindow::listviewselected(QAction*which) | 782 | void PMainWindow::listviewselected(QAction*which) |
756 | { | 783 | { |
757 | if (!which || which->isOn()==false) return; | 784 | if (!which || which->isOn()==false) return; |
758 | int val = 1; | 785 | int val = 1; |
759 | 786 | ||