bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- some changes in the theme selection, added that the default situation is where no theme is applied

Browse Source 
- some string changes
This commit is contained in:
Marius Stanciu
2022-04-18 22:22:47 +03:00
committed by Marius
parent 4226a1e84a
commit 00144bafa0
12 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appGUI/preferences/general/GeneralAPPSetGroupUI.py
View File

@@ -496,14 +496,14 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
theme = 'light'
theme = 'default'
if theme_settings.contains("dark_canvas"):
dark_canvas = theme_settings.value('dark_canvas', type=bool)
else:
dark_canvas = True
dark_canvas = False
if theme == 'light' and not dark_canvas:
if (theme == 'default' or theme == 'light') and not dark_canvas:
self.app.cursor_color_3D = 'black'
else:
self.app.cursor_color_3D = 'gray'

6
appGUI/preferences/general/GeneralAppSettingsGroupUI.py
View File

@@ -292,14 +292,14 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
if theme_settings.contains("theme"):
theme = theme_settings.value('theme', type=str)
else:
theme = 'light'
theme = 'default'
if theme_settings.contains("dark_canvas"):
dark_canvas = theme_settings.value('dark_canvas', type=bool)
else:
dark_canvas = True
dark_canvas = False
if theme == 'light' and not dark_canvas:
if (theme == 'default' or theme == 'light') and not dark_canvas:
self.app.cursor_color_3D = 'black'
else:
self.app.cursor_color_3D = 'gray'

13
appGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -42,21 +42,24 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
)
self.appearance_radio = RadioSet([
{"label": _("OS Dependent"), "value": "auto"},
{"label": _("Default"), "value": "default"},
{"label": _("Auto"), "value": "auto"},
{"label": _("Light"), "value": "light"},
{"label": _("Dark"), "value": "dark"}
], compact=True)
self.appearance_radio.setToolTip(
_("OS Dependent: Matches mode from OS\n"
_("The theme can be:\n"
"Default: Default theme\n"
"Auto: Matches mode from OS\n"
"Light: Light mode\n"
"Dark: Dark mode")
)
# Dark Canvas
self.dark_canvas_cb = FCCheckBox('%s' % _('Always use dark canvas'))
self.dark_canvas_cb = FCCheckBox('%s' % _('Dark Canvas'))
self.dark_canvas_cb.setToolTip(
_("Check this box to always use Dark canvas\n"
"even if Light theme is selected.")
_("Check this box to force the use of dark canvas\n"
"even if a dark theme is not selected.")
)
grid0.addWidget(self.appearance_label, 0, 0, 1, 2)