-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 3 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 173 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 20 |
5 files changed, 159 insertions, 40 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 0499af9..a41ce9f 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -652,68 +652,67 @@ void PIconView::slotShowPrev() | |||
652 | /* if name is empty isDir is false, too. */ | 652 | /* if name is empty isDir is false, too. */ |
653 | m_view->setCurrentItem(m_view->currentItem()->prevItem()); | 653 | m_view->setCurrentItem(m_view->currentItem()->prevItem()); |
654 | name = prevFileName(isDir); | 654 | name = prevFileName(isDir); |
655 | } | 655 | } |
656 | if (name.isEmpty()) { | 656 | if (name.isEmpty()) { |
657 | slotShowLast(); | 657 | slotShowLast(); |
658 | return; | 658 | return; |
659 | } | 659 | } |
660 | if (isDir) return; | 660 | if (isDir) return; |
661 | /* if we got a name we have a prev item */ | 661 | /* if we got a name we have a prev item */ |
662 | m_view->setCurrentItem(m_view->currentItem()->prevItem()); | 662 | m_view->setCurrentItem(m_view->currentItem()->prevItem()); |
663 | slotShowImage(name); | 663 | slotShowImage(name); |
664 | } | 664 | } |
665 | 665 | ||
666 | void PIconView::slotShowImage() | 666 | void PIconView::slotShowImage() |
667 | { | 667 | { |
668 | bool isDir = false; | 668 | bool isDir = false; |
669 | QString name = currentFileName(isDir); | 669 | QString name = currentFileName(isDir); |
670 | if (isDir) return; | 670 | if (isDir) return; |
671 | slotShowImage( name ); | 671 | slotShowImage( name ); |
672 | } | 672 | } |
673 | void PIconView::slotShowImage( const QString& name) { | 673 | void PIconView::slotShowImage( const QString& name) { |
674 | PDirLister *lister = currentView()->dirLister(); | 674 | PDirLister *lister = currentView()->dirLister(); |
675 | QString r_name = lister->nameToFname(name); | 675 | QString r_name = lister->nameToFname(name); |
676 | emit sig_display( r_name ); | 676 | emit sig_display(r_name); |
677 | } | 677 | } |
678 | 678 | ||
679 | void PIconView::slotStartSlide() { | 679 | void PIconView::slotStartSlide() { |
680 | bool isDir = false; | 680 | bool isDir = false; |
681 | QString name = currentFileName(isDir); | 681 | QString name = currentFileName(isDir); |
682 | if (isDir) { | 682 | if (isDir) { |
683 | if (!slotShowFirst()) | 683 | if (!slotShowFirst()) |
684 | return; | 684 | return; |
685 | } else { | 685 | } else { |
686 | slotShowImage( name ); | 686 | slotShowImage( name ); |
687 | } | 687 | } |
688 | emit sig_startslide(2); | 688 | emit sig_startslide(2); |
689 | } | 689 | } |
690 | 690 | ||
691 | void PIconView::slotImageInfo() { | 691 | void PIconView::slotImageInfo() { |
692 | bool isDir = false; | 692 | bool isDir = false; |
693 | QString name = currentFileName(isDir); | 693 | QString name = currentFileName(isDir); |
694 | if (isDir) return; | 694 | if (isDir) return; |
695 | |||
696 | slotImageInfo( name ); | 695 | slotImageInfo( name ); |
697 | } | 696 | } |
698 | 697 | ||
699 | void PIconView::slotImageInfo( const QString& name) { | 698 | void PIconView::slotImageInfo( const QString& name) { |
700 | PDirLister *lister = currentView()->dirLister(); | 699 | PDirLister *lister = currentView()->dirLister(); |
701 | QString r_name = lister->nameToFname(name); | 700 | QString r_name = lister->nameToFname(name); |
702 | emit sig_showInfo(r_name ); | 701 | emit sig_showInfo(r_name ); |
703 | } | 702 | } |
704 | 703 | ||
705 | 704 | ||
706 | void PIconView::slotChangeMode( int mode ) { | 705 | void PIconView::slotChangeMode( int mode ) { |
707 | if ( mode >= 1 && mode <= 3 ) | 706 | if ( mode >= 1 && mode <= 3 ) |
708 | m_mode = mode; | 707 | m_mode = mode; |
709 | 708 | ||
710 | m_cfg->writeEntry("ListViewMode", m_mode); | 709 | m_cfg->writeEntry("ListViewMode", m_mode); |
711 | /* performance! */ | 710 | /* performance! */ |
712 | m_view->clear(); | 711 | m_view->clear(); |
713 | calculateGrid(); | 712 | calculateGrid(); |
714 | slotReloadDir(); | 713 | slotReloadDir(); |
715 | } | 714 | } |
716 | 715 | ||
717 | 716 | ||
718 | void PIconView::resizeEvent( QResizeEvent* re ) { | 717 | void PIconView::resizeEvent( QResizeEvent* re ) { |
719 | QVBox::resizeEvent( re ); | 718 | QVBox::resizeEvent( re ); |
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index bccbb0e..dff55ed 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h | |||
@@ -16,49 +16,49 @@ class PIconViewItem; | |||
16 | class PDirLister; | 16 | class PDirLister; |
17 | class Ir; | 17 | class Ir; |
18 | 18 | ||
19 | namespace Opie { | 19 | namespace Opie { |
20 | namespace Core{ | 20 | namespace Core{ |
21 | class OConfig; | 21 | class OConfig; |
22 | class OKeyConfigManager; | 22 | class OKeyConfigManager; |
23 | } | 23 | } |
24 | } | 24 | } |
25 | 25 | ||
26 | class PIconView : public QVBox { | 26 | class PIconView : public QVBox { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | friend class PIconViewItem; | 28 | friend class PIconViewItem; |
29 | enum ActionIds { | 29 | enum ActionIds { |
30 | BeamItem, DeleteItem, ViewItem, InfoItem,SlideItem | 30 | BeamItem, DeleteItem, ViewItem, InfoItem,SlideItem |
31 | }; | 31 | }; |
32 | public: | 32 | public: |
33 | PIconView( QWidget* wid, Opie::Core::OConfig *cfg ); | 33 | PIconView( QWidget* wid, Opie::Core::OConfig *cfg ); |
34 | ~PIconView(); | 34 | ~PIconView(); |
35 | void resetView(); | 35 | void resetView(); |
36 | Opie::Core::OKeyConfigManager* manager(); | 36 | Opie::Core::OKeyConfigManager* manager(); |
37 | 37 | ||
38 | signals: | 38 | signals: |
39 | void sig_showInfo( const QString& ); | 39 | void sig_showInfo( const QString& ); |
40 | void sig_display( const QString& ); | 40 | void sig_display(const QString&); |
41 | void sig_startslide(int timeout); | 41 | void sig_startslide(int timeout); |
42 | 42 | ||
43 | public slots: | 43 | public slots: |
44 | virtual void slotShowNext(); | 44 | virtual void slotShowNext(); |
45 | virtual void slotShowPrev(); | 45 | virtual void slotShowPrev(); |
46 | virtual void slotShowLast(); | 46 | virtual void slotShowLast(); |
47 | virtual bool slotShowFirst(); | 47 | virtual bool slotShowFirst(); |
48 | 48 | ||
49 | protected: | 49 | protected: |
50 | void resizeEvent( QResizeEvent* ); | 50 | void resizeEvent( QResizeEvent* ); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | void initKeys(); | 53 | void initKeys(); |
54 | QString currentFileName(bool &isDir)const; | 54 | QString currentFileName(bool &isDir)const; |
55 | QString nextFileName(bool &isDir)const; | 55 | QString nextFileName(bool &isDir)const; |
56 | QString prevFileName(bool &isDir)const; | 56 | QString prevFileName(bool &isDir)const; |
57 | void loadViews(); | 57 | void loadViews(); |
58 | void calculateGrid(); | 58 | void calculateGrid(); |
59 | 59 | ||
60 | private slots: | 60 | private slots: |
61 | void slotDirUp(); | 61 | void slotDirUp(); |
62 | void slotChangeDir(const QString&); | 62 | void slotChangeDir(const QString&); |
63 | void slotTrash(); | 63 | void slotTrash(); |
64 | void slotViewChanged( int ); | 64 | void slotViewChanged( int ); |
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index b699aa1..a20c879 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -182,25 +182,24 @@ void ImageView::hide() | |||
182 | { | 182 | { |
183 | if (fullScreen()) { | 183 | if (fullScreen()) { |
184 | m_ignore_next_in = true; | 184 | m_ignore_next_in = true; |
185 | showNormal(); | 185 | showNormal(); |
186 | } | 186 | } |
187 | QWidget::hide(); | 187 | QWidget::hide(); |
188 | } | 188 | } |
189 | void ImageView::enableFullscreen() | 189 | void ImageView::enableFullscreen() |
190 | { | 190 | { |
191 | if (!fullScreen()) return; | 191 | if (!fullScreen()) return; |
192 | if (m_ignore_next_in) {m_ignore_next_in = false;return;} | 192 | if (m_ignore_next_in) {m_ignore_next_in = false;return;} |
193 | 193 | ||
194 | setUpdatesEnabled(false); | 194 | setUpdatesEnabled(false); |
195 | // This is needed because showNormal() forcefully changes the window | 195 | // This is needed because showNormal() forcefully changes the window |
196 | // style to WSTyle_TopLevel. | 196 | // style to WSTyle_TopLevel. |
197 | reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); | 197 | reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); |
198 | // Enable fullscreen. | 198 | // Enable fullscreen. |
199 | /* this is the trick - I don't now why, but after a showFullScreen QTE toggles the focus | 199 | /* this is the trick - I don't now why, but after a showFullScreen QTE toggles the focus |
200 | * so we must block it here! */ | 200 | * so we must block it here! */ |
201 | m_ignore_next_in = true; | 201 | m_ignore_next_in = true; |
202 | showFullScreen(); | 202 | showFullScreen(); |
203 | setUpdatesEnabled(true); | 203 | setUpdatesEnabled(true); |
204 | 204 | ||
205 | } | 205 | } |
206 | |||
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 3c946b6..a1349a8 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -1,206 +1,267 @@ | |||
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 | 12 | ||
13 | #include <iface/ifaceinfo.h> | 13 | #include <iface/ifaceinfo.h> |
14 | #include <iface/dirview.h> | 14 | #include <iface/dirview.h> |
15 | 15 | ||
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/owidgetstack.h> | 17 | #include <opie2/owidgetstack.h> |
18 | #include <opie2/oapplicationfactory.h> | 18 | #include <opie2/oapplicationfactory.h> |
19 | #include <opie2/otabwidget.h> | 19 | #include <opie2/otabwidget.h> |
20 | #include <opie2/okeyconfigwidget.h> | 20 | #include <opie2/okeyconfigwidget.h> |
21 | 21 | ||
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
24 | #include <qpe/ir.h> | 24 | #include <qpe/ir.h> |
25 | #include <qpe/storage.h> | ||
25 | #include <qpe/applnk.h> | 26 | #include <qpe/applnk.h> |
26 | 27 | ||
27 | #include <qtoolbar.h> | 28 | #include <qtoolbar.h> |
28 | #include <qtoolbutton.h> | 29 | #include <qtoolbutton.h> |
29 | #include <qlayout.h> | 30 | #include <qlayout.h> |
30 | #include <qdialog.h> | 31 | #include <qdialog.h> |
31 | #include <qmap.h> | 32 | #include <qmap.h> |
32 | #include <qtimer.h> | 33 | #include <qtimer.h> |
33 | #include <qframe.h> | 34 | #include <qframe.h> |
34 | 35 | #include <qmenubar.h> | |
36 | #include <qaction.h> | ||
35 | 37 | ||
36 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) | 38 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) |
37 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) | 39 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) |
38 | 40 | ||
39 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | 41 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) |
40 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) | 42 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) |
41 | { | 43 | { |
42 | setCaption( QObject::tr("Opie Eye Caramba" ) ); | 44 | setCaption( QObject::tr("Opie Eye Caramba" ) ); |
43 | m_cfg = new Opie::Core::OConfig("phunkview"); | 45 | m_cfg = new Opie::Core::OConfig("phunkview"); |
44 | m_cfg->setGroup("Zecke_view" ); | 46 | m_cfg->setGroup("Zecke_view" ); |
47 | |||
48 | m_storage = new StorageInfo(); | ||
49 | connect(m_storage, SIGNAL(disksChanged() ), | ||
50 | this, SLOT( dirChanged() ) ); | ||
51 | |||
45 | /* | 52 | /* |
46 | * Initialize ToolBar and IconView | 53 | * Initialize ToolBar and IconView |
47 | * And Connect Them | 54 | * And Connect Them |
48 | */ | 55 | */ |
49 | QToolBar *bar = new QToolBar( this ); | 56 | toolBar = new QToolBar( this ); |
50 | bar->setHorizontalStretchable( true ); | 57 | menuBar = new QMenuBar( this ); |
58 | fileMenu = new QPopupMenu( menuBar ); | ||
59 | menuBar->insertItem( tr( "File" ), fileMenu ); | ||
60 | dispMenu = new QPopupMenu( menuBar ); | ||
61 | menuBar->insertItem( tr( "Show" ), dispMenu ); | ||
62 | |||
63 | addToolBar(toolBar); | ||
64 | toolBar->setHorizontalStretchable( true ); | ||
51 | setToolBarsMovable( false ); | 65 | setToolBarsMovable( false ); |
52 | 66 | ||
53 | m_stack = new Opie::Ui::OWidgetStack( this ); | 67 | m_stack = new Opie::Ui::OWidgetStack( this ); |
54 | setCentralWidget( m_stack ); | 68 | setCentralWidget( m_stack ); |
55 | 69 | ||
56 | m_view = new PIconView( m_stack, m_cfg ); | 70 | m_view = new PIconView( m_stack, m_cfg ); |
57 | m_stack->addWidget( m_view, IconView ); | 71 | m_stack->addWidget( m_view, IconView ); |
58 | m_stack->raiseWidget( IconView ); | 72 | m_stack->raiseWidget( IconView ); |
73 | |||
59 | connect(m_view, SIGNAL(sig_display(const QString&)), | 74 | connect(m_view, SIGNAL(sig_display(const QString&)), |
60 | this, SLOT(slotDisplay(const QString&))); | 75 | this, SLOT(slotDisplay(const QString&))); |
61 | connect(m_view, SIGNAL(sig_showInfo(const QString&)), | 76 | connect(m_view, SIGNAL(sig_showInfo(const QString&)), |
62 | this, SLOT(slotShowInfo(const QString&)) ); | 77 | this, SLOT(slotShowInfo(const QString&)) ); |
63 | 78 | ||
64 | m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); | 79 | m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); |
65 | 80 | ||
66 | upButton = new QToolButton( bar ); | 81 | m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), |
67 | upButton->setIconSet( Resource::loadIconSet( "up" ) ); | 82 | 0, 0, this, 0, true ); |
68 | connect( upButton, SIGNAL(clicked()), | 83 | m_aDirUp->setToggleAction(false); |
69 | m_view, SLOT(slotDirUp()) ); | 84 | connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp())); |
85 | m_aDirUp->addTo( toolBar ); | ||
70 | 86 | ||
71 | fsButton = new PFileSystem( bar ); | 87 | QToolButton*btn; |
88 | |||
89 | fsButton = new PFileSystem( toolBar ); | ||
72 | connect( fsButton, SIGNAL( changeDir( const QString& ) ), | 90 | connect( fsButton, SIGNAL( changeDir( const QString& ) ), |
73 | m_view, SLOT(slotChangeDir( const QString& ) ) ); | 91 | m_view, SLOT(slotChangeDir( const QString& ) ) ); |
92 | connect( this, SIGNAL( changeDir( const QString& ) ), | ||
93 | m_view, SLOT(slotChangeDir( const QString& ) ) ); | ||
74 | 94 | ||
75 | QToolButton*btn = new QToolButton( bar ); | 95 | m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), |
76 | btn->setIconSet( Resource::loadIconSet( "edit" ) ); | 96 | 0, 0, this, 0, true ); |
77 | connect( btn, SIGNAL(clicked()), | 97 | m_aShowInfo->setToggleAction(false); |
78 | m_view, SLOT(slotImageInfo()) ); | 98 | connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo())); |
99 | m_aShowInfo->addTo( toolBar ); | ||
79 | 100 | ||
80 | if ( Ir::supported() ) { | 101 | if ( Ir::supported() ) { |
81 | btn = new QToolButton( bar ); | 102 | m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ), |
82 | btn->setIconSet( Resource::loadIconSet( "beam" ) ); | 103 | 0, 0, this, 0, true ); |
83 | connect( btn, SIGNAL(clicked()), | 104 | m_aBeam->setToggleAction(false); |
84 | m_view, SLOT(slotBeam()) ); | 105 | connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam())); |
106 | m_aBeam->addTo( toolBar ); | ||
85 | } | 107 | } |
108 | m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet( "trash" ), | ||
109 | 0, 0, this, 0, true ); | ||
110 | m_aTrash->setToggleAction(false); | ||
111 | connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash())); | ||
112 | m_aTrash->addTo( toolBar ); | ||
86 | 113 | ||
87 | btn = new QToolButton( bar ); | 114 | m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet( "mag" ), |
88 | btn->setIconSet( Resource::loadIconSet( "trash" ) ); | 115 | 0, 0, this, 0, true ); |
89 | connect( btn, SIGNAL(clicked() ), | 116 | m_aViewfile->setToggleAction(false); |
90 | m_view, SLOT(slotTrash() ) ); | 117 | connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage())); |
118 | |||
119 | m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet( "play" ), | ||
120 | 0, 0, this, 0, true ); | ||
121 | m_aStartSlide->setToggleAction(false); | ||
122 | |||
123 | connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide())); | ||
91 | 124 | ||
92 | 125 | ||
93 | int mode = m_cfg->readNumEntry("ListViewMode", 1); | 126 | int mode = m_cfg->readNumEntry("ListViewMode", 1); |
94 | if (mode < 1 || mode>3) mode = 1; | 127 | if (mode < 1 || mode>3) mode = 1; |
95 | viewModeButton = new ViewModeButton( bar,mode ); | 128 | viewModeButton = new ViewModeButton( toolBar,mode ); |
96 | connect( viewModeButton, SIGNAL(changeMode(int)), | 129 | connect( viewModeButton, SIGNAL(changeMode(int)), |
97 | m_view, SLOT(slotChangeMode(int))); | 130 | m_view, SLOT(slotChangeMode(int))); |
98 | 131 | ||
99 | btn = new QToolButton( bar ); | 132 | btn = new QToolButton( toolBar ); |
100 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); | 133 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); |
101 | connect( btn, SIGNAL(clicked() ), | 134 | connect( btn, SIGNAL(clicked() ), |
102 | this, SLOT(slotConfig() ) ); | 135 | this, SLOT(slotConfig() ) ); |
103 | 136 | ||
104 | 137 | prevButton = new QToolButton(toolBar); | |
105 | |||
106 | prevButton = new QToolButton(bar); | ||
107 | prevButton->setIconSet( Resource::loadIconSet( "back" ) ); | 138 | prevButton->setIconSet( Resource::loadIconSet( "back" ) ); |
108 | connect(prevButton,SIGNAL(clicked()),m_view,SLOT(slotShowPrev())); | 139 | connect(prevButton,SIGNAL(clicked()),m_view,SLOT(slotShowPrev())); |
109 | 140 | ||
110 | nextButton = new QToolButton(bar); | 141 | nextButton = new QToolButton(toolBar); |
111 | nextButton->setIconSet( Resource::loadIconSet( "forward" ) ); | 142 | nextButton->setIconSet( Resource::loadIconSet( "forward" ) ); |
112 | connect(nextButton,SIGNAL(clicked()),m_view,SLOT(slotShowNext())); | 143 | connect(nextButton,SIGNAL(clicked()),m_view,SLOT(slotShowNext())); |
113 | 144 | ||
114 | rotateButton = new QToolButton(bar); | 145 | /* filemenu start */ |
146 | m_aViewfile->addTo(fileMenu); | ||
147 | m_aShowInfo->addTo(fileMenu); | ||
148 | m_aStartSlide->addTo(fileMenu); | ||
149 | |||
150 | fileMenu->insertSeparator(); | ||
151 | m_aDirUp->addTo( fileMenu ); | ||
152 | |||
153 | fsMenu = new QPopupMenu(fileMenu); | ||
154 | fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu); | ||
155 | connect( fsMenu, SIGNAL( activated( int ) ), | ||
156 | this, SLOT(slotSelectDir( int ) ) ); | ||
157 | dirChanged(); | ||
158 | |||
159 | fileMenu->insertSeparator(); | ||
160 | if ( Ir::supported() ) { | ||
161 | m_aBeam->addTo( fileMenu ); | ||
162 | } | ||
163 | fileMenu->insertSeparator(); | ||
164 | m_aTrash->addTo( fileMenu ); | ||
165 | /* filemenu end */ | ||
166 | |||
167 | rotateButton = new QToolButton(toolBar); | ||
115 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); | 168 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); |
116 | rotateButton->setToggleButton(true); | 169 | rotateButton->setToggleButton(true); |
117 | |||
118 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 170 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
119 | rotateButton->setOn(true); | 171 | rotateButton->setOn(true); |
120 | autoRotate = true; | 172 | autoRotate = true; |
121 | prevButton->hide(); | 173 | prevButton->hide(); |
122 | nextButton->hide(); | 174 | nextButton->hide(); |
123 | } else { | 175 | } else { |
124 | rotateButton->setOn(false); | 176 | rotateButton->setOn(false); |
125 | autoRotate = false; | 177 | autoRotate = false; |
126 | } | 178 | } |
127 | |||
128 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); | 179 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); |
129 | 180 | ||
130 | scaleButton = new QToolButton(bar); | 181 | scaleButton = new QToolButton(toolBar); |
131 | scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) ); | 182 | scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) ); |
132 | scaleButton->setToggleButton(true); | 183 | scaleButton->setToggleButton(true); |
133 | scaleButton->setOn(false); | 184 | scaleButton->setOn(false); |
134 | connect(scaleButton,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); | 185 | connect(scaleButton,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); |
135 | autoScale = true; | 186 | autoScale = true; |
136 | 187 | ||
137 | zoomButton = new QToolButton(bar); | 188 | zoomButton = new QToolButton(toolBar); |
138 | zoomButton->setIconSet( Resource::loadIconSet( "mag" ) ); | 189 | zoomButton->setIconSet( Resource::loadIconSet( "mag" ) ); |
139 | zoomButton->setToggleButton(true); | 190 | zoomButton->setToggleButton(true); |
140 | zoomButton->setOn(true); | 191 | zoomButton->setOn(true); |
141 | connect(zoomButton,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool))); | 192 | connect(zoomButton,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool))); |
142 | zoomerOn = true; | 193 | zoomerOn = true; |
194 | |||
195 | /* showmenu */ | ||
196 | m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), | ||
197 | 0, 0, this, 0, true ); | ||
198 | m_aHideToolbar->setOn (true); | ||
199 | m_aHideToolbar->addTo(dispMenu); | ||
200 | connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool))); | ||
201 | /* showmenu end*/ | ||
202 | |||
143 | } | 203 | } |
144 | 204 | ||
145 | PMainWindow::~PMainWindow() { | 205 | PMainWindow::~PMainWindow() { |
146 | } | 206 | } |
147 | 207 | ||
148 | void PMainWindow::slotToggleZoomer() | 208 | void PMainWindow::slotToggleZoomer() |
149 | { | 209 | { |
150 | if (!m_disp) return; | 210 | if (!m_disp) return; |
151 | bool cur = zoomButton->isOn(); | 211 | bool cur = zoomButton->isOn(); |
152 | zoomButton->setOn(!cur); | 212 | zoomButton->setOn(!cur); |
153 | } | 213 | } |
154 | 214 | ||
155 | void PMainWindow::slotZoomerToggled(bool how) | 215 | void PMainWindow::slotZoomerToggled(bool how) |
156 | { | 216 | { |
157 | zoomerOn = how; | 217 | zoomerOn = how; |
158 | if (m_disp) { | 218 | if (m_disp) { |
159 | m_disp->setShowZoomer(zoomerOn); | 219 | m_disp->setShowZoomer(zoomerOn); |
160 | } | 220 | } |
161 | } | 221 | } |
162 | 222 | ||
163 | void PMainWindow::slotToggleAutorotate() | 223 | void PMainWindow::slotToggleAutorotate() |
164 | { | 224 | { |
165 | if (!m_disp) return; | 225 | if (!m_disp) return; |
166 | if (!rotateButton->isEnabled()) return; | 226 | if (!rotateButton->isEnabled()) return; |
167 | bool cur = rotateButton->isOn(); | 227 | bool cur = rotateButton->isOn(); |
168 | rotateButton->setOn(!cur); | 228 | rotateButton->setOn(!cur); |
169 | } | 229 | } |
170 | 230 | ||
171 | void PMainWindow::slotToggleAutoscale() | 231 | void PMainWindow::slotToggleAutoscale() |
172 | { | 232 | { |
173 | if (!m_disp) return; | 233 | if (!m_disp) return; |
174 | bool cur = scaleButton->isOn(); | 234 | bool cur = scaleButton->isOn(); |
175 | scaleButton->setOn(!cur); | 235 | scaleButton->setOn(!cur); |
176 | } | 236 | } |
177 | 237 | ||
178 | void PMainWindow::slotRotateToggled(bool how) | 238 | void PMainWindow::slotRotateToggled(bool how) |
179 | { | 239 | { |
240 | odebug << "Autorotate: " << how << oendl; | ||
180 | autoRotate = how; | 241 | autoRotate = how; |
181 | if (m_disp) { | 242 | if (m_disp) { |
182 | m_disp->setAutoRotate(how); | 243 | m_disp->setAutoScaleRotate(autoScale,autoRotate); |
183 | } | 244 | } |
184 | } | 245 | } |
185 | 246 | ||
186 | void PMainWindow::slotScaleToggled(bool how) | 247 | void PMainWindow::slotScaleToggled(bool how) |
187 | { | 248 | { |
188 | autoScale = !how; | 249 | autoScale = !how; |
189 | if (!how) { | 250 | if (!how) { |
190 | autoRotate = how; | 251 | autoRotate = how; |
191 | } | 252 | } |
192 | if (m_disp) { | 253 | if (m_disp) { |
193 | m_disp->setAutoScaleRotate(autoScale,autoRotate); | 254 | m_disp->setAutoScaleRotate(autoScale,autoRotate); |
194 | } | 255 | } |
195 | if (!autoScale) { | 256 | if (!autoScale) { |
196 | rotateButton->setOn(false); | 257 | rotateButton->setOn(false); |
197 | } | 258 | } |
198 | rotateButton->setEnabled(!how); | 259 | rotateButton->setEnabled(!how); |
199 | } | 260 | } |
200 | 261 | ||
201 | void PMainWindow::slotConfig() { | 262 | void PMainWindow::slotConfig() { |
202 | /* | 263 | /* |
203 | * have a tab with the possible views | 264 | * have a tab with the possible views |
204 | * a tab for globals image cache size.. scaled loading | 265 | * a tab for globals image cache size.. scaled loading |
205 | * and one tab for the KeyConfigs | 266 | * and one tab for the KeyConfigs |
206 | */ | 267 | */ |
@@ -346,101 +407,143 @@ void PMainWindow::slotToggleFullScreen() | |||
346 | setUpdatesEnabled(true); | 407 | setUpdatesEnabled(true); |
347 | } | 408 | } |
348 | m_disp->setFullScreen(current); | 409 | m_disp->setFullScreen(current); |
349 | } | 410 | } |
350 | 411 | ||
351 | /** | 412 | /** |
352 | * With big Screen the plan could be to 'detach' the image | 413 | * With big Screen the plan could be to 'detach' the image |
353 | * window if visible and to create a ne wone | 414 | * window if visible and to create a ne wone |
354 | * init* already supports it but I make no use of it for | 415 | * init* already supports it but I make no use of it for |
355 | * now. We set filename and raise | 416 | * now. We set filename and raise |
356 | * | 417 | * |
357 | * ### FIXME and talk to alwin | 418 | * ### FIXME and talk to alwin |
358 | */ | 419 | */ |
359 | void PMainWindow::slotShowInfo( const QString& inf ) { | 420 | void PMainWindow::slotShowInfo( const QString& inf ) { |
360 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { | 421 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { |
361 | return; | 422 | return; |
362 | } | 423 | } |
363 | if ( !m_info ) { | 424 | if ( !m_info ) { |
364 | initInfo(); | 425 | initInfo(); |
365 | } | 426 | } |
366 | m_info->setPath( inf ); | 427 | m_info->setPath( inf ); |
367 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 428 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
368 | prevButton->hide(); | 429 | prevButton->hide(); |
369 | nextButton->hide(); | 430 | nextButton->hide(); |
370 | upButton->hide(); | 431 | m_aDirUp->setEnabled(false); |
432 | m_aShowInfo->setEnabled(false); | ||
433 | m_aViewfile->setEnabled(true); | ||
434 | m_aStartSlide->setEnabled(false); | ||
371 | fsButton->hide(); | 435 | fsButton->hide(); |
372 | viewModeButton->hide(); | 436 | viewModeButton->hide(); |
373 | } | 437 | } |
374 | m_stack->raiseWidget( ImageInfo ); | 438 | m_stack->raiseWidget( ImageInfo ); |
375 | } | 439 | } |
376 | 440 | ||
377 | void PMainWindow::slotDisplay( const QString& inf ) { | 441 | void PMainWindow::slotDisplay( const QString& inf ) { |
442 | odebug << "slotDisplay: " << inf << oendl; | ||
378 | if ( !m_disp ) { | 443 | if ( !m_disp ) { |
379 | initDisp(); | 444 | initDisp(); |
380 | } | 445 | } |
381 | m_disp->setImage( inf ); | 446 | m_disp->setImage( inf ); |
382 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 447 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
383 | prevButton->show(); | 448 | prevButton->show(); |
384 | nextButton->show(); | 449 | nextButton->show(); |
385 | upButton->hide(); | 450 | m_aDirUp->setEnabled(false); |
451 | m_aShowInfo->setEnabled(true); | ||
452 | m_aViewfile->setEnabled(false); | ||
453 | m_aStartSlide->setEnabled(false); | ||
386 | fsButton->hide(); | 454 | fsButton->hide(); |
387 | viewModeButton->hide(); | 455 | viewModeButton->hide(); |
388 | } | 456 | } |
389 | if (m_disp->fullScreen()) { | 457 | if (m_disp->fullScreen()) { |
390 | //m_disp->showFullScreen(); | 458 | //m_disp->showFullScreen(); |
391 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | 459 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); |
392 | } else { | 460 | } else { |
393 | m_stack->raiseWidget( ImageDisplay ); | 461 | m_stack->raiseWidget( ImageDisplay ); |
394 | } | 462 | } |
395 | } | 463 | } |
396 | 464 | ||
397 | void PMainWindow::slotReturn() { | 465 | void PMainWindow::slotReturn() { |
398 | raiseIconView(); | 466 | raiseIconView(); |
399 | } | 467 | } |
400 | 468 | ||
401 | 469 | ||
402 | void PMainWindow::closeEvent( QCloseEvent* ev ) { | 470 | void PMainWindow::closeEvent( QCloseEvent* ev ) { |
403 | /* | 471 | /* |
404 | * return from view | 472 | * return from view |
405 | * or properly quit | 473 | * or properly quit |
406 | */ | 474 | */ |
407 | if ( m_stack->visibleWidget() == m_info || | 475 | if ( m_stack->visibleWidget() == m_info || |
408 | m_stack->visibleWidget() == m_disp ) { | 476 | m_stack->visibleWidget() == m_disp ) { |
409 | ev->ignore(); | 477 | ev->ignore(); |
410 | raiseIconView(); | 478 | raiseIconView(); |
411 | return; | 479 | return; |
412 | } | 480 | } |
413 | if (m_disp && m_disp->fullScreen()) { | 481 | if (m_disp && m_disp->fullScreen()) { |
414 | /* otherwise opie-eye crashes in bigscreen mode! */ | 482 | /* otherwise opie-eye crashes in bigscreen mode! */ |
415 | m_disp->reparent(0,QPoint(0,0)); | 483 | m_disp->reparent(0,QPoint(0,0)); |
416 | m_stack->addWidget(m_disp,ImageDisplay); | 484 | m_stack->addWidget(m_disp,ImageDisplay); |
417 | } | 485 | } |
418 | ev->accept(); | 486 | ev->accept(); |
419 | QTimer::singleShot(0, qApp, SLOT(closeAllWindows())); | 487 | QTimer::singleShot(0, qApp, SLOT(closeAllWindows())); |
420 | } | 488 | } |
421 | 489 | ||
422 | void PMainWindow::raiseIconView() { | 490 | void PMainWindow::raiseIconView() { |
423 | setUpdatesEnabled(false); | 491 | setUpdatesEnabled(false); |
424 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | 492 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { |
425 | prevButton->hide(); | 493 | prevButton->hide(); |
426 | nextButton->hide(); | 494 | nextButton->hide(); |
427 | upButton->show(); | 495 | m_aDirUp->setEnabled(true); |
496 | m_aShowInfo->setEnabled(true); | ||
497 | m_aViewfile->setEnabled(true); | ||
498 | m_aStartSlide->setEnabled(true); | ||
428 | fsButton->show(); | 499 | fsButton->show(); |
429 | viewModeButton->show(); | 500 | viewModeButton->show(); |
430 | } | 501 | } |
431 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { | 502 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { |
432 | m_disp->hide(); | 503 | m_disp->hide(); |
433 | } | 504 | } |
434 | m_stack->raiseWidget( IconView ); | 505 | m_stack->raiseWidget( IconView ); |
435 | setUpdatesEnabled(true); | 506 | setUpdatesEnabled(true); |
436 | repaint(); | 507 | repaint(); |
437 | } | 508 | } |
438 | 509 | ||
439 | void PMainWindow::setDocument( const QString& showImg ) { | 510 | void PMainWindow::setDocument( const QString& showImg ) { |
440 | QString file = showImg; | 511 | QString file = showImg; |
441 | DocLnk lnk(showImg); | 512 | DocLnk lnk(showImg); |
442 | if (lnk.isValid() ) | 513 | if (lnk.isValid() ) |
443 | file = lnk.file(); | 514 | file = lnk.file(); |
444 | 515 | ||
445 | slotDisplay( file ); | 516 | slotDisplay( file ); |
446 | } | 517 | } |
518 | |||
519 | void PMainWindow::slotSelectDir(int id) | ||
520 | { | ||
521 | emit changeDir( m_dev[fsMenu->text(id )] ); | ||
522 | } | ||
523 | |||
524 | void PMainWindow::dirChanged() | ||
525 | { | ||
526 | fsMenu->clear(); | ||
527 | m_dev.clear(); | ||
528 | |||
529 | /* home dir, too */ | ||
530 | QString f = getenv( "HOME" ); | ||
531 | if (!f.isEmpty()) { | ||
532 | m_dev.insert("Home directory",f); | ||
533 | fsMenu->insertItem("Home directory"); | ||
534 | } | ||
535 | const QList<FileSystem> &fs = m_storage->fileSystems(); | ||
536 | QListIterator<FileSystem> it(fs ); | ||
537 | for ( ; it.current(); ++it ) { | ||
538 | const QString disk = (*it)->name(); | ||
539 | const QString path = (*it)->path(); | ||
540 | m_dev.insert( disk, path ); | ||
541 | fsMenu->insertItem( disk ); | ||
542 | } | ||
543 | } | ||
544 | |||
545 | void PMainWindow::showToolbar(bool how) | ||
546 | { | ||
547 | if (!how) toolBar->hide(); | ||
548 | else toolBar->show(); | ||
549 | } \ No newline at end of file | ||
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 6fa1ab6..ae1cc09 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h | |||
@@ -4,75 +4,93 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifndef PHUNK_MAIN_WINDOW_H | 6 | #ifndef PHUNK_MAIN_WINDOW_H |
7 | #define PHUNK_MAIN_WINDOW_H | 7 | #define PHUNK_MAIN_WINDOW_H |
8 | 8 | ||
9 | #include <opie2/oconfig.h> | 9 | #include <opie2/oconfig.h> |
10 | 10 | ||
11 | #include <qmainwindow.h> | 11 | #include <qmainwindow.h> |
12 | 12 | ||
13 | 13 | ||
14 | 14 | ||
15 | namespace Opie { | 15 | namespace Opie { |
16 | namespace Ui{ | 16 | namespace Ui{ |
17 | class OWidgetStack; | 17 | class OWidgetStack; |
18 | } | 18 | } |
19 | namespace Core{ | 19 | namespace Core{ |
20 | class OKeyConfigManager; | 20 | class OKeyConfigManager; |
21 | } | 21 | } |
22 | } | 22 | } |
23 | 23 | ||
24 | class ImageView; | 24 | class ImageView; |
25 | class ImageWidget; | 25 | class ImageWidget; |
26 | class PIconView; | 26 | class PIconView; |
27 | class imageinfo; | 27 | class imageinfo; |
28 | class QMenuBar; | ||
29 | class QToolBar; | ||
30 | class QPopupMenu; | ||
31 | class QAction; | ||
32 | class StorageInfo; | ||
28 | 33 | ||
29 | class PMainWindow : public QMainWindow { | 34 | class PMainWindow : public QMainWindow { |
30 | Q_OBJECT | 35 | Q_OBJECT |
31 | enum Views { IconView, ImageInfo, ImageDisplay }; | 36 | enum Views { IconView, ImageInfo, ImageDisplay }; |
32 | public: | 37 | public: |
33 | static QString appName() { return QString::fromLatin1("opie-eye" ); } | 38 | static QString appName() { return QString::fromLatin1("opie-eye" ); } |
34 | PMainWindow(QWidget*, const char*, WFlags ); | 39 | PMainWindow(QWidget*, const char*, WFlags ); |
35 | ~PMainWindow(); | 40 | ~PMainWindow(); |
36 | 41 | ||
37 | signals: | 42 | signals: |
38 | void configChanged(); | 43 | void configChanged(); |
44 | void changeDir( const QString& ); | ||
39 | 45 | ||
40 | public slots: | 46 | public slots: |
41 | void slotShowInfo( const QString& inf ); | 47 | void slotShowInfo( const QString& inf ); |
42 | void slotDisplay( const QString& inf ); | 48 | void slotDisplay( const QString& inf ); |
43 | void slotReturn(); | 49 | void slotReturn(); |
44 | void slotRotateToggled(bool); | 50 | void slotRotateToggled(bool); |
45 | void slotScaleToggled(bool); | 51 | void slotScaleToggled(bool); |
46 | void slotZoomerToggled(bool); | 52 | void slotZoomerToggled(bool); |
47 | void slotToggleZoomer(); | 53 | void slotToggleZoomer(); |
48 | void slotToggleAutorotate(); | 54 | void slotToggleAutorotate(); |
49 | void slotToggleAutoscale(); | 55 | void slotToggleAutoscale(); |
50 | void setDocument( const QString& ); | 56 | void setDocument( const QString& ); |
51 | virtual void slotToggleFullScreen(); | 57 | virtual void slotToggleFullScreen(); |
52 | 58 | ||
53 | protected slots: | 59 | protected slots: |
54 | void raiseIconView(); | 60 | void raiseIconView(); |
55 | void closeEvent( QCloseEvent* ); | 61 | void closeEvent( QCloseEvent* ); |
62 | void showToolbar(bool); | ||
56 | 63 | ||
57 | private: | 64 | private: |
58 | template<class T> void initT( const char* name, T**, int ); | 65 | template<class T> void initT( const char* name, T**, int ); |
59 | void initInfo(); | 66 | void initInfo(); |
60 | void initDisp(); | 67 | void initDisp(); |
61 | 68 | ||
62 | private: | 69 | private: |
63 | Opie::Core::OConfig *m_cfg; | 70 | Opie::Core::OConfig *m_cfg; |
64 | Opie::Ui::OWidgetStack *m_stack; | 71 | Opie::Ui::OWidgetStack *m_stack; |
65 | PIconView* m_view; | 72 | PIconView* m_view; |
66 | imageinfo *m_info; | 73 | imageinfo *m_info; |
67 | ImageView *m_disp; | 74 | ImageView *m_disp; |
68 | bool autoRotate; | 75 | bool autoRotate; |
69 | bool autoScale; | 76 | bool autoScale; |
70 | bool zoomerOn; | 77 | bool zoomerOn; |
71 | QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; | 78 | QToolButton*rotateButton,*fsButton,*viewModeButton; |
72 | QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton; | 79 | QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton; |
80 | QMenuBar *menuBar; | ||
81 | QToolBar *toolBar; | ||
82 | QPopupMenu *fileMenu,*dispMenu,*fsMenu; | ||
83 | QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide; | ||
84 | QAction*m_aHideToolbar; | ||
85 | |||
86 | /* for the device submenu - ToDo: Merge with the special button */ | ||
87 | StorageInfo *m_storage; | ||
88 | QMap<QString, QString> m_dev; | ||
73 | 89 | ||
74 | private slots: | 90 | private slots: |
75 | void slotConfig(); | 91 | void slotConfig(); |
92 | void slotSelectDir(int); | ||
93 | void dirChanged(); | ||
76 | }; | 94 | }; |
77 | 95 | ||
78 | #endif | 96 | #endif |