Created an attachment (id=18842) [details]
Oxygen color palette

This is the Oxygen color palette that is provided
http://www.kde-artists.org/Oxygen-palette. Not all colors are parsed and
imported properly.

SVN commit 611459 by rempt:

BUG: 138524 
* Load gimp palettes without tabs (I think those are broken, but lets load
them anyway)
* Also: make closing Krita while drying not crash


 M  +1 -1      kis_paint_device.cc  
 M  +11 -2     kis_palette.cc  


--- branches/koffice/1.6/koffice/krita/core/kis_paint_device.cc #611458:611459
@@ -1271,7 +1271,7 @@
             (*it)->process(this, this, 0, rc);
         }
     }
-    undoAdapter()->addCommand(cmd);
+    if (cmd && undoAdapter()) undoAdapter()->addCommand(cmd);
 
     if (m_parentLayer) m_parentLayer->setDirty(rc);
 }
--- branches/koffice/1.6/koffice/krita/core/kis_palette.cc #611458:611459
@@ -238,8 +238,14 @@
                 m_comment += lines[i].mid(1).stripWhiteSpace() + " ";
             }
             else {
-                if (lines[i].contains("\t") > 0) {
-                    QStringList a = QStringList::split("\t", lines[i]);
+                if (lines[i].contains("\t") > 0 || lines[i].contains("     ") > 0) {
+
+                    QStringList a;
+                   
+                    if (lines[i].contains("\t") > 0)
+                        a = QStringList::split("\t", lines[i]);
+                    else if (lines[i].contains("     ") > 0)
+                        a = QStringList::split("     ", lines[i]);
                     e.name = a[1];
 
                     QStringList c = QStringList::split(" ", a[0]);
@@ -254,6 +260,9 @@
 
                     add(e);
                 }
+                else {
+                    kdWarning() << filename() << ": could not parse palette line " << lines[i] << endl;
+                }
             }
         }
 

I have also sent a working version of the Oxygen palette to the kde-artists
mailing list, in the meantime.

SVN commit 611461 by rempt:

Better way of loading palettes, thanks to Eike Hein.
CCBUG:138524 


 M  +26 -24    kis_palette.cc  


--- branches/koffice/1.6/koffice/krita/core/kis_palette.cc #611460:611461
@@ -232,40 +232,42 @@
             index = 3;
         }
 
-        // Loop over the rest of the lines
         for (Q_UINT32 i = index; i < lines.size(); i++) {
             if (lines[i].startsWith("#")) {
                 m_comment += lines[i].mid(1).stripWhiteSpace() + " ";
             }
-            else {
-                if (lines[i].contains("\t") > 0 || lines[i].contains("     ") > 0) {
+            else if (!lines[i].isEmpty())
+            {
+                QStringList a = QStringList::split(" ", lines[i].replace(QChar('\t'), " "));
 
-                    QStringList a;
-                   
-                    if (lines[i].contains("\t") > 0)
-                        a = QStringList::split("\t", lines[i]);
-                    else if (lines[i].contains("     ") > 0)
-                        a = QStringList::split("     ", lines[i]);
-                    e.name = a[1];
+                if (a.count() < 3)
+                {
+                    break;
+                }
 
-                    QStringList c = QStringList::split(" ", a[0]);
-                    channel = c[0].stripWhiteSpace();
-                    r = channel.toInt();
-                    channel = c[1].stripWhiteSpace();
-                    g = channel.toInt();
-                    channel = c[2].stripWhiteSpace();
-                    b = channel.toInt();
-                    color = QColor(r, g, b);
-                    e.color = color;
+                r = a[0].toInt();
+                a.pop_front();
+                g = a[0].toInt();
+                a.pop_front();
+                b = a[0].toInt();
+                a.pop_front();
 
-                    add(e);
+                if (r < 0 || r > 255 ||
+                    g < 0 || g > 255 ||
+                    b < 0 || b > 255)
+                {
+                    break;
                 }
-                else {
-                    kdWarning() << filename() << ": could not parse palette line " << lines[i] << endl;
-                }
+
+                color = QColor(r, g, b);
+                e.color = color;
+
+                QString name = a.join(" ");
+                e.name = name.isEmpty() ? i18n("Untitled") : name;
+
+                add(e);
             }
         }
-
         setValid(true);
         return true;
     }

On Friday 08 December 2006 10:02, Juan Carlos Torres wrote:
> I have also sent a working version of the Oxygen palette to the
> kde-artists mailing list, in the meantime.


Great!