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

List:       kde-commits
Subject:    koffice
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2008-02-25 22:54:51
Message-ID: 1203980091.465165.18365.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 779353 by langkamp:

fixed loading of palettes in KoColorSetWidget and put it into the Krita palette docker

 M  +4 -4      krita/ui/kis_palette_docker.cc  
 M  +4 -12     libs/guiutils/KoColorSetWidget.cpp  


--- trunk/koffice/krita/ui/kis_palette_docker.cc #779352:779353
@@ -27,7 +27,7 @@
 
 #include "KoResource.h"
 #include "KoColorSet.h"
-#include "kis_palette_view.h"
+#include "KoColorSetWidget.h"
 #include "kis_resource_provider.h"
 
 KisPaletteDocker::KisPaletteDocker( KisView2 * view )
@@ -40,10 +40,10 @@
 
     m_currentPalette = 0;
 
-//    QVBoxLayout *layout = new QVBoxLayout( mainWidget );
+    QVBoxLayout *layout = new QVBoxLayout( mainWidget );
 
-    //m_paletteView = new KisPaletteView(this, 0, mMinWidth, mCols);
-    //layout->addWidget( m_paletteView );
+   // m_paletteView = new KisPaletteView(this, 0, mMinWidth, mCols);
+    layout->addWidget( new KoColorSetWidget(this) );
 
     //setFixedSize(sizeHint());
 /*
--- trunk/koffice/libs/guiutils/KoColorSetWidget.cpp #779352:779353
@@ -42,6 +42,8 @@
 #include <KoColorPatch.h>
 #include <KoEditColorSetDialog.h>
 #include <KoColorSpaceRegistry.h>
+#include <KoResourceServer.h>
+#include <KoResourceServerProvider.h>
 
 class KoColorSetWidget::KoColorSetWidgetPrivate {
 public:
@@ -97,18 +99,8 @@
 
 void KoColorSetWidget::KoColorSetWidgetPrivate::addRemoveColors()
 {
-    // TODO: don't hardcode default location of palettes
-    QList<KoColorSet *> palettes;
-    QString defaultPalette("krita/palettes/40_Colors.gpl");
-    QString dir = KGlobal::dirs()->findResourceDir("data", defaultPalette);
-    QDir loc = dir + "krita/palettes/";
-    loc.setNameFilters(QStringList("*.gpl"));
-    QStringList entryList = loc.entryList(QDir::Files);
-    QStringList::iterator it;
-    for (it = entryList.begin(); it != entryList.end(); ++it) {
-        (*it).prepend(dir + "krita/palettes/");
-        palettes.append(new KoColorSet(*it));
-    }
+    KoResourceServer<KoColorSet>* srv = KoResourceServerProvider::instance()->paletteServer();
+    QList<KoColorSet*> palettes = srv->resources();
 
     Q_ASSERT(colorSet);
     KoEditColorSetDialog *dlg = new KoEditColorSetDialog(palettes, colorSet->name(), thePublic);
[prev in list] [next in list] [prev in thread] [next in thread]