Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Change orange to red

This commit is contained in:
Jonas Kvinge 2018-09-20 17:44:31 +02:00
parent 97ec12b5b3
commit 25249be37f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings/notificationssettingspage.cpp
View File

@ -65,7 +65,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(":/pictures/nocover.png")); pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(":/pictures/nocover.png"));
ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole); ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole);
ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetOrange), Qt::DecorationRole); ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetRed), Qt::DecorationRole);
// Create and populate the helper menus // Create and populate the helper menus
QMenu *menu = new QMenu(this); QMenu *menu = new QMenu(this);
@ -186,7 +186,7 @@ void NotificationsSettingsPage::Load() {
QRgb color = pretty_popup_->background_color(); QRgb color = pretty_popup_->background_color();
if (color == OSDPretty::kPresetBlue) if (color == OSDPretty::kPresetBlue)
ui_->notifications_bg_preset->setCurrentIndex(0); ui_->notifications_bg_preset->setCurrentIndex(0);
else if (color == OSDPretty::kPresetOrange) else if (color == OSDPretty::kPresetRed)
ui_->notifications_bg_preset->setCurrentIndex(1); ui_->notifications_bg_preset->setCurrentIndex(1);
else else
ui_->notifications_bg_preset->setCurrentIndex(2); ui_->notifications_bg_preset->setCurrentIndex(2);
@ -246,7 +246,7 @@ void NotificationsSettingsPage::PrettyColorPresetChanged(int index) {
break; break;
case 1: case 1:
pretty_popup_->set_background_color(OSDPretty::kPresetOrange); pretty_popup_->set_background_color(OSDPretty::kPresetRed);
break; break;
case 2: case 2:

2
src/settings/notificationssettingspage.ui
View File

@ -307,7 +307,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Strawberry Orange</string> <string>Strawberry Red</string>
</property> </property>
</item> </item>
<item> <item>

2
src/widgets/osdpretty.cpp
View File

@ -72,7 +72,7 @@ const int OSDPretty::kMaxIconSize = 100;
const int OSDPretty::kSnapProximity = 20; const int OSDPretty::kSnapProximity = 20;
const QRgb OSDPretty::kPresetBlue = qRgb(102, 150, 227); const QRgb OSDPretty::kPresetBlue = qRgb(102, 150, 227);
const QRgb OSDPretty::kPresetOrange = qRgb(254, 156, 67); const QRgb OSDPretty::kPresetRed = qRgb(202, 22, 16);
OSDPretty::OSDPretty(Mode mode, QWidget *parent) OSDPretty::OSDPretty(Mode mode, QWidget *parent)

2
src/widgets/osdpretty.h
View File

@ -67,7 +67,7 @@ class OSDPretty : public QWidget {
static const int kSnapProximity; static const int kSnapProximity;
static const QRgb kPresetBlue; static const QRgb kPresetBlue;
static const QRgb kPresetOrange; static const QRgb kPresetRed;
static bool IsTransparencyAvailable(); static bool IsTransparencyAvailable();