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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/colors
From:       Davide Bettio <davide.bettio () kdemail ! net>
Date:       2010-01-10 20:13:13
Message-ID: 1263154393.949424.5030.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1072736 by bettio:

New color palette.


 M  +27 -15    kcolorcombo.cpp  


--- trunk/KDE/kdelibs/kdeui/colors/kcolorcombo.cpp #1072735:1072736
@@ -146,7 +146,7 @@
 }
 
 
-#define STANDARD_PAL_SIZE 17
+#define STANDARD_PAL_SIZE 26
 
 K_GLOBAL_STATIC_WITH_ARGS(QVector<QColor>, standardPalette, (STANDARD_PAL_SIZE))
 static void createStandardPalette()
@@ -156,23 +156,33 @@
 
     int i = 0;
 
-    (*standardPalette)[i++] = Qt::red;
-    (*standardPalette)[i++] = Qt::green;
-    (*standardPalette)[i++] = Qt::blue;
-    (*standardPalette)[i++] = Qt::cyan;
-    (*standardPalette)[i++] = Qt::magenta;
-    (*standardPalette)[i++] = Qt::yellow;
-    (*standardPalette)[i++] = Qt::darkRed;
-    (*standardPalette)[i++] = Qt::darkGreen;
-    (*standardPalette)[i++] = Qt::darkBlue;
-    (*standardPalette)[i++] = Qt::darkCyan;
-    (*standardPalette)[i++] = Qt::darkMagenta;
-    (*standardPalette)[i++] = Qt::darkYellow;
     (*standardPalette)[i++] = Qt::white;
     (*standardPalette)[i++] = Qt::lightGray;
     (*standardPalette)[i++] = Qt::gray;
     (*standardPalette)[i++] = Qt::darkGray;
     (*standardPalette)[i++] = Qt::black;
+
+    (*standardPalette)[i++] = QColor(255, 128, 128); //light red
+    (*standardPalette)[i++] = QColor(255, 192, 128); //light orange
+    (*standardPalette)[i++] = QColor(255, 255, 128); //light yellow
+    (*standardPalette)[i++] = QColor(128, 255, 128); //light green
+    (*standardPalette)[i++] = QColor(128, 255, 255); //cyan blue
+    (*standardPalette)[i++] = QColor(128, 128, 255); //light blue
+    (*standardPalette)[i++] = QColor(255, 128, 255); //light violet 
+    (*standardPalette)[i++] = QColor(255, 0, 0); //red
+    (*standardPalette)[i++] = QColor(255, 128, 0); //orange
+    (*standardPalette)[i++] = QColor(255, 255, 0); //yellow
+    (*standardPalette)[i++] = QColor(0, 255, 0); //green
+    (*standardPalette)[i++] = QColor(0, 255, 255); //light blue
+    (*standardPalette)[i++] = QColor(0, 0, 255); //blue
+    (*standardPalette)[i++] = QColor(255, 0, 255); //violet
+    (*standardPalette)[i++] = QColor(128, 0, 0); //dark red
+    (*standardPalette)[i++] = QColor(128, 64, 0); //dark orange
+    (*standardPalette)[i++] = QColor(128, 128, 0); //dark yellow
+    (*standardPalette)[i++] = QColor(0, 128, 0); //dark green
+    (*standardPalette)[i++] = QColor(0, 128, 128); //dark light blue
+    (*standardPalette)[i++] = QColor(0, 0, 128); //dark blue
+    (*standardPalette)[i++] = QColor(128, 0, 128); //dark violet
 }
 
 class KColorComboPrivate
@@ -237,8 +247,10 @@
     connect(this, SIGNAL(highlighted(int)), SLOT(_k_slotHighlighted(int)));
 
     // select the white color
-    setCurrentIndex(13);
-    d->_k_slotActivated(13);
+    setCurrentIndex(1);
+    d->_k_slotActivated(1);
+    
+    setMaxVisibleItems(13);
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]