[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/applets/plasmaboard
From:       Björn Ruberg <bjoern () ruberg-wegener ! de>
Date:       2009-04-26 12:58:02
Message-ID: 1240750682.702183.25962.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 959496 by ruberg:

Removed double painting code



 M  +1 -5      ArrowBottomKey.cpp  
 M  +1 -5      ArrowLeftKey.cpp  
 M  +1 -5      ArrowRightKey.cpp  
 M  +3 -7      ArrowTopKey.cpp  
 M  +1 -5      BackspaceKey.cpp  
 M  +1 -6      CapsKey.cpp  
 M  +1 -6      EnterKey.cpp  
 M  +11 -0     FuncKey.cpp  
 M  +3 -0      FuncKey.h  
 M  +1 -6      ShiftKey.cpp  
 M  +1 -6      TabKey.cpp  
 M  +0 -1      widget.cpp  


--- trunk/playground/base/plasma/applets/plasmaboard/ArrowBottomKey.cpp \
#959495:959496 @@ -29,11 +29,7 @@
 void ArrowBottomKey::paint(QPainter *painter, const \
QStyleOptionGraphicsItem *option, QWidget *widget){  
 	Plasma::PushButton::paint(painter, option, widget);
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowLeftKey.cpp \
#959495:959496 @@ -29,11 +29,7 @@
 void ArrowLeftKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  
 	Plasma::PushButton::paint(painter, option, widget);
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowRightKey.cpp \
#959495:959496 @@ -29,11 +29,7 @@
 void ArrowRightKey::paint(QPainter *painter, const \
QStyleOptionGraphicsItem *option, QWidget *widget){  
 	Plasma::PushButton::paint(painter, option, widget);
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowTopKey.cpp \
#959495:959496 @@ -18,10 +18,10 @@
  ***************************************************************************/
  
 
-#include "ArrowTopKey.h"4
+#include "ArrowTopKey.h"
 #include <QPainter>
-#include <plasma/theme.h>
 
+
 ArrowTopKey::ArrowTopKey(PlasmaboardWidget *parent) : \
FuncKey::FuncKey(parent){  setKeycode(XK_Up, true);
 }
@@ -29,11 +29,7 @@
 void ArrowTopKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  
 	Plasma::PushButton::paint(painter, option, widget);
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/BackspaceKey.cpp \
#959495:959496 @@ -29,11 +29,7 @@
 void BackspaceKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  
 	Plasma::PushButton::paint(painter, option, widget);
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
--- trunk/playground/base/plasma/applets/plasmaboard/CapsKey.cpp \
#959495:959496 @@ -29,12 +29,7 @@
 void CapsKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  Plasma::PushButton::paint(painter, option, \
widget);  
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	//pen.setWidth(2);
-	painter->setPen(pen);
-	//painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/EnterKey.cpp \
#959495:959496 @@ -30,12 +30,7 @@
 void EnterKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  Plasma::PushButton::paint(painter, option, \
widget);  
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	//pen.setWidth(2);
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
--- trunk/playground/base/plasma/applets/plasmaboard/FuncKey.cpp \
#959495:959496 @@ -19,6 +19,9 @@
 
 
 //#include "FuncKey.h"
+
+#include <QPainter>
+#include <plasma/theme.h>
 #include <kpushbutton.h>
 #include "FuncKey.h"
 
@@ -72,3 +75,11 @@
 	toggleOff();
 }
 
+void FuncKey::setUpPainter(QPainter *painter){
+	painter->setRenderHint(QPainter::SmoothPixmapTransform);
+	painter->setRenderHint(QPainter::Antialiasing);
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	painter->setPen(pen);
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +}
+
--- trunk/playground/base/plasma/applets/plasmaboard/FuncKey.h \
#959495:959496 @@ -37,6 +37,9 @@
 	virtual void sendKeycodeRelease();
 	virtual void sendKeycodeToggled();
 
+protected:
+	void setUpPainter(QPainter *painter);
+
 private:
 	QString oldStyle;
 	bool pressed;
--- trunk/playground/base/plasma/applets/plasmaboard/ShiftKey.cpp \
#959495:959496 @@ -29,12 +29,7 @@
 void ShiftKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  Plasma::PushButton::paint(painter, option, \
widget);  
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor \
                ));
-	//pen.setWidth(2);
-	painter->setPen(pen);
-	//painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor \
)); +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
--- trunk/playground/base/plasma/applets/plasmaboard/TabKey.cpp \
#959495:959496 @@ -29,12 +29,7 @@
 void TabKey::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, QWidget *widget){  Plasma::PushButton::paint(painter, option, \
widget);  
-	painter->setRenderHint(QPainter::SmoothPixmapTransform);
-	painter->setRenderHint(QPainter::Antialiasing);
-	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
                
-	//pen.setWidth(2);
-	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 +	setUpPainter(painter);
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
--- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp \
#959495:959496 @@ -203,7 +203,6 @@
 	extKeys[INSKEY]->setText("Ins");
 
 	m_layout->addItem(extKeys[ARROWTOPKEY], 4, col, 1, 2, Qt::AlignLeft);
-
 	m_layout->addItem(extKeys[ARROWBOTTOMKEY], 5, col, 1, 2, Qt::AlignLeft);
 
 


[prev in list] [next in list] [prev in thread] [next in thread]