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

List:       kde-commits
Subject:    [calligra] krita/plugins/extensions/dockers/compositiondocker: some improvents for the composition d
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2013-01-31 21:12:17
Message-ID: 20130131211217.67D82A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 18a7db479d4be84939f998d189c9d80319ad1258 by Sven Langkamp.
Committed on 31/01/2013 at 22:08.
Pushed by langkamp into branch 'master'.

some improvents for the composition docker:
-better icon for add compostion
-tooltips
-use numbering if name is empty
-export with format filname_composition

M  +30   -2    krita/plugins/extensions/dockers/compositiondocker/compositiondocker_dock.cpp


http://commits.kde.org/calligra/18a7db479d4be84939f998d189c9d80319ad1258

diff --git a/krita/plugins/extensions/dockers/compositiondocker/compositiondocker_dock.cpp \
b/krita/plugins/extensions/dockers/compositiondocker/compositiondocker_dock.cpp index \
                77963c0..e80cff2 100644
--- a/krita/plugins/extensions/dockers/compositiondocker/compositiondocker_dock.cpp
+++ b/krita/plugins/extensions/dockers/compositiondocker/compositiondocker_dock.cpp
@@ -35,6 +35,7 @@
 #include <KoCanvasBase.h>
 #include <kis_view2.h>
 #include <kis_canvas2.h>
+#include <kis_doc2.h>
 #include "compositionmodel.h"
 #include <kis_group_layer.h>
 
@@ -45,9 +46,14 @@ CompositionDockerDock::CompositionDockerDock( ) : \
QDockWidget(i18n("Compositions  m_model = new CompositionModel(this);
     compositionView->setModel(m_model);
     deleteButton->setIcon(koIcon("edit-delete"));
-    saveButton->setIcon(koIcon("document-save"));
+    saveButton->setIcon(koIcon("list-add"));
     exportButton->setIcon(koIcon("document-export"));
 
+    deleteButton->setToolTip(i18n("Delete Composition"));
+    saveButton->setToolTip(i18n("New Composition"));
+    exportButton->setToolTip(i18n("Export Composition"));
+
+
     setWidget(widget);
 
     connect( compositionView, SIGNAL(clicked( const QModelIndex & ) ),
@@ -97,7 +103,24 @@ void CompositionDockerDock::deleteClicked()
 void CompositionDockerDock::saveClicked()
 {
     KisImageWSP image = m_canvas->view()->image();
-    KisLayerComposition* composition = new KisLayerComposition(image, \
saveNameEdit->text()); +    // format as 001, 002 ...
+    QString name = saveNameEdit->text();
+    if (name.isEmpty()) {
+        bool found = false;
+        int i = 1;
+        do {
+            name = QString("%1").arg(i, 3, 10, QChar('0'));
+            found = false;
+            foreach(KisLayerComposition* composition, \
m_canvas->view()->image()->compositions()) { +                if (composition->name() \
== name) { +                    found = true;
+                    break;
+                }
+            }
+            i++;
+        } while(found && i < 1000);
+    }
+    KisLayerComposition* composition = new KisLayerComposition(image, name);
     composition->store();
     image->addComposition(composition);
     saveNameEdit->clear();
@@ -118,6 +141,11 @@ void CompositionDockerDock::exportClicked()
     QString path = dialog.url().path(KUrl::AddTrailingSlash);
 
     KisImageWSP image = m_canvas->view()->image();
+    QString filename = m_canvas->view()->document()->localFilePath();
+    if (!filename.isEmpty()) {
+        QFileInfo info(filename);
+        path += info.baseName() + '_';
+    }
     foreach(KisLayerComposition* composition, \
m_canvas->view()->image()->compositions()) {  composition->apply();
         image->refreshGraph();


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