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 | |||
@@ -18,24 +18,27 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <qpainter.h> | 21 | #include <qpainter.h> |
22 | 22 | ||
23 | #include <kcolordialog.h> | 23 | #include <kcolordialog.h> |
24 | 24 | ||
25 | #ifndef KAB_EMBEDDED | 25 | #ifndef KAB_EMBEDDED |
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 | { |
34 | connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) ); | 37 | connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) ); |
35 | connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) ); | 38 | connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) ); |
36 | setAcceptDrops( true); | 39 | setAcceptDrops( true); |
37 | } | 40 | } |
38 | 41 | ||
39 | 42 | ||
40 | void ColorListBox::setEnabled( bool state ) | 43 | void ColorListBox::setEnabled( bool state ) |
41 | { | 44 | { |
@@ -88,31 +91,38 @@ void ColorListBox::newColor( int index ) | |||
88 | return; | 91 | return; |
89 | } | 92 | } |
90 | 93 | ||
91 | if( (uint)index < count() ) | 94 | if( (uint)index < count() ) |
92 | { | 95 | { |
93 | QColor c = color( index ); | 96 | QColor c = color( index ); |
94 | #ifndef KAB_EMBEDDED | 97 | #ifndef KAB_EMBEDDED |
95 | if( KColorDialog::getColor( c, this ) != QDialog::Rejected ) | 98 | if( KColorDialog::getColor( c, this ) != QDialog::Rejected ) |
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 | } |
111 | 121 | ||
112 | 122 | ||
113 | void ColorListBox::dragEnterEvent( QDragEnterEvent *e ) | 123 | void ColorListBox::dragEnterEvent( QDragEnterEvent *e ) |
114 | { | 124 | { |
115 | #ifndef KAB_EMBEDDED | 125 | #ifndef KAB_EMBEDDED |
116 | if( KColorDrag::canDecode(e) && isEnabled() ) | 126 | if( KColorDrag::canDecode(e) && isEnabled() ) |
117 | { | 127 | { |
118 | mCurrentOnDragEnter = currentItem(); | 128 | mCurrentOnDragEnter = currentItem(); |