-rw-r--r-- | microkde/kcolorbutton.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp index 96dc256..197bea2 100644 --- a/microkde/kcolorbutton.cpp +++ b/microkde/kcolorbutton.cpp | |||
@@ -7,41 +7,48 @@ | |||
7 | #ifdef DESKTOP_VERSION | 7 | #ifdef DESKTOP_VERSION |
8 | #include <qcolordialog.h> | 8 | #include <qcolordialog.h> |
9 | #endif | 9 | #endif |
10 | void KColorButton:: edit() | 10 | void KColorButton:: edit() |
11 | { | 11 | { |
12 | 12 | ||
13 | #ifdef DESKTOP_VERSION | 13 | #ifdef DESKTOP_VERSION |
14 | QColor col = QColorDialog::getColor ( mColor ); | 14 | QColor col = QColorDialog::getColor ( mColor ); |
15 | if ( col.isValid () ) { | 15 | if ( col.isValid () ) { |
16 | mColor = col; | 16 | mColor = col; |
17 | setColor ( mColor ); | 17 | setColor ( mColor ); |
18 | emit changed ( mColor ); | 18 | emit changed ( mColor ); |
19 | emit changedID ( mColor, id ); | ||
19 | } | 20 | } |
20 | #else | 21 | #else |
21 | KColorDialog* k = new KColorDialog( this ); | 22 | KColorDialog* k = new KColorDialog( this ); |
22 | k->setColor( mColor ); | 23 | k->setColor( mColor ); |
23 | int res = k->exec(); | 24 | int res = k->exec(); |
24 | if ( res ) { | 25 | if ( res ) { |
25 | mColor = k->getColor(); | 26 | mColor = k->getColor(); |
26 | setColor ( mColor ); | 27 | setColor ( mColor ); |
27 | emit changed ( mColor ); | 28 | emit changed ( mColor ); |
29 | emit changedID ( mColor, id ); | ||
28 | } | 30 | } |
29 | delete k; | 31 | delete k; |
30 | #endif | 32 | #endif |
31 | } | 33 | } |
32 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) | 34 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) |
33 | { | 35 | { |
34 | int size = 24; | 36 | int size = 24; |
35 | if( QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 ) | 37 | if( QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 ) |
36 | size = 18; | 38 | size = 18; |
37 | setFixedSize( size,size ); | 39 | setFixedSize( size,size ); |
40 | int id = 0; | ||
38 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); | 41 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); |
39 | 42 | ||
40 | } | 43 | } |
44 | void KColorButton::setID ( int i) | ||
45 | { | ||
46 | id = i; | ||
47 | } | ||
41 | void KColorButton::setColor ( const QColor & c) | 48 | void KColorButton::setColor ( const QColor & c) |
42 | { | 49 | { |
43 | mColor = c; | 50 | mColor = c; |
44 | QPixmap pix ( height() - 4, width() - 4 ); | 51 | QPixmap pix ( height() - 4, width() - 4 ); |
45 | pix.fill( c ); | 52 | pix.fill( c ); |
46 | setPixmap ( pix ); | 53 | setPixmap ( pix ); |
47 | } | 54 | } |