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

List:       kde-commits
Subject:    [Amarok] cee8f35: Do not use text colour from plasma theme for title
From:       "Rick W.Chen" <stuffcorpse () archlinux ! us>
Date:       2010-11-15 18:46:02
Message-ID: 20101115184602.04FC0A60A6 () git ! kde ! org
[Download RAW message or body]

commit cee8f35a587edcbace0d0b877f1311f438271333
branch master
Author: Rick W. Chen <stuffcorpse@archlinux.us>
Date:   Tue Nov 9 17:05:18 2010 +1300

    Do not use text colour from plasma theme for title labels

diff --git a/src/context/applets/albums/Albums.cpp \
b/src/context/applets/albums/Albums.cpp index 3e03fff..d962ca6 100644
--- a/src/context/applets/albums/Albums.cpp
+++ b/src/context/applets/albums/Albums.cpp
@@ -70,7 +70,6 @@ void Albums::init()
     m_headerText = new TextScrollingWidget( this );
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
-    m_headerText->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_headerText->setFont( labelFont );
     m_headerText->setText( i18n( "Recently added albums" ) );
     m_headerText->setDrawBackground( true );
diff --git a/src/context/applets/labels/LabelsApplet.cpp \
b/src/context/applets/labels/LabelsApplet.cpp index a153c9e..ae4955d 100644
--- a/src/context/applets/labels/LabelsApplet.cpp
+++ b/src/context/applets/labels/LabelsApplet.cpp
@@ -86,7 +86,6 @@ LabelsApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_titleLabel = new TextScrollingWidget( this );
-    m_titleLabel.data()->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_titleLabel.data()->setFont( labelFont );
     m_titleLabel.data()->setDrawBackground( true );
     m_titleText = i18n( "Labels" );
diff --git a/src/context/applets/photos/PhotosApplet.cpp \
b/src/context/applets/photos/PhotosApplet.cpp index b7ad1e1..e10bc0f 100644
--- a/src/context/applets/photos/PhotosApplet.cpp
+++ b/src/context/applets/photos/PhotosApplet.cpp
@@ -69,7 +69,6 @@ PhotosApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_headerText = new TextScrollingWidget( this );
-    m_headerText->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_headerText->setFont( labelFont );
     m_headerText->setText( i18n( "Photos" ) );
     m_headerText->setDrawBackground( true );
diff --git a/src/context/applets/similarartists/SimilarArtistsApplet.cpp \
b/src/context/applets/similarartists/SimilarArtistsApplet.cpp index fdd71ef..29602b9 \
                100644
--- a/src/context/applets/similarartists/SimilarArtistsApplet.cpp
+++ b/src/context/applets/similarartists/SimilarArtistsApplet.cpp
@@ -76,7 +76,6 @@ SimilarArtistsApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_headerLabel = new TextScrollingWidget( this );
-    m_headerLabel->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_headerLabel->setFont( labelFont );
     m_headerLabel->setText( i18n( "Similar Artists" ) );
     m_headerLabel->setDrawBackground( true );
diff --git a/src/context/applets/tabs/TabsApplet.cpp \
b/src/context/applets/tabs/TabsApplet.cpp index b0fb9e5..2cbb26c 100644
--- a/src/context/applets/tabs/TabsApplet.cpp
+++ b/src/context/applets/tabs/TabsApplet.cpp
@@ -98,7 +98,6 @@ TabsApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_titleLabel = new TextScrollingWidget( this );
-    m_titleLabel.data()->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_titleLabel.data()->setFont( labelFont );
     m_titleLabel.data()->setText( i18nc( "Guitar tablature", "Tabs" ) );
     m_titleLabel.data()->setDrawBackground( true );
diff --git a/src/context/applets/upcomingevents/UpcomingEventsApplet.cpp \
b/src/context/applets/upcomingevents/UpcomingEventsApplet.cpp index 9cc25c1..d339f8d \
                100644
--- a/src/context/applets/upcomingevents/UpcomingEventsApplet.cpp
+++ b/src/context/applets/upcomingevents/UpcomingEventsApplet.cpp
@@ -86,7 +86,6 @@ UpcomingEventsApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_headerLabel = new TextScrollingWidget( this );
-    m_headerLabel->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_headerLabel->setFont( labelFont );
     m_headerLabel->setText( i18n( "Upcoming Events" ) );
     m_headerLabel->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed \
                );
diff --git a/src/context/applets/upcomingevents/UpcomingEventsStackItem.cpp \
b/src/context/applets/upcomingevents/UpcomingEventsStackItem.cpp index \
                9cc42fd..d13eb8e 100644
--- a/src/context/applets/upcomingevents/UpcomingEventsStackItem.cpp
+++ b/src/context/applets/upcomingevents/UpcomingEventsStackItem.cpp
@@ -19,6 +19,7 @@
 #include "UpcomingEventsStackItem.h"
 #include "UpcomingEventsStack.h"
 #include "core/support/Debug.h"
+#include "context/widgets/TextScrollingWidget.h"
 
 #include <KIconLoader>
 #include <Plasma/FrameSvg>
@@ -123,7 +124,7 @@ public:
     QString title;
     QString iconName;
     QWeakPointer<QGraphicsWidget> widget;
-    Plasma::Label *titleLabel;
+    TextScrollingWidget *titleLabel;
     UpcomingEventsStack *stack;
     UpcomingEventsStackItemToolBox *toolbox;
 
@@ -293,8 +294,7 @@ UpcomingEventsStackItem::UpcomingEventsStackItem( const QString \
&name,  
     d->collapseButton = new Plasma::IconWidget( d->toolbox );
     d->collapseButton->setCursor( Qt::ArrowCursor );
-    d->titleLabel = new Plasma::Label( d->toolbox );
-    d->titleLabel->nativeWidget()->setWordWrap( false );
+    d->titleLabel = new TextScrollingWidget( d->toolbox );
     d->titleLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
 
     d->toolboxLayout->addItem( d->collapseButton );
diff --git a/src/context/applets/videoclip/VideoclipApplet.cpp \
b/src/context/applets/videoclip/VideoclipApplet.cpp index 3b84b17..afc284a 100644
--- a/src/context/applets/videoclip/VideoclipApplet.cpp
+++ b/src/context/applets/videoclip/VideoclipApplet.cpp
@@ -124,7 +124,6 @@ VideoclipApplet::init()
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
     m_headerText = new TextScrollingWidget( this );
-    m_headerText->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  m_headerText->setFont( labelFont );
     m_headerText->setText( i18n( "Video Clip" ) );
     m_headerText->setDrawBackground( true );
diff --git a/src/context/applets/wikipedia/WikipediaApplet.cpp \
b/src/context/applets/wikipedia/WikipediaApplet.cpp index 1277df5..ebc5674 100644
--- a/src/context/applets/wikipedia/WikipediaApplet.cpp
+++ b/src/context/applets/wikipedia/WikipediaApplet.cpp
@@ -511,7 +511,6 @@ WikipediaApplet::init()
 
     QFont labelFont;
     labelFont.setPointSize( labelFont.pointSize() + 2 );
-    d->wikipediaLabel->setBrush( Plasma::Theme::defaultTheme()->color( \
Plasma::Theme::TextColor ) );  d->wikipediaLabel->setFont( labelFont );
     d->wikipediaLabel->setScrollingText( i18n( "Wikipedia" ) );
     d->wikipediaLabel->setDrawBackground( true );


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