From 25249be37f63c5b91c1c5f6e48956bc7bfcc5057 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 20 Sep 2018 17:44:31 +0200 Subject: [PATCH] Change orange to red --- src/settings/notificationssettingspage.cpp | 6 +++--- src/settings/notificationssettingspage.ui | 2 +- src/widgets/osdpretty.cpp | 2 +- src/widgets/osdpretty.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp index 17e13750d..3b7c8bdc5 100644 --- a/src/settings/notificationssettingspage.cpp +++ b/src/settings/notificationssettingspage.cpp @@ -65,7 +65,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog) 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(1, QColor(OSDPretty::kPresetOrange), Qt::DecorationRole); + ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetRed), Qt::DecorationRole); // Create and populate the helper menus QMenu *menu = new QMenu(this); @@ -186,7 +186,7 @@ void NotificationsSettingsPage::Load() { QRgb color = pretty_popup_->background_color(); if (color == OSDPretty::kPresetBlue) ui_->notifications_bg_preset->setCurrentIndex(0); - else if (color == OSDPretty::kPresetOrange) + else if (color == OSDPretty::kPresetRed) ui_->notifications_bg_preset->setCurrentIndex(1); else ui_->notifications_bg_preset->setCurrentIndex(2); @@ -246,7 +246,7 @@ void NotificationsSettingsPage::PrettyColorPresetChanged(int index) { break; case 1: - pretty_popup_->set_background_color(OSDPretty::kPresetOrange); + pretty_popup_->set_background_color(OSDPretty::kPresetRed); break; case 2: diff --git a/src/settings/notificationssettingspage.ui b/src/settings/notificationssettingspage.ui index 70a828e5b..8c6d5c213 100644 --- a/src/settings/notificationssettingspage.ui +++ b/src/settings/notificationssettingspage.ui @@ -307,7 +307,7 @@ - Strawberry Orange + Strawberry Red diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp index e0193c62e..ace9ff4c7 100644 --- a/src/widgets/osdpretty.cpp +++ b/src/widgets/osdpretty.cpp @@ -72,7 +72,7 @@ const int OSDPretty::kMaxIconSize = 100; const int OSDPretty::kSnapProximity = 20; 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) diff --git a/src/widgets/osdpretty.h b/src/widgets/osdpretty.h index 319dfc82b..27f850b29 100644 --- a/src/widgets/osdpretty.h +++ b/src/widgets/osdpretty.h @@ -67,7 +67,7 @@ class OSDPretty : public QWidget { static const int kSnapProximity; static const QRgb kPresetBlue; - static const QRgb kPresetOrange; + static const QRgb kPresetRed; static bool IsTransparencyAvailable();