| author | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
| commit | 1c58d1407f9584fedcdae390a04e2b37e5853361 (patch) (side-by-side diff) | |
| tree | 3c6e741c4d382d1a53c182930052b684d6e35b91 /noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | |
| parent | e3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (diff) | |
| download | opie-1c58d1407f9584fedcdae390a04e2b37e5853361.zip opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.gz opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.bz2 | |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 976f1db..5d21f15 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp @@ -22,13 +22,11 @@ #include <qpainter.h> #include <qdrawutil.h> #include <qapplication.h> #include <kglobalsettings.h> -//#include "kcolordialog.h" +#include "kcolordialog.h" #include "kcolorbtn.h" -#include <opie/colordialog.h> - KColorButton::KColorButton( QWidget *parent, const char *name ) : QPushButton( parent, name ), dragFlag(false) { // 2000-10-15 (putzer): fixes broken keyboard usage @@ -74,13 +72,13 @@ void KColorButton::drawButtonLabel( QPainter *painter ) } void KColorButton::chooseColor() { - QColor newCol=OColorDialog::getColor( col); - if( newCol != QDialog::Rejected ) + if( KColorDialog::getColor( col) == QDialog::Rejected ) { - col=newCol; + return; + } + repaint( false ); emit changed( col ); } -} |