1 files changed, 15 insertions, 6 deletions

diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index ae1cc09..65151fc 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -26,12 +26,13 @@ class ImageWidget;
 class PIconView;
 class imageinfo;
 class QMenuBar;
 class QToolBar;
 class QPopupMenu;
 class QAction;
+class QActionGroup;
 class StorageInfo;
 
 class PMainWindow : public QMainWindow {
     Q_OBJECT
     enum Views { IconView,  ImageInfo, ImageDisplay };
 public:
@@ -39,12 +40,13 @@ public:
     PMainWindow(QWidget*, const char*, WFlags );
     ~PMainWindow();
 
 signals:
     void configChanged();
     void changeDir( const QString& );
+    void changeListMode(int);
 
 public slots:
     void slotShowInfo( const QString& inf );
     void slotDisplay( const QString& inf );
     void slotReturn();
     void slotRotateToggled(bool);
@@ -52,17 +54,19 @@ public slots:
     void slotZoomerToggled(bool);
     void slotToggleZoomer();
     void slotToggleAutorotate();
     void slotToggleAutoscale();
     void setDocument( const QString& );
     virtual void slotToggleFullScreen();
+    virtual void slotFullScreenToggled(bool);
 
 protected slots:
     void raiseIconView();
     void closeEvent( QCloseEvent* );
     void showToolbar(bool);
+    void listviewselected(QAction*);
 
 private:
     template<class T>  void initT( const char* name, T**, int );
     void initInfo();
     void initDisp();
 
@@ -72,20 +76,25 @@ private:
     PIconView* m_view;
     imageinfo *m_info;
     ImageView *m_disp;
     bool autoRotate;
     bool autoScale;
     bool zoomerOn;
-    QToolButton*rotateButton,*fsButton,*viewModeButton;
-    QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton;
-    QMenuBar *menuBar;
+    QToolButton*fsButton;
     QToolBar *toolBar;
-    QPopupMenu *fileMenu,*dispMenu,*fsMenu;
+    QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu;
     QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide;
-    QAction*m_aHideToolbar;
-
+    QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong;
+    QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup;
+    QAction *m_aNext,*m_aPrevious,*m_aFullScreen;
+    QAction *m_aAutoRotate,*m_aAutoScale,*m_aZoomer;
+
+    /* init funs */
+    void setupActions();
+    void setupToolbar();
+    void setupMenu();
     /* for the device submenu - ToDo: Merge with the special button */
     StorageInfo *m_storage;
     QMap<QString, QString> m_dev;
 
 private slots:
     void slotConfig();