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

List:       kde-commits
Subject:    KDE/kdegraphics/kolourpaint/widgets/toolbars
From:       Clarence Dang <dang () kde ! org>
Date:       2007-09-27 6:24:06
Message-ID: 1190874246.362174.2383.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 717554 by dang:

Fixes that probably make no functional differences:

* Fix the connection to nameChanged()

* Use kpUrlFormatter

* +comment


 M  +6 -3      kpColorToolBar.cpp  


--- trunk/KDE/kdegraphics/kolourpaint/widgets/toolbars/kpColorToolBar.cpp #717553:717554
@@ -59,6 +59,7 @@
 #include <kpDualColorButton.h>
 #include <kpPixmapFX.h>
 #include <kpTool.h>
+#include <kpUrlFormatter.h>
 #include <kpView.h>
 
 
@@ -80,6 +81,8 @@
     m_boxLayout->setMargin (5);
     m_boxLayout->setSpacing (10 * 3);
 
+    // This holds the current global foreground and background colors, for
+    // tools.
     m_dualColorButton = new kpDualColorButton (base);
     connect (m_dualColorButton, SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
              this, SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
@@ -94,12 +97,12 @@
              m_dualColorButton, SLOT (setForegroundColor (const kpColor &)));
     connect (m_colorPalette, SIGNAL (backgroundColorChanged (const kpColor &)),
              m_dualColorButton, SLOT (setBackgroundColor (const kpColor &)));
-    
+
     connect (m_colorPalette->colorCells (), SIGNAL (isModifiedChanged (bool)),
              SLOT (updateNameOrUrlLabel ()));
     connect (m_colorPalette->colorCells (), SIGNAL (urlChanged (const KUrl &)),
              SLOT (updateNameOrUrlLabel ()));
-    connect (m_colorPalette->colorCells (), SIGNAL (nameChanged (const KUrl &)),
+    connect (m_colorPalette->colorCells (), SIGNAL (nameChanged (const QString &)),
              SLOT (updateNameOrUrlLabel ()));
     updateNameOrUrlLabel ();
 
@@ -249,7 +252,7 @@
 
     kpColorCells *colorCells = m_colorPalette->colorCells ();
     if (!colorCells->url ().isEmpty ())
-        name = colorCells->url ().fileName ();
+        name = kpUrlFormatter::PrettyFilename (colorCells->url ());
     else
     {
         if (!colorCells->name ().isEmpty ())
[prev in list] [next in list] [prev in thread] [next in thread]