[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/imageeditor/canvas
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2007-03-31 7:38:06
Message-ID: 1175326686.427915.26600.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 648390 by cgilles:

digikam from trunk : revert corner widget to non-toggle button.

 M  +3 -16     canvas.cpp  
 M  +1 -1      canvas.h  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp #648389:648390
@@ -164,7 +164,6 @@
 
     d->cornerButton = new QToolButton(this);
     d->cornerButton->setIconSet(SmallIcon("move"));
-    d->cornerButton->setToggleButton(true);
     d->cornerButton->hide();
     setCornerWidget(d->cornerButton);
 
@@ -177,8 +176,8 @@
     connect(this, SIGNAL(signalZoomChanged(float)),
             this, SLOT(slotZoomChanged(float)));
 
-    connect(d->cornerButton, SIGNAL(toggled(bool)),
-            this, SLOT(slotCornerButtonToggled(bool)));
+    connect(d->cornerButton, SIGNAL(released()),
+            this, SLOT(slotCornerButtonReleased()));
 
     connect(d->im, SIGNAL(signalColorManagementTool()),
             this, SIGNAL(signalColorManagementTool()));
@@ -1209,19 +1208,8 @@
     emit signalChanged();
 }
 
-void Canvas::slotCornerButtonToggled(bool on)
+void Canvas::slotCornerButtonReleased()
 {    
-    if (!on)
-    {
-        if (d->panIconPopup)
-        {
-            d->panIconPopup->hide();
-            delete d->panIconPopup;
-            d->panIconPopup = 0;
-        }
-        return;
-    }
-
     if (!d->panIconPopup)
     {
         d->panIconPopup         = new KPopupFrame(this);
@@ -1252,7 +1240,6 @@
         d->panIconPopup->hide();
         delete d->panIconPopup;
         d->panIconPopup = 0;
-        d->cornerButton->setOn(false);
     }
 }
 
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/canvas.h #648389:648390
@@ -155,7 +155,7 @@
     void slotModified();
     void slotImageLoaded(const QString& filePath, bool success);
     void slotImageSaved(const QString& filePath, bool success);
-    void slotCornerButtonToggled(bool);
+    void slotCornerButtonReleased();
     void slotPanIconSelectionMoved(QRect, bool);
     void slotZoomChanged(float);
     
[prev in list] [next in list] [prev in thread] [next in thread]