SVN commit 954015 by ruberg:

Fixed arrow labels not beeing displayed with most plasma themes



 M  +4 -5      ArrowBottomKey.cpp  
 M  +4 -5      ArrowLeftKey.cpp  
 M  +4 -4      ArrowRightKey.cpp  
 M  +4 -4      ArrowTopKey.cpp  
 M  +4 -4      BackspaceKey.cpp  
 M  +3 -2      CapsKey.cpp  
 M  +4 -4      EnterKey.cpp  
 M  +4 -3      ShiftKey.cpp  
 M  +4 -5      TabKey.cpp  


--- trunk/playground/base/plasma/applets/plasmaboard/ArrowBottomKey.cpp #954014:954015
@@ -27,12 +27,13 @@
 }
 
 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::TextColor));
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
@@ -51,6 +52,4 @@
 	     QPointF(center.x() - unitHeight / 2, center.y())
 	 };
 	painter->drawConvexPolygon(points, 3);
-
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowLeftKey.cpp #954014:954015
@@ -27,12 +27,13 @@
 }
 
 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::TextColor));
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
@@ -51,6 +52,4 @@
 	     QPointF(center.x(), center.y() - unitHeight / 2)
 	 };
 	painter->drawConvexPolygon(points, 3);
-
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowRightKey.cpp #954014:954015
@@ -27,12 +27,13 @@
 }
 
 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::TextColor));
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
@@ -52,5 +53,4 @@
 	 };
 	painter->drawConvexPolygon(points, 3);
 
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowTopKey.cpp #954014:954015
@@ -27,12 +27,13 @@
 }
 
 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::TextColor));
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
@@ -52,5 +53,4 @@
 	 };
 	painter->drawConvexPolygon(points, 3);
 
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/BackspaceKey.cpp #954014:954015
@@ -27,12 +27,13 @@
 }
 
 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::TextColor));
-	//pen.setWidth(2);
+	QPen pen = QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 	painter->setPen(pen);
-	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
@@ -49,5 +50,4 @@
 
 	painter->drawConvexPolygon(points, 3);
 
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/CapsKey.cpp #954014:954015
@@ -27,9 +27,11 @@
 }
 
 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::TextColor));
+	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));
@@ -53,5 +55,4 @@
 
 	painter->drawConvexPolygon(points, 7);
 
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/EnterKey.cpp #954014:954015
@@ -28,12 +28,14 @@
 }
 
 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::TextColor));
+	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));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
@@ -50,6 +52,4 @@
 	 };
 
 	painter->drawConvexPolygon(points, 3);
-
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/ShiftKey.cpp #954014:954015
@@ -27,12 +27,14 @@
 }
 
 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::TextColor));
+	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));
+	//painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor ));
 
 	QRectF rect = contentsRect();
 	int height = rect.height();
@@ -53,5 +55,4 @@
 
 	painter->drawConvexPolygon(points, 7);
 
-	Plasma::PushButton::paint(painter, option, widget);
 }
--- trunk/playground/base/plasma/applets/plasmaboard/TabKey.cpp #954014:954015
@@ -27,12 +27,14 @@
 }
 
 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::TextColor));
+	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));
+	painter->setBrush(Plasma::Theme::defaultTheme()->color(Plasma::Theme::ButtonTextColor));
 
 	QRectF rect = contentsRect();
 	int width = rect.width();
@@ -72,7 +74,4 @@
 				rect.bottom() - 2.5 * unitHeight);
 
 	painter->drawConvexPolygon(pointsTwo, 3);
-
-
-	Plasma::PushButton::paint(painter, option, widget);
 }