author | alwin <alwin> | 2004-11-12 15:57:59 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-12 15:57:59 (UTC) |
commit | e1ed329d0b8be10ac6e019d37b82afcf21990691 (patch) (unidiff) | |
tree | 0c84e2c4fd062487932de9add39a083da194cca0 /noncore/graphics/opie-eye/gui/mainwindow.h | |
parent | de558d6f0bc31f58ffaa894a0236f0d9cb5d73e0 (diff) | |
download | opie-e1ed329d0b8be10ac6e019d37b82afcf21990691.zip opie-e1ed329d0b8be10ac6e019d37b82afcf21990691.tar.gz opie-e1ed329d0b8be10ac6e019d37b82afcf21990691.tar.bz2 |
- fixed a bug in docview-lister: different files may have same docview
name. So mapping filenames to docname isn't usefull.
- when opie-eye is started from doctab closing the imagewindow
closes the application
- when a doc-link is changed while opie-eye is running it get the
changes, too.
Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 465e352..2f54090 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h | |||
@@ -29,79 +29,82 @@ class QMenuBar; | |||
29 | class QToolBar; | 29 | class QToolBar; |
30 | class QPopupMenu; | 30 | class QPopupMenu; |
31 | class QAction; | 31 | class QAction; |
32 | class QActionGroup; | 32 | class QActionGroup; |
33 | class StorageInfo; | 33 | class StorageInfo; |
34 | 34 | ||
35 | class PMainWindow : public QMainWindow { | 35 | class PMainWindow : public QMainWindow { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | enum Views { IconView, ImageInfo, ImageDisplay }; | 37 | enum Views { IconView, ImageInfo, ImageDisplay }; |
38 | public: | 38 | public: |
39 | static QString appName() { return QString::fromLatin1("opie-eye" ); } | 39 | static QString appName() { return QString::fromLatin1("opie-eye" ); } |
40 | PMainWindow(QWidget*, const char*, WFlags ); | 40 | PMainWindow(QWidget*, const char*, WFlags ); |
41 | ~PMainWindow(); | 41 | ~PMainWindow(); |
42 | 42 | ||
43 | signals: | 43 | signals: |
44 | void configChanged(); | 44 | void configChanged(); |
45 | void changeDir( const QString& ); | 45 | void changeDir( const QString& ); |
46 | void changeListMode(int); | 46 | void changeListMode(int); |
47 | 47 | ||
48 | public slots: | 48 | public slots: |
49 | void slotShowInfo( const QString& inf ); | 49 | void slotShowInfo( const QString& inf ); |
50 | void slotDisplay( const QString& inf ); | 50 | void slotDisplay( const QString& inf ); |
51 | void slotReturn(); | 51 | void slotReturn(); |
52 | void slotRotateToggled(bool); | 52 | void slotRotateToggled(bool); |
53 | void slotScaleToggled(bool); | 53 | void slotScaleToggled(bool); |
54 | void slotZoomerToggled(bool); | 54 | void slotZoomerToggled(bool); |
55 | void slotToggleZoomer(); | 55 | void slotToggleZoomer(); |
56 | void slotToggleAutorotate(); | 56 | void slotToggleAutorotate(); |
57 | void slotToggleAutoscale(); | 57 | void slotToggleAutoscale(); |
58 | void setDocument( const QString& ); | 58 | void setDocument( const QString& ); |
59 | virtual void slotToggleFullScreen(); | 59 | virtual void slotToggleFullScreen(); |
60 | virtual void slotFullScreenToggled(bool); | 60 | virtual void slotFullScreenToggled(bool); |
61 | virtual void polish(); | ||
61 | 62 | ||
62 | protected slots: | 63 | protected slots: |
63 | void raiseIconView(); | 64 | void raiseIconView(); |
64 | void closeEvent( QCloseEvent* ); | 65 | void closeEvent( QCloseEvent* ); |
65 | void showToolbar(bool); | 66 | void showToolbar(bool); |
66 | void listviewselected(QAction*); | 67 | void listviewselected(QAction*); |
67 | void slotFullScreenButton(bool); | 68 | void slotFullScreenButton(bool); |
68 | void check_view_fullscreen(); | 69 | void check_view_fullscreen(); |
69 | 70 | ||
70 | private: | 71 | private: |
71 | template<class T> void initT( const char* name, T**, int ); | 72 | template<class T> void initT( const char* name, T**, int ); |
72 | void initInfo(); | 73 | void initInfo(); |
73 | void initDisp(); | 74 | void initDisp(); |
74 | void setupViewWindow(bool full, bool forceDisplay); | 75 | void setupViewWindow(bool full, bool forceDisplay); |
75 | 76 | ||
76 | private: | 77 | private: |
77 | Opie::Core::OConfig *m_cfg; | 78 | Opie::Core::OConfig *m_cfg; |
78 | Opie::Ui::OWidgetStack *m_stack; | 79 | Opie::Ui::OWidgetStack *m_stack; |
79 | PIconView* m_view; | 80 | PIconView* m_view; |
80 | imageinfo *m_info; | 81 | imageinfo *m_info; |
81 | ImageView *m_disp; | 82 | ImageView *m_disp; |
82 | bool autoSave; | 83 | bool autoSave; |
84 | bool m_setDocCalled:1; | ||
85 | bool m_polishDone:1; | ||
83 | QToolButton*fsButton; | 86 | QToolButton*fsButton; |
84 | QToolBar *toolBar; | 87 | QToolBar *toolBar; |
85 | QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu; | 88 | QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu; |
86 | QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide; | 89 | QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide; |
87 | QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong; | 90 | QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong; |
88 | QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup; | 91 | QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup; |
89 | QAction *m_aNext,*m_aPrevious,*m_aFullScreen; | 92 | QAction *m_aNext,*m_aPrevious,*m_aFullScreen; |
90 | QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer; | 93 | QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer; |
91 | 94 | ||
92 | /* init funs */ | 95 | /* init funs */ |
93 | void readConfig(); | 96 | void readConfig(); |
94 | void setupActions(); | 97 | void setupActions(); |
95 | void setupToolbar(); | 98 | void setupToolbar(); |
96 | void setupMenu(); | 99 | void setupMenu(); |
97 | /* for the device submenu - ToDo: Merge with the special button */ | 100 | /* for the device submenu - ToDo: Merge with the special button */ |
98 | StorageInfo *m_storage; | 101 | StorageInfo *m_storage; |
99 | QMap<QString, QString> m_dev; | 102 | QMap<QString, QString> m_dev; |
100 | 103 | ||
101 | private slots: | 104 | private slots: |
102 | void slotConfig(); | 105 | void slotConfig(); |
103 | void slotSelectDir(int); | 106 | void slotSelectDir(int); |
104 | void dirChanged(); | 107 | void dirChanged(); |
105 | }; | 108 | }; |
106 | 109 | ||
107 | #endif | 110 | #endif |