summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/views/colorlistbox.cpp10
-rw-r--r--microkde/kcolorbutton.cpp13
2 files changed, 22 insertions, 1 deletions
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 7386207..2bddca6 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -29,2 +29,5 @@
#include "colorlistbox.h"
+#ifdef DESKTOP_VERSION
+#include <qcolordialog.h>
+#endif
@@ -99,2 +102,8 @@ void ColorListBox::newColor( int index )
#else //KAB_EMBEDDED
+#ifdef DESKTOP_VERSION
+ QColor col = QColorDialog::getColor ( c );
+ if ( col.isValid () ) {
+ setColor( index, col );
+ }
+#else
KColorDialog* k = new KColorDialog( this );
@@ -106,2 +115,3 @@ void ColorListBox::newColor( int index )
delete k;
+#endif
#endif //KAB_EMBEDDED
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index 433f909..c7c6088 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -6,3 +6,5 @@
#include "qlayout.h"
-
+#ifdef DESKTOP_VERSION
+#include <qcolordialog.h>
+#endif
void KColorButton:: edit()
@@ -10,2 +12,10 @@ void KColorButton:: edit()
+#ifdef DESKTOP_VERSION
+ QColor col = QColorDialog::getColor ( mColor );
+ if ( col.isValid () ) {
+ mColor = col;
+ setColor ( mColor );
+ emit changed ( mColor );
+ }
+#else
KColorDialog* k = new KColorDialog( this );
@@ -19,2 +29,3 @@ void KColorButton:: edit()
delete k;
+#endif
}