1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-20 23:51:18 +01:00

Theme does not depend on GUIPrefs...

...breaks cycle of 6, still Theme in a cycle with ImageManipulation
This commit is contained in:
Paul Licameli
2020-05-26 14:08:25 -04:00
parent fa4d35296e
commit 0eafcd112b
4 changed files with 41 additions and 38 deletions

View File

@@ -77,7 +77,6 @@ can't be.
#include "Prefs.h"
#include "ImageManipulation.h"
#include "Internat.h"
#include "prefs/GUIPrefs.h"
#include "widgets/AudacityMessageBox.h"
// JKC: First get the MAC specific images.
@@ -1299,4 +1298,39 @@ void auStaticText::OnPaint(wxPaintEvent & WXUNUSED(evt))
dc.DrawText( GetLabel(), 0,0);
}
constexpr int defaultTheme =
#ifdef EXPERIMENTAL_DA
2 // "dark"
#else
1 // "light"
#endif
;
ChoiceSetting GUITheme{
wxT("/GUI/Theme"),
{
ByColumns,
{
/* i18n-hint: describing the "classic" or traditional
appearance of older versions of Audacity */
XO("Classic") ,
/* i18n-hint: Light meaning opposite of dark */
XO("Light") ,
XO("Dark") ,
/* i18n-hint: greater difference between foreground and
background colors */
XO("High Contrast") ,
/* i18n-hint: user defined */
XO("Custom") ,
},
{
wxT("classic") ,
wxT("light") ,
wxT("dark") ,
wxT("high-contrast") ,
wxT("custom") ,
}
},
defaultTheme
};