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

List:       kde-commits
Subject:    [calligra/krita-chili-kazakov] krita/plugins/tools/tool_transform2: On reset and reload the mode of 
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-10-18 10:55:07
Message-ID: E1XfRf9-00022r-Ft () scm ! kde ! org
[Download RAW message or body]

Git commit b1b2f0f2f4ff0f1117b7079845adc8d1c55c745c by Dmitry Kazakov.
Committed on 18/10/2014 at 10:54.
Pushed by dkazakov into branch 'krita-chili-kazakov'.

On reset and reload the mode of the transform tool should be restored

M  +10   -0    krita/plugins/tools/tool_transform2/kis_liquify_properties.cpp
M  +2    -0    krita/plugins/tools/tool_transform2/kis_liquify_properties.h
M  +1    -1    krita/plugins/tools/tool_transform2/tool_transform_args.cc

http://commits.kde.org/calligra/b1b2f0f2f4ff0f1117b7079845adc8d1c55c745c

diff --git a/krita/plugins/tools/tool_transform2/kis_liquify_properties.cpp \
b/krita/plugins/tools/tool_transform2/kis_liquify_properties.cpp index \
                8f468a4..3ec5687 100644
--- a/krita/plugins/tools/tool_transform2/kis_liquify_properties.cpp
+++ b/krita/plugins/tools/tool_transform2/kis_liquify_properties.cpp
@@ -64,6 +64,8 @@ void KisLiquifyProperties::saveMode() const
     cfg.writeEntry("useWashMode", m_useWashMode);
     cfg.writeEntry("flow", m_flow);
 
+    KConfigGroup globalCfg = KGlobal::config()->group("LiquifyTool");
+    globalCfg.writeEntry("mode", (int)m_mode);
 }
 
 void KisLiquifyProperties::loadMode()
@@ -80,3 +82,11 @@ void KisLiquifyProperties::loadMode()
     m_useWashMode = cfg.readEntry("useWashMode", m_useWashMode);
     m_flow = cfg.readEntry("flow", m_flow);
 }
+
+void KisLiquifyProperties::loadAndResetMode()
+{
+    loadMode();
+
+    KConfigGroup globalCfg = KGlobal::config()->group("LiquifyTool");
+    m_mode = (LiquifyMode) globalCfg.readEntry("mode", (int)m_mode);
+}
diff --git a/krita/plugins/tools/tool_transform2/kis_liquify_properties.h \
b/krita/plugins/tools/tool_transform2/kis_liquify_properties.h index \
                08e32c0..4683cfb9 100644
--- a/krita/plugins/tools/tool_transform2/kis_liquify_properties.h
+++ b/krita/plugins/tools/tool_transform2/kis_liquify_properties.h
@@ -119,6 +119,8 @@ public:
     void saveMode() const;
     void loadMode();
 
+    void loadAndResetMode();
+
 private:
     LiquifyMode m_mode;
     qreal m_size;
diff --git a/krita/plugins/tools/tool_transform2/tool_transform_args.cc \
b/krita/plugins/tools/tool_transform2/tool_transform_args.cc index 397d6ff..e1e2809 \
                100644
--- a/krita/plugins/tools/tool_transform2/tool_transform_args.cc
+++ b/krita/plugins/tools/tool_transform2/tool_transform_args.cc
@@ -167,7 +167,7 @@ bool ToolTransformArgs::isIdentity() const
 void ToolTransformArgs::initLiquifyTransformMode(const QRect &srcRect)
 {
     m_liquifyWorker.reset(new KisLiquifyTransformWorker(srcRect, 0, 8));
-    m_liquifyProperties.loadMode();
+    m_liquifyProperties.loadAndResetMode();
 }
 
 void ToolTransformArgs::saveLiquifyTransformMode() const


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