author | zautrix <zautrix> | 2005-06-07 08:53:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-07 08:53:18 (UTC) |
commit | aa9a9368a7b38e34118b65a4e8efa7ea7ec0e8e4 (patch) (unidiff) | |
tree | 69bcfb2ea1e74fa38bf8c648ecba4501dfbe5690 /kaddressbook | |
parent | ff8af7ccdd6346bba1cb871c33931352bbafe40e (diff) | |
download | kdepimpi-aa9a9368a7b38e34118b65a4e8efa7ea7ec0e8e4.zip kdepimpi-aa9a9368a7b38e34118b65a4e8efa7ea7ec0e8e4.tar.gz kdepimpi-aa9a9368a7b38e34118b65a4e8efa7ea7ec0e8e4.tar.bz2 |
color dialog fix
-rw-r--r-- | kaddressbook/views/colorlistbox.cpp | 10 |
1 files changed, 10 insertions, 0 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 | |||
@@ -26,8 +26,11 @@ | |||
26 | #include <kcolordrag.h> | 26 | #include <kcolordrag.h> |
27 | #endif //KAB_EMBEDDED | 27 | #endif //KAB_EMBEDDED |
28 | 28 | ||
29 | #include "colorlistbox.h" | 29 | #include "colorlistbox.h" |
30 | #ifdef DESKTOP_VERSION | ||
31 | #include <qcolordialog.h> | ||
32 | #endif | ||
30 | 33 | ||
31 | ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f ) | 34 | ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f ) |
32 | :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) | 35 | :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) |
33 | { | 36 | { |
@@ -96,15 +99,22 @@ void ColorListBox::newColor( int index ) | |||
96 | { | 99 | { |
97 | setColor( index, c ); | 100 | setColor( index, c ); |
98 | } | 101 | } |
99 | #else //KAB_EMBEDDED | 102 | #else //KAB_EMBEDDED |
103 | #ifdef DESKTOP_VERSION | ||
104 | QColor col = QColorDialog::getColor ( c ); | ||
105 | if ( col.isValid () ) { | ||
106 | setColor( index, col ); | ||
107 | } | ||
108 | #else | ||
100 | KColorDialog* k = new KColorDialog( this ); | 109 | KColorDialog* k = new KColorDialog( this ); |
101 | k->setColor( c ); | 110 | k->setColor( c ); |
102 | int res = k->exec(); | 111 | int res = k->exec(); |
103 | if ( res ) { | 112 | if ( res ) { |
104 | setColor( index, k->getColor() ); | 113 | setColor( index, k->getColor() ); |
105 | } | 114 | } |
106 | delete k; | 115 | delete k; |
116 | #endif | ||
107 | #endif //KAB_EMBEDDED | 117 | #endif //KAB_EMBEDDED |
108 | 118 | ||
109 | } | 119 | } |
110 | } | 120 | } |