author | zautrix <zautrix> | 2005-06-10 13:54:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-10 13:54:08 (UTC) |
commit | 31fed261955dcb25d06052a8154ac4cc630b0f7d (patch) (unidiff) | |
tree | ef2b4fe35255f9bf387407b6756c112a67088ad6 /microkde | |
parent | d2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (diff) | |
download | kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.zip kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.gz kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.bz2 |
fixxx
-rw-r--r-- | microkde/kcolorbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp index c7c6088..96dc256 100644 --- a/microkde/kcolorbutton.cpp +++ b/microkde/kcolorbutton.cpp | |||
@@ -1,47 +1,47 @@ | |||
1 | #include "kcolorbutton.h" | 1 | #include "kcolorbutton.h" |
2 | #include "kcolordialog.h" | 2 | #include "kcolordialog.h" |
3 | #include "qapplication.h" | 3 | #include "qapplication.h" |
4 | 4 | ||
5 | 5 | ||
6 | #include "qlayout.h" | 6 | #include "qlayout.h" |
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 | } | 19 | } |
20 | #else | 20 | #else |
21 | KColorDialog* k = new KColorDialog( this ); | 21 | KColorDialog* k = new KColorDialog( this ); |
22 | k->setColor( mColor ); | 22 | k->setColor( mColor ); |
23 | int res = k->exec(); | 23 | int res = k->exec(); |
24 | if ( res ) { | 24 | if ( res ) { |
25 | mColor = k->getColor(); | 25 | mColor = k->getColor(); |
26 | setColor ( mColor ); | 26 | setColor ( mColor ); |
27 | emit changed ( mColor ); | 27 | emit changed ( mColor ); |
28 | } | 28 | } |
29 | delete k; | 29 | delete k; |
30 | #endif | 30 | #endif |
31 | } | 31 | } |
32 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) | 32 | KColorButton::KColorButton( QWidget *p ):QPushButton( p ) |
33 | { | 33 | { |
34 | int size = 24; | 34 | int size = 24; |
35 | if( QApplication::desktop()->width() < 480 ) | 35 | if( QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 ) |
36 | size = 18; | 36 | size = 18; |
37 | setFixedSize( size,size ); | 37 | setFixedSize( size,size ); |
38 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); | 38 | connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() )); |
39 | 39 | ||
40 | } | 40 | } |
41 | void KColorButton::setColor ( const QColor & c) | 41 | void KColorButton::setColor ( const QColor & c) |
42 | { | 42 | { |
43 | mColor = c; | 43 | mColor = c; |
44 | QPixmap pix ( height() - 4, width() - 4 ); | 44 | QPixmap pix ( height() - 4, width() - 4 ); |
45 | pix.fill( c ); | 45 | pix.fill( c ); |
46 | setPixmap ( pix ); | 46 | setPixmap ( pix ); |
47 | } | 47 | } |