Skip to content

Mild Dark Mode with less contrast #3253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: dev
Choose a base branch
from
Draft

Mild Dark Mode with less contrast #3253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4aedc1
scaffolding for new mild dark theme
cprosser Dec 31, 2022
42fd29c
first pass at backgrounds
cprosser Dec 31, 2022
46a7a43
fix prefs saving
cprosser Dec 31, 2022
bfc91ad
mellow colors in text editor
cprosser Dec 31, 2022
c52c43e
improve log window
cprosser Dec 31, 2022
4fa4eac
tabs, buttons, and dividers
cprosser Jan 1, 2023
6260799
fix stale checkmark
cprosser Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion app/gui/qt/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,6 +2135,10 @@ void MainWindow::cycleThemes()
piSettings->themeStyle = SonicPiTheme::HighContrastMode;
}
else if (piSettings->themeStyle == SonicPiTheme::HighContrastMode)
{
piSettings->themeStyle = SonicPiTheme::MildDarkMode;
}
else if (piSettings->themeStyle == SonicPiTheme::MildDarkMode)
{
piSettings->themeStyle = SonicPiTheme::LightMode;
}
Expand All @@ -2160,6 +2164,10 @@ void MainWindow::colourThemeMenuChanged(int themeID)
{
piSettings->themeStyle = SonicPiTheme::HighContrastMode;
}
else if (themeID == 6)
{
piSettings->themeStyle = SonicPiTheme::MildDarkMode;
}
else
{
piSettings->themeStyle = SonicPiTheme::LightMode;
Expand Down Expand Up @@ -2231,6 +2239,8 @@ void MainWindow::updateColourTheme()
proDarkThemeAct->setChecked(false);
QSignalBlocker highContrastBlocker(highContrastThemeAct);
highContrastThemeAct->setChecked(false);
QSignalBlocker mildDarkBlocker(mildDarkThemeAct);
mildDarkThemeAct->setChecked(false);

if (piSettings->themeStyle == SonicPiTheme::LightMode)
{
Expand All @@ -2252,7 +2262,10 @@ void MainWindow::updateColourTheme()
{
highContrastThemeAct->setChecked(true);
}

else if (piSettings->themeStyle == SonicPiTheme::MildDarkMode)
{
mildDarkThemeAct->setChecked(true);
}
theme->switchStyle(piSettings->themeStyle);
statusBar()->showMessage(tr("Colour Theme: ") + theme->getName(), 2000);

Expand Down Expand Up @@ -2980,6 +2993,11 @@ void MainWindow::createToolBar()
highContrastThemeAct->setChecked(false);
connect(highContrastThemeAct, &QAction::triggered, [this]() { colourThemeMenuChanged(5); });

mildDarkThemeAct = new QAction(tr("Mild Dark"));
mildDarkThemeAct->setCheckable(true);
mildDarkThemeAct->setChecked(false);
connect(mildDarkThemeAct, &QAction::triggered, [this]() { colourThemeMenuChanged(6); });

showScopeLabelsAct = new QAction(tr("Show Scope Labels"));
showScopeLabelsAct->setCheckable(true);
showScopeLabelsAct->setChecked(false);
Expand All @@ -3001,6 +3019,7 @@ void MainWindow::createToolBar()
themeMenu->addAction(proLightThemeAct);
themeMenu->addAction(proDarkThemeAct);
themeMenu->addAction(highContrastThemeAct);
themeMenu->addAction(mildDarkThemeAct);
displayMenu->addSeparator();
displayMenu->addAction(scopeAct);
displayMenu->addAction(showScopeLabelsAct);
Expand Down
2 changes: 1 addition & 1 deletion app/gui/qt/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ class MainWindow : public QMainWindow
SonicPiTheme *theme;

QToolBar *toolBar;
QAction *exitAct, *runAct, *stopAct, *saveAsAct, *loadFileAct, *recAct, *textAlignAct, *textIncAct, *textDecAct, *scopeAct, *infoAct, *helpAct, *prefsAct, *focusEditorAct, *focusLogsAct, *focusContextAct, *focusCuesAct, *focusPreferencesAct, *focusHelpListingAct, *focusHelpDetailsAct, *focusErrorsAct, *focusBPMScrubberAct, *focusTimeWarpScrubberAct, *showLineNumbersAct, *showAutoCompletionAct, *showContextAct, *audioSafeAct, *audioTimingGuaranteesAct, *enableExternalSynthsAct, *mixerInvertStereoAct, *mixerForceMonoAct, *enableScsynthInputsAct, *midiEnabledAct, *enableOSCServerAct, *allowRemoteOSCAct, *showLogAct, *showCuesAct, *logAutoScrollAct, *logCuesAct, *logSynthsAct, *clearOutputOnRunAct, *autoIndentOnRunAct, *showButtonsAct, *showTabsAct, *fullScreenAct, *lightThemeAct, *darkThemeAct, *proLightThemeAct, *proDarkThemeAct, *highContrastThemeAct, *showScopeLabelsAct, *showTitlesAct, *hideMenuBarInFullscreenAct, *showMetroAct, *enableLinkAct, *linkTapTempoAct;
QAction *exitAct, *runAct, *stopAct, *saveAsAct, *loadFileAct, *recAct, *textAlignAct, *textIncAct, *textDecAct, *scopeAct, *infoAct, *helpAct, *prefsAct, *focusEditorAct, *focusLogsAct, *focusContextAct, *focusCuesAct, *focusPreferencesAct, *focusHelpListingAct, *focusHelpDetailsAct, *focusErrorsAct, *focusBPMScrubberAct, *focusTimeWarpScrubberAct, *showLineNumbersAct, *showAutoCompletionAct, *showContextAct, *audioSafeAct, *audioTimingGuaranteesAct, *enableExternalSynthsAct, *mixerInvertStereoAct, *mixerForceMonoAct, *enableScsynthInputsAct, *midiEnabledAct, *enableOSCServerAct, *allowRemoteOSCAct, *showLogAct, *showCuesAct, *logAutoScrollAct, *logCuesAct, *logSynthsAct, *clearOutputOnRunAct, *autoIndentOnRunAct, *showButtonsAct, *showTabsAct, *fullScreenAct, *lightThemeAct, *darkThemeAct, *proLightThemeAct, *proDarkThemeAct, *highContrastThemeAct, *mildDarkThemeAct, *showScopeLabelsAct, *showTitlesAct, *hideMenuBarInFullscreenAct, *showMetroAct, *enableLinkAct, *linkTapTempoAct;
QShortcut *runSc, *stopSc, *saveAsSc, *loadFileSc, *recSc, *textAlignSc, *textIncSc, *textDecSc, *scopeSc, *infoSc, *helpSc, *prefsSc, *focusEditorSc, *focusLogsSc, *focusContextSc, *focusCuesSc, *focusPreferencesSc, *focusHelpListingSc, *focusHelpDetailsSc, *focusErrorsSc, *focusBPMScrubberSc, *focusTimeWarpScrubberSc, *linkTapTempoSc, *enableLinkSc;
QActionGroup *langActionGroup;

Expand Down
226 changes: 224 additions & 2 deletions app/gui/qt/model/sonicpitheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ SonicPiTheme::SonicPiTheme(QObject *parent, QString customSettingsFilename, QStr

qt_app_theme_path = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/app.qss");

qt_browser_mild_dark_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/milddark/doc-styles.css");
qt_browser_dark_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/dark/doc-styles.css");
qt_browser_light_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/light/doc-styles.css");
qt_browser_hc_css = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/high_contrast/doc-styles.css");
Expand Down Expand Up @@ -63,8 +64,12 @@ void SonicPiTheme::switchStyle(Style style) {
this->name = themeStyleToName(style);
this->style = style;

if (style == SonicPiTheme::DarkMode){
darkMode();
if (style == SonicPiTheme::DarkMode || style == SonicPiTheme::MildDarkMode){
if (style == SonicPiTheme::DarkMode) {
darkMode();
} else {
mildDarkMode();
}
runIcon = &default_dark_run_icon;
stopIcon = &default_dark_stop_icon;
saveAsIcon = &default_dark_save_icon;
Expand Down Expand Up @@ -191,6 +196,12 @@ QString SonicPiTheme::getName() {
return this->name;
}

void SonicPiTheme::mildDarkMode()
{
this->theme = withCustomSettings(mildDarkTheme());
this->css = ScalePxInStyleSheet(readFile(qt_browser_mild_dark_css));
}

void SonicPiTheme::darkMode(){
this->theme = withCustomSettings(darkTheme());
this->css = ScalePxInStyleSheet(readFile(qt_browser_dark_css));
Expand Down Expand Up @@ -632,6 +643,213 @@ QMap<QString, QString> SonicPiTheme::darkTheme(){
}


QMap<QString, QString> SonicPiTheme::mildDarkTheme()
{
QMap<QString, QString> themeSettings;

// Dark Theme Colour Palette

QString dt_pink = "#ce9178";
QString dt_white = "white";
QString dt_lightgrey = "#d4d4d4";

QString dt_grey = "#5e5e5e"; // same as button background
QString dt_darkgrey = "#1e1e1e";
QString dt_ldarkgrey = "#2e2e2e";
QString dt_vldarkgrey = "#4d4d4d";
QString dt_vdarkgrey = "#0d0d0d";
QString dt_black = "#000";

QString dt_blue = "#9cdcfe";
QString dt_dark_blue = "#7db0cb";
QString dt_gold = "#FBDE2D";
QString dt_orange = "#f1d700";
QString dt_not_supported = "white";
QString dt_warning = "#f44747";
QString dt_green = "#6A9955";

themeSettings["Base"] = dt_darkgrey;
themeSettings["AlternateBase"] = dt_grey;
themeSettings["ToolTipBase"] = dt_grey;
themeSettings["ToolTipText"] = dt_white;
themeSettings["Button"] = dt_darkgrey;
themeSettings["ButtonBorder"] = dt_ldarkgrey;
themeSettings["PressedButton"] = dt_pink;
themeSettings["ButtonText"] = dt_lightgrey;
themeSettings["PressedButtonText"] = dt_vdarkgrey;
themeSettings["HoverButton"] = dt_dark_blue;
themeSettings["Shadow"] = dt_vdarkgrey;
themeSettings["Light"] = dt_lightgrey;
themeSettings["Midlight"] = dt_grey;
themeSettings["Mid"] = dt_darkgrey;
themeSettings["Dark"] = dt_vdarkgrey;
themeSettings["ScrollBar"] = dt_vldarkgrey;
themeSettings["ScrollBarBackground"] = dt_ldarkgrey;
themeSettings["ScrollBarBorder"] = dt_darkgrey;
themeSettings["ScrollBarHover"] = dt_dark_blue;
themeSettings["SliderBackground"] = dt_grey;
themeSettings["SliderBorder"] = dt_grey;
themeSettings["Slider"] = dt_pink;

themeSettings["Tab"] = dt_grey;
themeSettings["TabText"] = dt_lightgrey;
themeSettings["TabSelected"] = dt_darkgrey;
themeSettings["TabSelectedText"] = dt_lightgrey;

themeSettings["StatusBar"] = dt_darkgrey;
themeSettings["StatusBarText"] = dt_blue;

themeSettings["Menu"] = dt_darkgrey;
themeSettings["MenuText"] = dt_lightgrey;
themeSettings["MenuSelected"] = dt_pink;
themeSettings["MenuSelectedText"] = dt_white;
themeSettings["MenuBar"] = dt_darkgrey;

themeSettings["Foreground"] = dt_lightgrey;
themeSettings["Background"] = dt_darkgrey;

themeSettings["HighlightedForeground"] = dt_white;
themeSettings["HighlightedBackground"] = dt_pink;

themeSettings["WindowForeground"] = dt_lightgrey;
themeSettings["WindowBackground"] = dt_darkgrey;

themeSettings["PaneBackground"] = dt_darkgrey;
themeSettings["WindowInternalBorder"] = dt_vdarkgrey;
themeSettings["WindowBorder"] = dt_vldarkgrey;

themeSettings["ErrorBackground"] = dt_darkgrey;

themeSettings["DefaultForeground"] = dt_white;
themeSettings["DefaultBackground"] = dt_darkgrey;

themeSettings["CommentForeground"] = dt_grey;
themeSettings["CommentBackground"] = dt_darkgrey;

themeSettings["PODForeground"] = dt_white;
themeSettings["PODBackground"] = dt_warning;

themeSettings["NumberForeground"] = dt_dark_blue;
themeSettings["NumberBackground"] = dt_darkgrey;

themeSettings["FunctionMethodNameForeground"] = dt_pink;
themeSettings["FunctionMethodNameBackground"] = dt_darkgrey;

themeSettings["KeywordForeground"] = dt_gold;
themeSettings["KeywordBackground"] = dt_darkgrey;

themeSettings["DemotedKeywordForeground"] = dt_gold;
themeSettings["DemotedKeywordBackground"] = dt_darkgrey;

themeSettings["ClassNameForeground"] = dt_not_supported;
themeSettings["GlobalForeground"] = dt_not_supported;

themeSettings["SymbolForeground"] = dt_pink;
themeSettings["SymbolBackground"] = dt_darkgrey;

themeSettings["ModuleNameForeground"] = dt_not_supported;

themeSettings["InstanceVariableForeground"] = dt_not_supported;
themeSettings["InstanceVariableBackground"] = dt_darkgrey;

themeSettings["ClassVariableForeground"] = dt_not_supported;

themeSettings["BackticksForeground"] = dt_warning;
themeSettings["BackticksBackground"] = dt_gold;

themeSettings["PercentStringxForeground"] = dt_not_supported;
themeSettings["DataSectionForeground"] = dt_not_supported;
themeSettings["DataSectionBackground"] = dt_darkgrey;

themeSettings["DoubleQuotedStringForeground"] = dt_green;
themeSettings["DoubleQuotedStringBackground"] = dt_darkgrey;

themeSettings["SingleQuotedStringForeground"] = dt_green;
themeSettings["SingleQuotedStringBackground"] = dt_darkgrey;

themeSettings["HereDocumentForeground"] = dt_green;
themeSettings["HereDocumentBackground"] = dt_darkgrey;

themeSettings["PercentStringForeground"] = dt_green;
themeSettings["PercentStringQForeground"] = dt_green;

themeSettings["RegexForeground"] = dt_green;
themeSettings["RegexBackground"] = dt_darkgrey;

themeSettings["HereDocumentDelimiterForeground"] = dt_lightgrey;
themeSettings["HereDocumentDelimiterBackground"] = dt_darkgrey;

themeSettings["PercentStringrForeground"] = dt_green;
themeSettings["PercentStringrBackground"] = dt_darkgrey;

themeSettings["PercentStringwForeground"] = dt_lightgrey;
themeSettings["PercentStringwBackground"] = dt_darkgrey;

themeSettings["MarginForeground"] = dt_grey;
themeSettings["MarginBackground"] = dt_darkgrey;

themeSettings["MarkerBackground"] = dt_pink;

themeSettings["SelectionForeground"] = dt_lightgrey;
themeSettings["SelectionBackground"] = dt_pink;

themeSettings["MatchedBraceForeground"] = dt_pink;
themeSettings["MatchedBraceBackground"] = dt_lightgrey;

themeSettings["BraceForeground"] = dt_lightgrey;

themeSettings["CaretForeground"] = dt_pink;
themeSettings["CaretLineBackground"] = dt_vdarkgrey;

themeSettings["IndentationGuidesForeground"] = dt_blue;
themeSettings["FoldMarginForeground"] = dt_black;

themeSettings["StdinBackground"] = dt_darkgrey;
themeSettings["StdoutBackground"] = dt_darkgrey;
themeSettings["StderrBackground"] = dt_darkgrey;

themeSettings["Link"] = dt_pink;
themeSettings["LinkVisited"] = dt_pink;

themeSettings["Scope"] = dt_pink;
themeSettings["Scope_2"] = dt_blue;

themeSettings["LogForeground"] = dt_lightgrey;
themeSettings["LogBackground"] = dt_darkgrey;

themeSettings["LogInfoForeground"] = dt_lightgrey;
themeSettings["LogInfoBackground"] = dt_grey;

themeSettings["LogInfoForeground_1"] = dt_darkgrey;
themeSettings["LogInfoBackground_1"] = dt_pink;

themeSettings["LogForeground_1"] = dt_blue;
themeSettings["LogBackground_1"] = dt_darkgrey;

themeSettings["LogForeground_2"] = dt_lightgrey;
themeSettings["LogBackground_2"] = dt_orange;

themeSettings["LogForeground_3"] = "red";
themeSettings["LogBackground_3"] = dt_lightgrey;

themeSettings["LogForeground_4"] = dt_lightgrey;
themeSettings["LogBackground_4"] = dt_pink;

themeSettings["LogForeground_5"] = dt_lightgrey;
themeSettings["LogBackground_5"] = dt_blue;

themeSettings["LogForeground_6"] = dt_lightgrey;
themeSettings["LogBackground_6"] = dt_orange;

themeSettings["CuePathForeground"] = dt_white;
themeSettings["CuePathBackground"] = dt_pink;
themeSettings["CueDataForeground"] = dt_white;
themeSettings["CueDataBackground"] = "#808080";

return themeSettings;
}


QMap<QString, QString> SonicPiTheme::highContrastTheme(){
QMap<QString, QString> themeSettings;

Expand Down Expand Up @@ -1295,6 +1513,8 @@ QString SonicPiTheme::themeStyleToName(SonicPiTheme::Style style) {
return "Dark Pro";
} else if (style == HighContrastMode) {
return "High Contrast";
} else if (style == MildDarkMode) {
return "Mild Dark";
} else {
return "Light";
}
Expand All @@ -1311,6 +1531,8 @@ SonicPiTheme::Style SonicPiTheme::themeNameToStyle(QString name) {
return DarkProMode;
} else if (name == "High Contrast") {
return HighContrastMode;
} else if (name == "Mild Dark") {
return MildDarkMode;
} else {
return LightMode;
}
Expand Down
5 changes: 4 additions & 1 deletion app/gui/qt/model/sonicpitheme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ class SonicPiTheme : public QObject
{
Q_OBJECT
public:
enum Style { LightMode, DarkMode, LightProMode, DarkProMode, HighContrastMode };
enum Style { LightMode, DarkMode, LightProMode, DarkProMode, HighContrastMode, MildDarkMode };

explicit SonicPiTheme(QObject *parent = 0, QString customSettingsFilename="", QString rootPath = "");
~SonicPiTheme();
QColor color(QString);
QString font(QString);
void darkMode();
void mildDarkMode();
void lightMode();
void hcMode();
void updateCustomSettings();
Expand Down Expand Up @@ -68,13 +69,15 @@ Q_OBJECT
QString rootPath;
QString qt_app_theme_path;
QString qt_browser_dark_css;
QString qt_browser_mild_dark_css;
QString qt_browser_light_css;
QString qt_browser_hc_css;

QString css;

QMap<QString, QString> withCustomSettings(QMap<QString, QString> settings);
QMap<QString, QString> lightTheme();
QMap<QString, QString> mildDarkTheme();
QMap<QString, QString> darkTheme();
QMap<QString, QString> highContrastTheme();
QMap<QString, QString> theme;
Expand Down
Loading