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

List:       kde-commits
Subject:    [calligra/krita-sketchgl-rempt] krita/plugins/extensions/dockers/presetdocker: Set the popup's curre
From:       Dan Leinir Turthra Jensen <admin () leinir ! dk>
Date:       2013-10-01 12:40:35
Message-ID: E1VQzFj-0007eI-KZ () scm ! kde ! org
[Download RAW message or body]

Git commit e155f949ade36a588c2e64009f4a701ec63805e7 by Dan Leinir Turthra Jensen.
Committed on 01/10/2013 at 12:34.
Pushed by leinir into branch 'krita-sketchgl-rempt'.

Set the popup's currently selected preset in the preset docker

M  +14   -0    krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.cpp
M  +1    -0    krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.h

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

diff --git a/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.cpp \
b/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.cpp index \
                648746a..684f7b6 100644
--- a/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.cpp
+++ b/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.cpp
@@ -56,6 +56,20 @@ void PresetDockerDock::setCanvas(KoCanvasBase * canvas)
 
     connect(m_presetChooser, SIGNAL(resourceSelected(KoResource*)),
             m_canvas->view()->paintOpBox(), SLOT(resourceSelected(KoResource*)));
+    connect(canvas->resourceManager(), SIGNAL(canvasResourceChanged(int,QVariant)),
+            this, SLOT(canvasResourceChanged(int,QVariant)));
+}
+
+void PresetDockerDock::canvasResourceChanged(int /*key*/, const QVariant& /*v*/)
+{
+    if (m_canvas) {
+        sender()->blockSignals(true);
+        KisPaintOpPresetSP preset = \
m_canvas->resourceManager()->resource(KisCanvasResourceProvider::CurrentPaintOpPreset).value<KisPaintOpPresetSP>();
 +        if(preset)
+            m_presetChooser->canvasResourceChanged(preset.data());
+        sender()->blockSignals(false);
+
+    }
 }
 
 #include "presetdocker_dock.moc"
diff --git a/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.h \
b/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.h index \
                854b8a6..7656936 100644
--- a/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.h
+++ b/krita/plugins/extensions/dockers/presetdocker/presetdocker_dock.h
@@ -32,6 +32,7 @@ public:
     virtual void setCanvas(KoCanvasBase *canvas);
     virtual void unsetCanvas() { m_canvas = 0; }
 public slots:
+    void canvasResourceChanged(int key, const QVariant& v);
 private slots:
 private:
     KisCanvas2* m_canvas;


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