author | llornkcor <llornkcor> | 2003-06-14 18:49:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-06-14 18:49:26 (UTC) |
commit | ceaa4586c271b04f312109d6b1dd1be8be6e3afd (patch) (unidiff) | |
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 | 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 | |||
@@ -2,83 +2,85 @@ | |||
2 | Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 | Copyright (C) 1997 Martin Jones (mjones@kde.org) |
3 | Copyright (C) 1999 Cristian Tibirna (ctibirna@kde.org) | 3 | Copyright (C) 1999 Cristian Tibirna (ctibirna@kde.org) |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <qdialog.h> | 21 | #include <qdialog.h> |
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qdrawutil.h> | 23 | #include <qdrawutil.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <kglobalsettings.h> | 25 | #include <kglobalsettings.h> |
26 | #include "kcolordialog.h" | 26 | //#include "kcolordialog.h" |
27 | #include "kcolorbtn.h" | 27 | #include "kcolorbtn.h" |
28 | 28 | ||
29 | #include <opie/colordialog.h> | ||
30 | |||
29 | KColorButton::KColorButton( QWidget *parent, const char *name ) | 31 | KColorButton::KColorButton( QWidget *parent, const char *name ) |
30 | : QPushButton( parent, name ), dragFlag(false) | 32 | : QPushButton( parent, name ), dragFlag(false) |
31 | { | 33 | { |
32 | // 2000-10-15 (putzer): fixes broken keyboard usage | 34 | // 2000-10-15 (putzer): fixes broken keyboard usage |
33 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); | 35 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); |
34 | } | 36 | } |
35 | 37 | ||
36 | KColorButton::KColorButton( const QColor &c, QWidget *parent, | 38 | KColorButton::KColorButton( const QColor &c, QWidget *parent, |
37 | const char *name ) | 39 | const char *name ) |
38 | : QPushButton( parent, name ), col(c), dragFlag(false) | 40 | : QPushButton( parent, name ), col(c), dragFlag(false) |
39 | { | 41 | { |
40 | 42 | ||
41 | // 2000-10-15 (putzer): fixes broken keyboard usage | 43 | // 2000-10-15 (putzer): fixes broken keyboard usage |
42 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); | 44 | connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); |
43 | } | 45 | } |
44 | 46 | ||
45 | void KColorButton::setColor( const QColor &c ) | 47 | void KColorButton::setColor( const QColor &c ) |
46 | { | 48 | { |
47 | col = c; | 49 | col = c; |
48 | repaint( false ); | 50 | repaint( false ); |
49 | } | 51 | } |
50 | 52 | ||
51 | void KColorButton::drawButtonLabel( QPainter *painter ) | 53 | void KColorButton::drawButtonLabel( QPainter *painter ) |
52 | { | 54 | { |
53 | QRect r = QApplication::style().buttonRect( 0, 0, width(), height() ); | 55 | QRect r = QApplication::style().buttonRect( 0, 0, width(), height() ); |
54 | int l = r.x(); | 56 | int l = r.x(); |
55 | int t = r.y(); | 57 | int t = r.y(); |
56 | int w = r.width(); | 58 | int w = r.width(); |
57 | int h = r.height(); | 59 | int h = r.height(); |
58 | int b = 5; | 60 | int b = 5; |
59 | 61 | ||
60 | QColor lnCol = colorGroup().text(); | 62 | QColor lnCol = colorGroup().text(); |
61 | QColor fillCol = isEnabled() ? col : backgroundColor(); | 63 | QColor fillCol = isEnabled() ? col : backgroundColor(); |
62 | 64 | ||
63 | if ( isDown() ) { | 65 | if ( isDown() ) { |
64 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); | 66 | qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); |
65 | b++; | 67 | b++; |
66 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); | 68 | painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); |
67 | } else { | 69 | } else { |
68 | qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); | 70 | qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); |
69 | b++; | 71 | b++; |
70 | painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); | 72 | painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); |
71 | } | 73 | } |
72 | } | 74 | } |
73 | 75 | ||
74 | void KColorButton::chooseColor() | 76 | void KColorButton::chooseColor() |
75 | { | 77 | { |
76 | if( KColorDialog::getColor( col) == QDialog::Rejected ) | 78 | QColor newCol=OColorDialog::getColor( col); |
79 | if( newCol != QDialog::Rejected ) | ||
77 | { | 80 | { |
78 | return; | 81 | col=newCol; |
79 | } | ||
80 | |||
81 | repaint( false ); | 82 | repaint( false ); |
82 | emit changed( col ); | 83 | emit changed( col ); |
84 | } | ||
83 | } | 85 | } |
84 | 86 | ||
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,14 +1,16 @@ | |||
1 | #ifndef MINIKDE_KCOLORDIALOG_H | 1 | #ifndef MINIKDE_KCOLORDIALOG_H |
2 | #define MINIKDE_KCOLORDIALOG_H | 2 | #define MINIKDE_KCOLORDIALOG_H |
3 | 3 | ||
4 | #include <qcolor.h> | 4 | #include <qcolor.h> |
5 | #include <opie/colordialog.h> | ||
5 | 6 | ||
6 | class KColorDialog | 7 | class KColorDialog : OColorDialog |
7 | { | 8 | { |
9 | Q_OBJECT | ||
8 | public: | 10 | public: |
9 | enum { Accepted }; | 11 | enum { Accepted }; |
10 | 12 | ||
11 | static int getColor( const QColor & ); | 13 | static int getColor( const QColor & ); |
12 | }; | 14 | }; |
13 | 15 | ||
14 | #endif | 16 | #endif |