diff --git a/src/shell/osd.cpp b/src/shell/osd.cpp index cefddb81f..7c90ee700 100644 --- a/src/shell/osd.cpp +++ b/src/shell/osd.cpp @@ -75,6 +75,11 @@ void Osd::volumeChanged(int percent) showProgress(icon, percent); } +void Osd::mediaPlayerVolumeChanged(int percent, const QString &playerName, const QString &playerIconName) +{ + showProgress(playerIconName, percent, playerName); +} + void Osd::kbdLayoutChanged(const QString &layoutName) { //FIXME: need a kbd icon @@ -87,9 +92,10 @@ void Osd::virtualDesktopChanged(const QString ¤tVirtualDesktopName) showText(QString(), currentVirtualDesktopName); } -void Osd::showProgress(const QString &icon, const int percent) +void Osd::showProgress(const QString &icon, const int percent, const QString &additionalText) { m_osdObject->rootObject()->setProperty("osdValue", percent); + m_osdObject->rootObject()->setProperty("osdAdditionalText", additionalText); m_osdObject->rootObject()->setProperty("showingProgress", true); m_osdObject->rootObject()->setProperty("icon", icon); diff --git a/src/shell/osd.h b/src/shell/osd.h index 68d52430f..134d9f57d 100644 --- a/src/shell/osd.h +++ b/src/shell/osd.h @@ -42,6 +42,7 @@ public: public Q_SLOTS: void brightnessChanged(int percent); void volumeChanged(int percent); + void mediaPlayerVolumeChanged(int percent, const QString &playerName, const QString &playerIconName); void kbdLayoutChanged(const QString &layoutName); void virtualDesktopChanged(const QString ¤tVirtualDesktopName); @@ -49,7 +50,7 @@ private Q_SLOTS: void hideOsd(); private: - void showProgress(const QString &icon, const int percent); + void showProgress(const QString &icon, const int percent, const QString &additionalText = QString()); void showText(const QString &icon, const QString &text); void showOsd();