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

List:       kde-commits
Subject:    [calligra] krita/plugins/extensions/dockers/palettedocker: split add color into add foreground and a
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2013-06-30 18:14:03
Message-ID: E1UtM8R-0006B5-0S () scm ! kde ! org
[Download RAW message or body]

Git commit f9b2a5473622aca94e95b1a25ebc6961aefac728 by Sven Langkamp.
Committed on 30/06/2013 at 18:13.
Pushed by langkamp into branch 'master'.

split add color into add foreground and add from color dialog

M  +13   -1    krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
M  +1    -0    krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.h
M  +23   -4    krita/plugins/extensions/dockers/palettedocker/wdgpalettedock.ui

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

diff --git a/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp \
b/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp index \
                f7fa527..ce65c3d 100644
--- a/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
+++ b/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.cpp
@@ -94,12 +94,15 @@ PaletteDockerDock::PaletteDockerDock( ) : \
QDockWidget(i18n("Palette"))  m_wdgPaletteDock->setupUi(mainWidget);
     m_wdgPaletteDock->bnAdd->setIcon(koIcon("list-add"));
     m_wdgPaletteDock->bnAdd->setIconSize(QSize(16, 16));
+    m_wdgPaletteDock->bnAddDialog->setIcon(koIcon("color"));
+    m_wdgPaletteDock->bnAddDialog->setIconSize(QSize(16, 16));
     m_wdgPaletteDock->bnRemove->setIcon(koIcon("list-remove"));
     m_wdgPaletteDock->bnRemove->setIconSize(QSize(16, 16));
     m_wdgPaletteDock->bnAdd->setEnabled(false);
     m_wdgPaletteDock->bnRemove->setEnabled(false);
 
-    connect(m_wdgPaletteDock->bnAdd, SIGNAL(clicked(bool)), this, SLOT(addColor()));
+    connect(m_wdgPaletteDock->bnAdd, SIGNAL(clicked(bool)), this, \
SLOT(addColorForeground())); +    connect(m_wdgPaletteDock->bnAddDialog, \
                SIGNAL(clicked(bool)), this, SLOT(addColor()));
     connect(m_wdgPaletteDock->bnRemove, SIGNAL(clicked(bool)), this, \
SLOT(removeColor()));  
     m_model = new PaletteModel(this);
@@ -151,6 +154,15 @@ void PaletteDockerDock::setColorSet(KoColorSet* colorSet)
     m_currentColorSet = colorSet;
 }
 
+void PaletteDockerDock::addColorForeground()
+{
+    KoColorSetEntry newEntry;
+    newEntry.color = m_canvas->resourceManager()->foregroundColor();
+    m_currentColorSet->add(newEntry);
+    m_currentColorSet->save();
+    setColorSet(m_currentColorSet); // update model
+}
+
 void PaletteDockerDock::addColor()
 {
     if (m_currentColorSet) {
diff --git a/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.h \
b/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.h index \
                fd843c9..78d34f2 100644
--- a/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.h
+++ b/krita/plugins/extensions/dockers/palettedocker/palettedocker_dock.h
@@ -39,6 +39,7 @@ public:
     virtual void unsetCanvas() { m_canvas = 0; }
 
 private slots:
+    void addColorForeground();
     void addColor();
     void removeColor();
     void entrySelected(QModelIndex index);
diff --git a/krita/plugins/extensions/dockers/palettedocker/wdgpalettedock.ui \
b/krita/plugins/extensions/dockers/palettedocker/wdgpalettedock.ui index \
                5da4345..99c8a11 100644
--- a/krita/plugins/extensions/dockers/palettedocker/wdgpalettedock.ui
+++ b/krita/plugins/extensions/dockers/palettedocker/wdgpalettedock.ui
@@ -53,10 +53,10 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="2">
+     <item row="0" column="4">
       <widget class="QToolButton" name="bnRemove">
        <property name="toolTip">
-        <string>Delete the layer or mask</string>
+        <string>Delete color</string>
        </property>
        <property name="text">
         <string>...</string>
@@ -72,10 +72,29 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="0" column="2">
       <widget class="QToolButton" name="bnAdd">
        <property name="toolTip">
-        <string>Delete the layer or mask</string>
+        <string>Add foreground color</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+       <property name="autoRaise">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QToolButton" name="bnAddDialog">
+       <property name="toolTip">
+        <string>Add color</string>
        </property>
        <property name="text">
         <string>...</string>


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