zoomer widget better integrated, size of it depends on the size of the displayed image,

may switched off by user and so on.

4 files changed, 56 insertions, 9 deletions

diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
index 5b12258..2f16d82 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
@@ -9,14 +9,14 @@ using namespace Opie::Core;
 
 ImageScrollView::ImageScrollView( QWidget* parent, const char* name,  WFlags f )
     :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true),
-     rotate_to_fit(true),first_resize_done(false),m_lastName("")
+     rotate_to_fit(true),show_zoomer(true),first_resize_done(false),m_lastName("")
 {
     init();
 }
 
 ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
     :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale),
-    rotate_to_fit(rfit),first_resize_done(false),m_lastName("")
+    rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
 {
     _original_data.convertDepth(QPixmap::defaultDepth());
     _original_data.setAlphaBuffer(false);
@@ -25,7 +25,7 @@ ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char
 
 ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
     :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale),
-    rotate_to_fit(rfit),first_resize_done(false),m_lastName("")
+    rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
 {
     init();
     setImage(img);
@@ -80,8 +80,8 @@ void ImageScrollView::init()
     if (first_resize_done) {
         last_rot = Rotate0;
         generateImage();
-        odebug << "reinit display " << oendl;
     } else if (_original_data.size().isValid()) {
+        if (image_fit_into(_original_data.size()) || !show_zoomer) _zoomer->hide();
         resizeContents(_original_data.width(),_original_data.height());
     }
 }
@@ -266,14 +266,21 @@ void ImageScrollView::generateImage()
         resizeContents(_image_data.width(),_image_data.height());
     }
     _pdata.convertFromImage(_image_data);
+    
 
     /*
      * update the zoomer
      */
+    check_zoomer();    
     emit imageSizeChanged( _image_data.size() );
     rescaleImage( 128, 128 );
+    /*
+     * move scrollbar
+     */
+    _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2,
+         _image_data.width()/2, _image_data.height()/2 );
+    
     _zoomer->setImage( _image_data );
-
     /*
      * invalidate
      */
@@ -288,10 +295,6 @@ void ImageScrollView::resizeEvent(QResizeEvent * e)
     first_resize_done = true;
     emit viewportSizeChanged( viewport()->size() );
 
-   /*
-    * move scrollbar
-    */
-    _zoomer->setGeometry( viewport()->width()-100, viewport()->height()-50, 100, 50 );
 }
 
 void ImageScrollView::keyPressEvent(QKeyEvent * e)
@@ -398,3 +401,26 @@ void ImageScrollView::setDestructiveClose() {
     fl |= WDestructiveClose;
     setWFlags( fl );
 }
+
+bool ImageScrollView::image_fit_into(const QSize&s )
+{
+    if (s.width()>width()||s.height()>height()) {
+        return false;
+    }
+    return true;
+}
+
+void ImageScrollView::setShowZoomer(bool how)
+{
+    show_zoomer = how;
+    check_zoomer();
+}
+
+void ImageScrollView::check_zoomer()
+{
+    if ( (!show_zoomer||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) {
+        _zoomer->hide();
+    } else if ( show_zoomer && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){
+        _zoomer->show();
+    }
+}
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h
index 1b25103..e209dfb 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.h
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.h
@@ -28,6 +28,7 @@ public:
 
     virtual void setAutoRotate(bool);
     virtual void setAutoScale(bool);
+    virtual void setShowZoomer(bool);
 
     enum  Rotation {
         Rotate0,
@@ -54,6 +55,7 @@ protected:
 
     bool scale_to_fit;
     bool rotate_to_fit;
+    bool show_zoomer;
     bool first_resize_done;
     Rotation last_rot;
     QString m_lastName;
@@ -61,6 +63,8 @@ protected:
 
     virtual void rotate_into_data(Rotation r);
     virtual void generateImage();
+    bool image_fit_into(const QSize&s);
+    void check_zoomer();
 
 protected slots:
     virtual void viewportMouseMoveEvent(QMouseEvent* e);
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 3650493..ef23f79 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -106,12 +106,26 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
     autoScale = true;
 
+    btn = new QToolButton(bar);
+    btn->setIconSet( Resource::loadIconSet( "mag" ) );
+    btn->setToggleButton(true);
+    btn->setOn(true);
+    connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
+    zoomerOn = true;
 }
 
 PMainWindow::~PMainWindow() {
     odebug << "Shutting down" << oendl;
 }
 
+void PMainWindow::slotZoomerToggled(bool how)
+{
+    zoomerOn = how;
+    if (m_disp) {
+        m_disp->setShowZoomer(zoomerOn);
+    }
+}
+
 void PMainWindow::slotRotateToggled(bool how)
 {
     autoRotate = how;
@@ -231,6 +245,7 @@ void PMainWindow::initDisp() {
     if (m_disp) {
         m_disp->setAutoScale(autoScale);
         m_disp->setAutoRotate(autoRotate);
+        m_disp->setShowZoomer(zoomerOn);
         connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
     }
 }
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 59dba30..e9b16d0 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -41,6 +41,7 @@ public slots:
     void slotReturn();
     void slotRotateToggled(bool);
     void slotScaleToggled(bool);
+    void slotZoomerToggled(bool);
     void setDocument( const QString& );
 
 protected:
@@ -60,6 +61,7 @@ private:
     ImageView *m_disp;
     bool autoRotate;
     bool autoScale;
+    bool zoomerOn;
     QToolButton*rotateButton;