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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-04-23 22:41:43
Message-ID: 1208990503.462438.5856.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 800337 by aseigo:

adapt to theme api changes


 M  +2 -2      battery/battery.cpp  
 M  +5 -4      pager/pager.cpp  
 M  +1 -1      systemtray/systemtraycontainer.cpp  
 M  +3 -3      tasks/abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/battery/battery.cpp #800336:800337
@@ -226,8 +226,8 @@
 
 void Battery::readColors()
 {
-    m_textColor = Plasma::Theme::defaultTheme()->textColor();
-    m_boxColor = Plasma::Theme::defaultTheme()->backgroundColor();
+    m_textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
+    m_boxColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor);
     m_boxColor.setAlpha(m_boxAlpha);
 }
 
--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #800336:800337
@@ -564,7 +564,8 @@
     painter->setFont(KGlobalSettings::taskbarFont());
 
     // Desktop background
-    QColor textColor = Plasma::Theme::defaultTheme()->textColor();
+    QColor defaultTextColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
+    QColor textColor = defaultTextColor;
     textColor.setAlpha(64);
     QBrush hoverBrush(textColor);
     QBrush defaultBrush(Qt::NoBrush);
@@ -580,7 +581,7 @@
     QPen windowPen(drawingColor);
 
     // Active window borders
-    QPen activeWindowPen(Plasma::Theme::defaultTheme()->textColor());
+    QPen activeWindowPen(defaultTextColor);
 
     // Active windows
     drawingColor.setAlpha(238);
@@ -625,13 +626,13 @@
 
     // Draw desktop frame and possibly text over it
     painter->setClipRect(option->exposedRect);
-    QPen activePen(Plasma::Theme::defaultTheme()->textColor());
+    QPen activePen(defaultTextColor);
     QPen drawingPen = QPen();
     painter->setBrush(Qt::NoBrush);
 
     for( int i = 0; i < m_desktopCount; i++) {
         if (i + 1 == m_currentDesktop || i == m_dragHighlightedDesktop) {
-            drawingPen = QPen(Plasma::Theme::defaultTheme()->textColor());
+            drawingPen = QPen(defaultTextColor);
         } else {
             drawingPen = QPen(plasmaColorTheme.foreground(KColorScheme::InactiveText).color());
         }
--- trunk/KDE/kdebase/workspace/plasma/applets/systemtray/systemtraycontainer.cpp #800336:800337
@@ -66,7 +66,7 @@
     // Qt's regular quasi-transparent background doesn't work so set it to the
     // theme's background color instead.
     QPalette p = palette();
-    p.setBrush(QPalette::Window, Plasma::Theme::defaultTheme()->backgroundColor());
+    p.setBrush(QPalette::Window, Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
     setPalette(p);
     setBackgroundRole(QPalette::Window);
 }
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #800336:800337
@@ -267,7 +267,7 @@
                                               KColorScheme::DarkShade);
             background.setAlphaF(0.2);
             painter->setBrush(QBrush(background));
-            painter->setPen(Plasma::Theme::defaultTheme()->backgroundColor());
+            painter->setPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
         }
     }
 
@@ -333,7 +333,7 @@
             background.setColorAt(1, endColor);
 
             painter->setBrush(background);
-            painter->setPen(Plasma::Theme::defaultTheme()->backgroundColor());
+            painter->setPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
         }
     }
 
@@ -490,7 +490,7 @@
     }
 #endif
 
-    painter->setPen(QPen(Plasma::Theme::defaultTheme()->textColor(), 1.0));
+    painter->setPen(QPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor), 1.0));
 
     QRect rect = textRect().toRect();
     rect.adjust(2, 2, -2, -2); // Create a text margin
[prev in list] [next in list] [prev in thread] [next in thread]