| 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 | |
| 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 | 14 | ||||
| -rw-r--r-- | noncore/apps/tinykate/libkate/microkde/kcolordialog.h | 4 |
2 files changed, 11 insertions, 7 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 @@ -25,5 +25,7 @@ #include <kglobalsettings.h> -#include "kcolordialog.h" +//#include "kcolordialog.h" #include "kcolorbtn.h" +#include <opie/colordialog.h> + KColorButton::KColorButton( QWidget *parent, const char *name ) @@ -36,3 +38,3 @@ KColorButton::KColorButton( QWidget *parent, const char *name ) KColorButton::KColorButton( const QColor &c, QWidget *parent, - const char *name ) + const char *name ) : QPushButton( parent, name ), col(c), dragFlag(false) @@ -75,9 +77,9 @@ 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 @@ -4,5 +4,7 @@ #include <qcolor.h> +#include <opie/colordialog.h> -class KColorDialog +class KColorDialog : OColorDialog { + Q_OBJECT public: |