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
@@ -24,12 +24,15 @@
 
 #ifndef KAB_EMBEDDED
 #include <kcolordrag.h>
 #endif //KAB_EMBEDDED
 
 #include "colorlistbox.h"
+#ifdef DESKTOP_VERSION
+#include <qcolordialog.h>
+#endif
 
 ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f )
   :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) );
   connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) );
@@ -94,19 +97,26 @@ void ColorListBox::newColor( int index )
 #ifndef KAB_EMBEDDED
     if( KColorDialog::getColor( c, this ) != QDialog::Rejected )
     {
       setColor( index, c );
     }
 #else //KAB_EMBEDDED
+#ifdef DESKTOP_VERSION
+    QColor col = QColorDialog::getColor ( c ); 
+    if ( col.isValid () ) {
+        setColor( index, col );
+    }
+#else
     KColorDialog* k =  new KColorDialog( this );
     k->setColor( c );
     int res = k->exec();
     if ( res ) {
       setColor( index, k->getColor() );
     }
     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
@@ -1,25 +1,36 @@
 #include "kcolorbutton.h"
 #include "kcolordialog.h"
 #include "qapplication.h"
 
 
 #include "qlayout.h"
-
+#ifdef DESKTOP_VERSION
+#include <qcolordialog.h>
+#endif
 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 );
     k->setColor( mColor );
     int res = k->exec();
     if ( res ) {
         mColor = k->getColor(); 
         setColor ( mColor );
         emit changed ( mColor );
     }
     delete k;
+#endif
 }
 KColorButton::KColorButton( QWidget *p ):QPushButton( p )
 {
     int size = 24;
     if(  QApplication::desktop()->width() < 480 )
         size = 18;