summaryrefslogtreecommitdiff
path: root/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
authordrw <drw>2004-02-23 18:12:57 (UTC)
committer drw <drw>2004-02-23 18:12:57 (UTC)
commit398c7d54acfc203ec90644d6c63e5b200391e906 (patch) (unidiff)
tree84a1f495a5a2450f7eb2f401037b6fd81162d72b /noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
parentf5762a3bee0ca4a176048f6552acaea2af827914 (diff)
downloadopie-398c7d54acfc203ec90644d6c63e5b200391e906.zip
opie-398c7d54acfc203ec90644d6c63e5b200391e906.tar.gz
opie-398c7d54acfc203ec90644d6c63e5b200391e906.tar.bz2
TinyKate: libopie->libopie2
Diffstat (limited to 'noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp9
1 files changed, 4 insertions, 5 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
@@ -20,16 +20,15 @@
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()));
@@ -55,16 +54,16 @@ void KColorButton::drawButtonLabel( QPainter *painter )
55 QRect r = QApplication::style().buttonRect( 0, 0, width(), height() ); 54 QRect r = QApplication::style().buttonRect( 0, 0, width(), height() );
56 int l = r.x(); 55 int l = r.x();
57 int t = r.y(); 56 int t = r.y();
58 int w = r.width(); 57 int w = r.width();
59 int h = r.height(); 58 int h = r.height();
60 int b = 5; 59 int b = 5;
61 60
62 QColor lnCol = colorGroup().text(); 61 QColor lnCol = colorGroup().text();
63 QColor fillCol = isEnabled() ? col : backgroundColor(); 62 QColor fillCol = isEnabled() ? col : backgroundColor();
64 63
65 if ( isDown() ) { 64 if ( isDown() ) {
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 );
@@ -72,13 +71,13 @@ void KColorButton::drawButtonLabel( QPainter *painter )
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 }