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

List:       kde-commits
Subject:    branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-05-28 13:58:44
Message-ID: 1243519124.145072.23505.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 974115 by cgilles:

backport commit #974096 from trunk


 M  +26 -21    editortool.cpp  


--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editortool.cpp #974114:974115
@@ -122,27 +122,6 @@
     d->view->blockSignals(true);
 }
 
-void EditorTool::slotInit()
-{
-    readSettings();
-    // Unlock signals from preview widget when init is done.
-    d->view->blockSignals(false);
-}
-
-void EditorTool::setToolHelp(const QString& anchor)
-{
-    d->helpAnchor = anchor;
-    // TODO: use this anchor with editor Help menu
-}
-
-QString EditorTool::toolHelp() const
-{
-    if (d->helpAnchor.isEmpty())
-        return (name() + QString(".anchor"));
-
-    return d->helpAnchor;
-}
-
 EditorToolSettings* EditorTool::toolSettings() const
 {
     return d->settings;
@@ -169,8 +148,34 @@
 
     connect(d->settings, SIGNAL(signalTryClicked()),
             this, SLOT(slotEffect()));
+
+    // Will be unblocked in slotInit()
+    // This will prevent signals emit during tool init.
+    d->settings->blockSignals(true);
 }
 
+void EditorTool::slotInit()
+{
+    readSettings();
+    // Unlock signals from preview and settings widgets when init is done.
+    d->view->blockSignals(false);
+    d->settings->blockSignals(false);
+}
+
+void EditorTool::setToolHelp(const QString& anchor)
+{
+    d->helpAnchor = anchor;
+    // TODO: use this anchor with editor Help menu
+}
+
+QString EditorTool::toolHelp() const
+{
+    if (d->helpAnchor.isEmpty())
+        return (name() + QString(".anchor"));
+
+    return d->helpAnchor;
+}
+
 void EditorTool::setBusy(bool state)
 {
     d->settings->setBusy(state);
[prev in list] [next in list] [prev in thread] [next in thread]