X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..b1c9b5126d:/src/statusbarmessagelabel.cpp diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 7cf5bb68a..bb7c59d6a 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -20,42 +20,42 @@ #include "statusbarmessagelabel.h" -#include +#include #include #include #include #include #include -#include +#include #include #include -#include #include StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) : - QWidget(parent), - m_type(DolphinStatusBar::Default), - m_state(Default), - m_illumination(0), - m_minTextHeight(-1), - m_timer(0), - m_closeButton(0) + QWidget(parent), + m_type(DolphinStatusBar::Default), + m_state(Default), + m_illumination(0), + m_minTextHeight(-1), + m_timer(0), + m_closeButton(0) { - setMinimumHeight(K3Icon::SizeSmall); + setMinimumHeight(KIconLoader::SizeSmall); m_timer = new QTimer(this); connect(m_timer, SIGNAL(timeout()), this, SLOT(timerDone())); - m_closeButton = new QPushButton(i18n("Close"), this); + m_closeButton = new QPushButton(i18nc("@action:button", "Close"), this); m_closeButton->hide(); connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeErrorMessage())); } StatusBarMessageLabel::~StatusBarMessageLabel() -{} +{ +} void StatusBarMessageLabel::setMessage(const QString& text, DolphinStatusBar::Type type) @@ -85,17 +85,17 @@ void StatusBarMessageLabel::setMessage(const QString& text, QPixmap pixmap; switch (type) { case DolphinStatusBar::OperationCompleted: - iconName = "ok"; + iconName = "dialog-ok"; + // "ok" icon should probably be "dialog-success", but we don't have that icon in KDE 4.0 m_closeButton->hide(); break; case DolphinStatusBar::Information: - iconName = "document-properties"; + iconName = "dialog-information"; m_closeButton->hide(); break; case DolphinStatusBar::Error: - iconName = "error"; m_timer->start(100); m_state = Illuminate; @@ -119,7 +119,9 @@ void StatusBarMessageLabel::setMinimumTextHeight(int min) if (min != m_minTextHeight) { m_minTextHeight = min; setMinimumHeight(min); - m_closeButton->setFixedHeight(min - borderGap() * 2); + if (m_closeButton->height() > min) { + m_closeButton->setFixedHeight(min); + } } } @@ -134,28 +136,29 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */) { QPainter painter(this); - // draw background - QColor backgroundColor(palette().brush(QPalette::Background).color()); - QColor foregroundColor(KGlobalSettings::textColor()); if (m_illumination > 0) { - backgroundColor = mixColors(backgroundColor, QColor(255, 255, 128), m_illumination); - foregroundColor = mixColors(foregroundColor, QColor(0, 0, 0), m_illumination); + // 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); + 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(backgroundColor); - painter.drawRect(QRect(0, 0, width(), height())); // draw pixmap - int x = borderGap(); - int y = (m_minTextHeight - m_pixmap.height()) / 2; + int x = BorderGap; + const int y = (m_minTextHeight - m_pixmap.height()) / 2; if (!m_pixmap.isNull()) { painter.drawPixmap(x, y, m_pixmap); - x += m_pixmap.width() + borderGap(); + x += m_pixmap.width() + BorderGap; } // draw text - painter.setPen(foregroundColor); + painter.setPen(palette().windowText().color()); int flags = Qt::AlignVCenter; if (height() > m_minTextHeight) { flags = flags | Qt::TextWordWrap; @@ -176,8 +179,12 @@ void StatusBarMessageLabel::timerDone() switch (m_state) { case Illuminate: { // increase the illumination - if (m_illumination < 100) { - m_illumination += 20; + const int illumination_max = 128; + if (m_illumination < illumination_max) { + m_illumination += 32; + if (m_illumination > illumination_max) { + m_illumination = illumination_max; + } update(); } else { m_state = Illuminated; @@ -216,15 +223,20 @@ void StatusBarMessageLabel::assureVisibleText() return; } - // calculate the required height of the widget thats - // needed for having a fully visible text - QFontMetrics fontMetrics(font()); - const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(), - Qt::AlignVCenter | Qt::TextWordWrap, - m_text)); - int requiredHeight = bounds.height(); - if (requiredHeight < m_minTextHeight) { - requiredHeight = m_minTextHeight; + int requiredHeight = m_minTextHeight; + if (m_type != DolphinStatusBar::Default) { + // Calculate the required height of the widget thats + // needed for having a fully visible text. Note that for the default + // statusbar type (e. g. hover information) increasing the text height + // is not wanted, as this might rearrange the layout of items. + + QFontMetrics fontMetrics(font()); + const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(), + Qt::AlignVCenter | Qt::TextWordWrap, m_text)); + requiredHeight = bounds.height(); + if (requiredHeight < m_minTextHeight) { + requiredHeight = m_minTextHeight; + } } // Increase/decrease the current height of the widget to the @@ -255,25 +267,14 @@ void StatusBarMessageLabel::assureVisibleText() int StatusBarMessageLabel::availableTextWidth() const { const int buttonWidth = (m_type == DolphinStatusBar::Error) ? - m_closeButton->width() + borderGap() : 0; - return width() - m_pixmap.width() - (borderGap() * 4) - buttonWidth; -} - -QColor StatusBarMessageLabel::mixColors(const QColor& c1, - const QColor& c2, - int percent) const -{ - const int recip = 100 - percent; - const int red = (c1.red() * recip + c2.red() * percent) / 100; - const int green = (c1.green() * recip + c2.green() * percent) / 100; - const int blue = (c1.blue() * recip + c2.blue() * percent) / 100; - return QColor(red, green, blue); + m_closeButton->width() + BorderGap : 0; + return width() - m_pixmap.width() - (BorderGap * 4) - buttonWidth; } void StatusBarMessageLabel::updateCloseButtonPosition() { - const int x = width() - m_closeButton->width() - borderGap(); - const int y = height() - m_closeButton->height() - borderGap(); + const int x = width() - m_closeButton->width() - BorderGap; + const int y = (height() - m_closeButton->height()) / 2; m_closeButton->move(x, y); }