Show strawberry icon in OSD
This commit is contained in:
parent
55f610f3b2
commit
e33590bff9
|
@ -210,7 +210,7 @@ void OSD::VolumeChanged(int value) {
|
||||||
ShowMessage(app_name_, tr("Volume %1%").arg(value));
|
ShowMessage(app_name_, tr("Volume %1%").arg(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSD::ShowMessage(const QString &summary, const QString &message, const QString &icon, const QImage &image) {
|
void OSD::ShowMessage(const QString &summary, const QString &message, const QString icon, const QImage &image) {
|
||||||
|
|
||||||
if (pretty_popup_->toggle_mode()) {
|
if (pretty_popup_->toggle_mode()) {
|
||||||
pretty_popup_->ShowMessage(summary, message, image);
|
pretty_popup_->ShowMessage(summary, message, image);
|
||||||
|
@ -220,7 +220,8 @@ void OSD::ShowMessage(const QString &summary, const QString &message, const QStr
|
||||||
case Native:
|
case Native:
|
||||||
if (image.isNull()) {
|
if (image.isNull()) {
|
||||||
ShowMessageNative(summary, message, icon, QImage());
|
ShowMessageNative(summary, message, icon, QImage());
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
ShowMessageNative(summary, message, QString(), image);
|
ShowMessageNative(summary, message, QString(), image);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -243,6 +244,7 @@ void OSD::ShowMessage(const QString &summary, const QString &message, const QStr
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(HAVE_X11) && defined(HAVE_DBUS)
|
#if !defined(HAVE_X11) && defined(HAVE_DBUS)
|
||||||
|
|
|
@ -92,7 +92,7 @@ class OSD : public QObject {
|
||||||
void ShowPreview(const Behaviour type, const QString &line1, const QString &line2, const Song &song);
|
void ShowPreview(const Behaviour type, const QString &line1, const QString &line2, const Song &song);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ShowMessage(const QString &summary, const QString &message = QString(), const QString &icon = QString(), const QImage &image = QImage());
|
void ShowMessage(const QString &summary, const QString &message = QString(), const QString icon = QString("strawberry"), const QImage &image = QImage());
|
||||||
|
|
||||||
// These are implemented in the OS-specific files
|
// These are implemented in the OS-specific files
|
||||||
void Init();
|
void Init();
|
||||||
|
|
Loading…
Reference in New Issue