From 0a775f15f84a1324e6e7e4dac98c8d2450bb6042 Mon Sep 17 00:00:00 2001 From: ColinDuquesnoy Date: Sat, 21 Oct 2017 16:47:39 +0200 Subject: [PATCH] Add ambiance theme for Ubuntu Close #138 --- lib/MellowPlayer/Application/Theme/Ambiance.json | 9 +++++++++ lib/MellowPlayer/Application/application.qrc | 1 + .../Presentation/ViewModels/ThemeViewModel.cpp | 1 + 3 files changed, 11 insertions(+) create mode 100644 lib/MellowPlayer/Application/Theme/Ambiance.json diff --git a/lib/MellowPlayer/Application/Theme/Ambiance.json b/lib/MellowPlayer/Application/Theme/Ambiance.json new file mode 100644 index 00000000..135f6dd6 --- /dev/null +++ b/lib/MellowPlayer/Application/Theme/Ambiance.json @@ -0,0 +1,9 @@ +{ + "accent": "#e95420", + "background": "#fcfcfc", + "foreground": "#31363b", + "primary": "#3c3b37", + "primaryForeground": "white", + "secondary": "#e7e5e4", + "secondaryForeground": "#41464b" +} diff --git a/lib/MellowPlayer/Application/application.qrc b/lib/MellowPlayer/Application/application.qrc index 9c8c7b57..8bdfaec1 100644 --- a/lib/MellowPlayer/Application/application.qrc +++ b/lib/MellowPlayer/Application/application.qrc @@ -10,5 +10,6 @@ Theme/Default.json Theme/Midna.json Theme/MidnaDark.json + Theme/Ambiance.json diff --git a/lib/MellowPlayer/Presentation/ViewModels/ThemeViewModel.cpp b/lib/MellowPlayer/Presentation/ViewModels/ThemeViewModel.cpp index 6c953a4c..8ed4111e 100644 --- a/lib/MellowPlayer/Presentation/ViewModels/ThemeViewModel.cpp +++ b/lib/MellowPlayer/Presentation/ViewModels/ThemeViewModel.cpp @@ -219,6 +219,7 @@ Theme ThemeViewModel::customTheme() const void ThemeViewModel::collectThemes() { availableThemes_["Adaptive"] = currentTheme_; + availableThemes_["Ambiance"] = loader_.load(":/MellowPlayer/Application/Theme/Ambiance.json"); availableThemes_["Breeze"] = loader_.load(":/MellowPlayer/Application/Theme/Breeze.json"); availableThemes_["BreezeDark"] = loader_.load(":/MellowPlayer/Application/Theme/BreezeDark.json"); availableThemes_["Midna"] = loader_.load(":/MellowPlayer/Application/Theme/Midna.json");