summaryrefslogtreecommitdiff
path: root/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
Unidiff
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.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 7be5af5..1320cbc 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -14,28 +14,27 @@
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"
27#include "kcolorbtn.h" 26#include "kcolorbtn.h"
28 27
29#include <opie/colordialog.h> 28#include <opie2/qcolordialog.h>
30 29
31KColorButton::KColorButton( QWidget *parent, const char *name ) 30KColorButton::KColorButton( QWidget *parent, const char *name )
32 : QPushButton( parent, name ), dragFlag(false) 31 : QPushButton( parent, name ), dragFlag(false)
33{ 32{
34 // 2000-10-15 (putzer): fixes broken keyboard usage 33 // 2000-10-15 (putzer): fixes broken keyboard usage
35 connect (this, SIGNAL(clicked()), this, SLOT(chooseColor())); 34 connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
36} 35}
37 36
38KColorButton::KColorButton( const QColor &c, QWidget *parent, 37KColorButton::KColorButton( const QColor &c, QWidget *parent,
39 const char *name ) 38 const char *name )
40 : QPushButton( parent, name ), col(c), dragFlag(false) 39 : QPushButton( parent, name ), col(c), dragFlag(false)
41{ 40{
@@ -66,20 +65,20 @@ void KColorButton::drawButtonLabel( QPainter *painter )
66 qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 ); 65 qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 );
67 b++; 66 b++;
68 painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol ); 67 painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol );
69 } else { 68 } else {
70 qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 ); 69 qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 );
71 b++; 70 b++;
72 painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol ); 71 painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol );
73 } 72 }
74} 73}
75 74
76void KColorButton::chooseColor() 75void KColorButton::chooseColor()
77{ 76{
78 QColor newCol=OColorDialog::getColor( col); 77 QColor newCol=QColorDialog::getColor( col);
79 if( newCol != QDialog::Rejected ) 78 if( newCol != QDialog::Rejected )
80 { 79 {
81 col=newCol; 80 col=newCol;
82 repaint( false ); 81 repaint( false );
83 emit changed( col ); 82 emit changed( col );
84 } 83 }
85} 84}