author | llornkcor <llornkcor> | 2003-06-14 18:49:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-06-14 18:49:26 (UTC) |
commit | ceaa4586c271b04f312109d6b1dd1be8be6e3afd (patch) (side-by-side diff) | |
tree | d1a9e3f3e9198545d3e9e51c97d21b9438e613cd /noncore | |
parent | 4f3517efd69b1b4a016799e3875b6c72e9fb1a3b (diff) | |
download | opie-ceaa4586c271b04f312109d6b1dd1be8be6e3afd.zip opie-ceaa4586c271b04f312109d6b1dd1be8be6e3afd.tar.gz opie-ceaa4586c271b04f312109d6b1dd1be8be6e3afd.tar.bz2 |
fix colordialog
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolordialog.h | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp index 5d21f15..976f1db 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp +++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp @@ -20,15 +20,17 @@ #include <qdialog.h> #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 connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); } @@ -70,15 +72,15 @@ void KColorButton::drawButtonLabel( QPainter *painter ) painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); } } void KColorButton::chooseColor() { - if( KColorDialog::getColor( col) == QDialog::Rejected ) + QColor newCol=OColorDialog::getColor( col); + if( newCol != QDialog::Rejected ) { - return; - } - + col=newCol; repaint( false ); emit changed( col ); } +} diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h index 0f831cd..1d5c27e 100644 --- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h +++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h @@ -1,13 +1,15 @@ #ifndef MINIKDE_KCOLORDIALOG_H #define MINIKDE_KCOLORDIALOG_H #include <qcolor.h> +#include <opie/colordialog.h> -class KColorDialog +class KColorDialog : OColorDialog { + Q_OBJECT public: enum { Accepted }; static int getColor( const QColor & ); }; |