1 files changed, 138 insertions, 35 deletions

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
@@ -24,2 +24,3 @@
 #include <qpe/ir.h>
+#include <qpe/storage.h>
 #include <qpe/applnk.h>
@@ -33,3 +34,4 @@
 #include <qframe.h>
-
+#include <qmenubar.h>
+#include <qaction.h>
 
@@ -44,2 +46,7 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     m_cfg->setGroup("Zecke_view" );
+
+    m_storage = new StorageInfo();
+    connect(m_storage, SIGNAL(disksChanged() ),
+            this, SLOT( dirChanged() ) );
+
     /*
@@ -48,4 +55,11 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
      */
-    QToolBar *bar = new QToolBar( this );
-    bar->setHorizontalStretchable( true );
+    toolBar = new QToolBar( this );
+    menuBar = new QMenuBar( this );
+    fileMenu = new QPopupMenu( menuBar );
+    menuBar->insertItem( tr( "File" ), fileMenu );
+    dispMenu = new QPopupMenu( menuBar );
+    menuBar->insertItem( tr( "Show" ), dispMenu );
+
+    addToolBar(toolBar);
+    toolBar->setHorizontalStretchable( true );
     setToolBarsMovable( false );
@@ -58,2 +72,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     m_stack->raiseWidget( IconView );
+
     connect(m_view, SIGNAL(sig_display(const QString&)),
@@ -65,27 +80,45 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-    upButton = new QToolButton( bar );
-    upButton->setIconSet(  Resource::loadIconSet( "up" ) );
-    connect( upButton, SIGNAL(clicked()),
-             m_view, SLOT(slotDirUp()) );
+    m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ),
+                               0, 0, this, 0, true );
+    m_aDirUp->setToggleAction(false);
+    connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp()));
+    m_aDirUp->addTo( toolBar );
+
+    QToolButton*btn;
 
-    fsButton = new PFileSystem( bar );
+    fsButton = new PFileSystem( toolBar );
     connect( fsButton, SIGNAL( changeDir( const QString& ) ),
              m_view, SLOT(slotChangeDir( const QString& ) ) );
+    connect( this, SIGNAL( changeDir( const QString& ) ),
+             m_view, SLOT(slotChangeDir( const QString& ) ) );
 
-    QToolButton*btn = new QToolButton( bar );
-    btn->setIconSet( Resource::loadIconSet( "edit" ) );
-    connect( btn, SIGNAL(clicked()),
-             m_view, SLOT(slotImageInfo()) );
+    m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ),
+                               0, 0, this, 0, true );
+    m_aShowInfo->setToggleAction(false);
+    connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo()));
+    m_aShowInfo->addTo( toolBar );
 
     if ( Ir::supported() ) {
-        btn = new QToolButton( bar );
-        btn->setIconSet( Resource::loadIconSet( "beam" ) );
-        connect( btn, SIGNAL(clicked()),
-                 m_view, SLOT(slotBeam()) );
+        m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),
+                               0, 0, this, 0, true );
+        m_aBeam->setToggleAction(false);
+        connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam()));
+        m_aBeam->addTo( toolBar );
     }
+    m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet( "trash" ),
+                               0, 0, this, 0, true );
+    m_aTrash->setToggleAction(false);
+    connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash()));
+    m_aTrash->addTo( toolBar );
 
-    btn = new QToolButton( bar );
-    btn->setIconSet( Resource::loadIconSet( "trash" ) );
-    connect( btn, SIGNAL(clicked() ),
-             m_view, SLOT(slotTrash() ) );
+    m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet( "mag" ),
+                               0, 0, this, 0, true );
+    m_aViewfile->setToggleAction(false);
+    connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage()));
+
+    m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet( "play" ),
+                               0, 0, this, 0, true );
+    m_aStartSlide->setToggleAction(false);
+
+    connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide()));
 
@@ -94,3 +127,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     if (mode < 1 || mode>3) mode = 1;
-    viewModeButton = new ViewModeButton( bar,mode );
+    viewModeButton = new ViewModeButton( toolBar,mode );
     connect( viewModeButton, SIGNAL(changeMode(int)),
@@ -98,3 +131,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-    btn = new QToolButton( bar );
+    btn = new QToolButton( toolBar );
     btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) );
@@ -103,5 +136,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-
-
-    prevButton = new QToolButton(bar);
+    prevButton = new QToolButton(toolBar);
     prevButton->setIconSet( Resource::loadIconSet( "back" ) );
@@ -109,3 +140,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-    nextButton = new QToolButton(bar);
+    nextButton = new QToolButton(toolBar);
     nextButton->setIconSet( Resource::loadIconSet( "forward" ) );
@@ -113,6 +144,27 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-    rotateButton = new QToolButton(bar);
+/* filemenu start */
+    m_aViewfile->addTo(fileMenu);
+    m_aShowInfo->addTo(fileMenu);
+    m_aStartSlide->addTo(fileMenu);
+
+    fileMenu->insertSeparator();
+    m_aDirUp->addTo( fileMenu );
+
+    fsMenu = new QPopupMenu(fileMenu);
+    fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu);
+    connect( fsMenu, SIGNAL( activated( int ) ),
+             this, SLOT(slotSelectDir( int ) ) );
+    dirChanged();
+
+    fileMenu->insertSeparator();
+    if ( Ir::supported() ) {
+        m_aBeam->addTo( fileMenu );
+    }
+    fileMenu->insertSeparator();
+    m_aTrash->addTo( fileMenu );
+/* filemenu end */
+
+    rotateButton = new QToolButton(toolBar);
     rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) );
     rotateButton->setToggleButton(true);
-
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
@@ -126,6 +178,5 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     }
-
     connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
 
-    scaleButton = new QToolButton(bar);
+    scaleButton = new QToolButton(toolBar);
     scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) );
@@ -136,3 +187,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
 
-    zoomButton = new QToolButton(bar);
+    zoomButton = new QToolButton(toolBar);
     zoomButton->setIconSet( Resource::loadIconSet( "mag" ) );
@@ -142,2 +193,11 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     zoomerOn = true;
+
+/* showmenu */
+    m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ),
+            0, 0, this, 0, true );
+    m_aHideToolbar->setOn (true);
+    m_aHideToolbar->addTo(dispMenu);
+    connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool)));
+/* showmenu end*/
+
 }
@@ -179,5 +239,6 @@ void PMainWindow::slotRotateToggled(bool how)
 {
+    odebug << "Autorotate: " << how << oendl;
     autoRotate = how;
     if (m_disp) {
-        m_disp->setAutoRotate(how);
+        m_disp->setAutoScaleRotate(autoScale,autoRotate);
     }
@@ -369,3 +430,6 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
         nextButton->hide();
-        upButton->hide();
+        m_aDirUp->setEnabled(false);
+        m_aShowInfo->setEnabled(false);
+        m_aViewfile->setEnabled(true);
+        m_aStartSlide->setEnabled(false);
         fsButton->hide();
@@ -377,2 +441,3 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
 void PMainWindow::slotDisplay( const QString& inf ) {
+    odebug << "slotDisplay: " << inf << oendl;
     if ( !m_disp ) {
@@ -384,3 +449,6 @@ void PMainWindow::slotDisplay( const QString& inf ) {
         nextButton->show();
-        upButton->hide();
+        m_aDirUp->setEnabled(false);
+        m_aShowInfo->setEnabled(true);
+        m_aViewfile->setEnabled(false);
+        m_aStartSlide->setEnabled(false);
         fsButton->hide();
@@ -426,3 +494,6 @@ void PMainWindow::raiseIconView() {
         nextButton->hide();
-        upButton->show();
+        m_aDirUp->setEnabled(true);
+        m_aShowInfo->setEnabled(true);
+        m_aViewfile->setEnabled(true);
+        m_aStartSlide->setEnabled(true);
         fsButton->show();
@@ -446 +517,33 @@ void PMainWindow::setDocument( const QString& showImg ) {
 }
+
+void PMainWindow::slotSelectDir(int id)
+{
+    emit changeDir( m_dev[fsMenu->text(id )] );
+}
+
+void PMainWindow::dirChanged()
+{
+    fsMenu->clear();
+    m_dev.clear();
+
+    /* home dir, too */
+    QString f = getenv( "HOME" );
+    if (!f.isEmpty()) {
+        m_dev.insert("Home directory",f);
+        fsMenu->insertItem("Home directory");
+    }
+    const QList<FileSystem> &fs = m_storage->fileSystems();
+    QListIterator<FileSystem> it(fs );
+    for ( ; it.current(); ++it ) {
+        const QString disk = (*it)->name();
+        const QString path = (*it)->path();
+        m_dev.insert( disk, path );
+        fsMenu->insertItem( disk );
+    }
+}
+
+void PMainWindow::showToolbar(bool how)
+{
+    if (!how) toolBar->hide();
+    else toolBar->show();
+}
\ No newline at end of file