[Digikam-devel] [Bug 140131] No zoom in image preview

[Gilles Caulier]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=140131         




------- Additional Comments From caulier.gilles gmail com  2007-04-10 13:18 -------
SVN commit 652199 by cgilles:

digikam from trunk : handle properlly the zoom in/out action from preview widget changed by keyboard shorcut and mouse wheel.
CCBUGS: 140131

 M  +5 -2      albumwidgetstack.cpp  
 M  +3 -2      albumwidgetstack.h  
 M  +3 -3      digikamview.cpp  
 M  +2 -0      imagepreviewwidget.cpp  
 M  +1 -0      imagepreviewwidget.h  


--- trunk/extragear/graphics/digikam/digikam/albumwidgetstack.cpp #652198:652199
 @ -1,10 +1,10  @
 /* ============================================================
- * Authors: Gilles Caulier 
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
  * Date   : 2006-06-13
  * Description : A widget stack to embedded album content view
  *               or the current image preview.
  *
- * Copyright 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright 2006-2007 by Gilles Caulier 
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
 @ -102,6 +102,9  @
 
     connect(d->imagePreviewView, SIGNAL(signalSlideShow()),
             this, SIGNAL(signalSlideShow()));
+
+    connect(d->imagePreviewView, SIGNAL(signalZoomFactorChanged(double)),
+            this, SIGNAL(signalZoomFactorChanged(double)));
 }
 
 AlbumWidgetStack::~AlbumWidgetStack()
--- trunk/extragear/graphics/digikam/digikam/albumwidgetstack.h #652198:652199
 @ -1,10 +1,10  @
 /* ============================================================
- * Authors: Gilles Caulier 
+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
  * Date   : 2006-06-13
  * Description : A widget stack to embedded album content view
  *               or the current image preview.
  *
- * Copyright 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright 2006-2007 by Gilles Caulier 
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
 @ -84,6 +84,7  @
     void signalToggledToPreviewMode(bool);
     void signalBack2Album();
     void signalSlideShow();
+    void signalZoomFactorChanged(double);
 
 public slots:
 
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #652198:652199
 @ -340,6 +340,9  @
     connect(d->albumWidgetStack, SIGNAL(signalSlideShow()),
             this, SLOT(slotSlideShowAll()));
 
+    connect(d->albumWidgetStack, SIGNAL(signalZoomFactorChanged(double)),
+            this, SIGNAL(signalZoomChanged(double)));
+
     // -- Selection timer ---------------
 
     connect(d->selectionTimer, SIGNAL(timeout()),
 @ -722,7 +725,6  @
         double a    = (zmax-b)/h;
         double z    = a*size+b; 
         d->albumWidgetStack->setZoomFactor(z);   
-        emit signalZoomChanged(d->albumWidgetStack->zoomFactor());
     }
     else if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
     {
 @ -799,7 +801,6  @
     {
         d->albumWidgetStack->increaseZoom();
         toogleZoomActions();
-        emit signalZoomChanged(d->albumWidgetStack->zoomFactor());
     }
 }
 
 @ -815,7 +816,6  @
     {
         d->albumWidgetStack->decreaseZoom();
         toogleZoomActions();
-        emit signalZoomChanged(d->albumWidgetStack->zoomFactor());
     }
 }
 
--- trunk/extragear/graphics/digikam/digikam/imagepreviewwidget.cpp #652198:652199
 @ -435,6 +435,8  @
            (int)(((cpy * d->zoom) * (d->tileSize / d->zoom)) / floor(d->tileSize / d->zoom)));
     viewport()->setUpdatesEnabled(true);
     viewport()->update();
+
+    emit signalZoomFactorChanged(d->zoom);
 }
 
 double ImagePreviewWidget::zoomFactor()
--- trunk/extragear/graphics/digikam/digikam/imagepreviewwidget.h #652198:652199
 @ -62,6 +62,7  @
     void signalLeftButtonClicked();    
     void signalShowNextImage();
     void signalShowPrevImage();
+    void signalZoomFactorChanged(double);
 
 public slots: