* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / statusbarmessagelabel.cpp

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index e24a59add4949a0cfc57e9cc34f12f6e5709507f..bb7c59d6a8cadc91855655c0a2d62794ce891261 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -43,10 +43,6 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
 {
     setMinimumHeight(KIconLoader::SizeSmall);
 
 {
     setMinimumHeight(KIconLoader::SizeSmall);
 

-    QPalette palette;
-    palette.setColor(QPalette::Background, Qt::transparent);
-    setPalette(palette);
-

     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(timerDone()));
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(timerDone()));


@@ -140,23 +136,21 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 {
     QPainter painter(this);
 
 {
     QPainter painter(this);
 

-    // draw background
-    QColor backgroundColor = palette().window().color();

     if (m_illumination > 0) {
         // at this point, a: we are a second label being drawn over the already
         // painted status area, so we can be translucent, and b: our palette's
         // window color (bg only) seems to be wrong (always black)
         KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
     if (m_illumination > 0) {
         // at this point, a: we are a second label being drawn over the already
         // painted status area, so we can be translucent, and b: our palette's
         // window color (bg only) seems to be wrong (always black)
         KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);

-        backgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
-        backgroundColor.setAlpha(qMin(255, m_illumination*2));
+        QColor backgroundColor = scheme.background(KColorScheme::NegativeBackground).color();
+        backgroundColor.setAlpha(qMin(255, m_illumination * 2));
+        painter.setBrush(backgroundColor);
+        painter.setPen(Qt::NoPen);
+        painter.drawRect(QRect(0, 0, width(), height()));

     }
     }

-    painter.setBrush(backgroundColor);
-    painter.setPen(Qt::NoPen);
-    painter.drawRect(QRect(0, 0, width(), height()));

 
     // draw pixmap
     int x = BorderGap;
 
     // draw pixmap
     int x = BorderGap;

-    int y = (m_minTextHeight - m_pixmap.height()) / 2;
+    const int y = (m_minTextHeight - m_pixmap.height()) / 2;

 
     if (!m_pixmap.isNull()) {
         painter.drawPixmap(x, y, m_pixmap);
 
     if (!m_pixmap.isNull()) {
         painter.drawPixmap(x, y, m_pixmap);