1 files changed, 41 insertions, 8 deletions

diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index a20c879..c7e48cb 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -10,2 +10,3 @@
 #include <qtimer.h>
+#include <qaction.h>
 
@@ -25,2 +26,12 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
     m_slideValue = 5;
+    m_gDisplayType = 0;
+    m_gPrevNext = 0;
+    m_hGroup = 0;
+}
+
+void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup)
+{
+    m_gDisplayType = disptypeGroup;
+    m_gPrevNext = nextprevGroup;
+    m_hGroup = hGroup;
 }
@@ -51,2 +62,12 @@ void ImageView::startSlide(int value)
 
+void ImageView::stopSlide()
+{
+    if (!m_slideTimer) {
+        return;
+    }
+    m_slideTimer->stop();
+    delete m_slideTimer;
+    m_slideTimer = 0;
+}
+
 void ImageView::nextSlide()
@@ -144,11 +165,14 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
     if (!m) return;
-    m->insertItem(tr("Toggle fullscreen"),this, SIGNAL(toggleFullScreen()));
+    if (m_hGroup) {
+        m_hGroup->addTo(m);
+    }
     if (fullScreen()) {
-        m->insertSeparator();
-        m->insertItem(tr("Previous image"),this,SIGNAL(dispPrev()));
-        m->insertItem(tr("Next image"),this,SIGNAL(dispNext()));
-        m->insertSeparator();
-        m->insertItem(tr("Toggle autoscale"),this, SIGNAL(toggleAutoscale()));
-        m->insertItem(tr("Toggle autorotate"),this, SIGNAL(toggleAutorotate()));
-        m->insertItem(tr("Toggle thumbnail"),this, SIGNAL(toggleZoomer()));
+        if (m_gPrevNext) {
+            m->insertSeparator();
+            m_gPrevNext->addTo(m);
+        }
+        if (m_gDisplayType) {
+            m->insertSeparator();
+            m_gDisplayType->addTo(m);
+        }
     }
@@ -156,2 +180,11 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
     m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
+    if (m_hGroup) {
+        m_hGroup->removeFrom(m);
+    }
+    if (m_gPrevNext) {
+        m_gPrevNext->removeFrom(m);
+    }
+    if (m_gDisplayType) {
+        m_gDisplayType->removeFrom(m);
+    }
     delete m;