kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Stylesheet fixes (#14749)

Browse Source
This commit is contained in:
MisterMaker
2024-07-15 23:26:28 +02:00
committed by GitHub
parent 2364a48cb9
commit 20f4a4c5a3
204 changed files with 2843 additions and 1163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/Start/Gui/ThemeSelectorWidget.cpp
View File

@@ -55,9 +55,9 @@ void ThemeSelectorWidget::setupButtons(QBoxLayout* layout)
if (!layout) {
return;
}
std::map<Theme, QString> themeMap {{Theme::Classic, tr("Classic")},
{Theme::Dark, tr("Dark theme")},
{Theme::Light, tr("Light theme")}};
std::map<Theme, QString> themeMap {{Theme::Classic, tr("FreeCAD Classic")},
{Theme::Dark, tr("FreeCAD Dark")},
{Theme::Light, tr("FreeCAD Light")}};
std::map<Theme, QIcon> iconMap {
{Theme::Classic, QIcon(QLatin1String(":/thumbnails/Theme_thumbnail_classic.png"))},
{Theme::Light, QIcon(QLatin1String(":/thumbnails/Theme_thumbnail_light.png"))},
@@ -77,12 +77,12 @@ void ThemeSelectorWidget::setupButtons(QBoxLayout* layout)
button->setChecked(true);
}
else if (theme.first == Theme::Light
&& styleSheetName.contains(QLatin1String("Light theme"),
&& styleSheetName.contains(QLatin1String("FreeCAD Light"),
Qt::CaseSensitivity::CaseInsensitive)) {
button->setChecked(true);
}
else if (theme.first == Theme::Dark
&& styleSheetName.contains(QLatin1String("Dark theme"),
&& styleSheetName.contains(QLatin1String("FreeCAD Dark"),
Qt::CaseSensitivity::CaseInsensitive)) {
button->setChecked(true);
}
@@ -132,13 +132,13 @@ void ThemeSelectorWidget::themeChanged(Theme newTheme)
auto prefPackManager = Gui::Application::Instance->prefPackManager();
switch (newTheme) {
case Theme::Classic:
prefPackManager->apply("Classic");
prefPackManager->apply("FreeCAD Classic");
break;
case Theme::Dark:
prefPackManager->apply("Dark theme");
prefPackManager->apply("FreeCAD Dark");
break;
case Theme::Light:
prefPackManager->apply("Light theme");
prefPackManager->apply("FreeCAD Light");
break;
}
}
@@ -156,7 +156,7 @@ void ThemeSelectorWidget::retranslateUi()
_titleLabel->setText(QLatin1String("<h2>") + tr("Theme") + QLatin1String("</h2>"));
_descriptionLabel->setText(tr("Looking for more themes? You can obtain them using "
"<a href=\"freecad:Std_AddonMgr\">Addon Manager</a>."));
_buttons[static_cast<int>(Theme::Dark)]->setText(tr("Dark theme", "Visual theme name"));
_buttons[static_cast<int>(Theme::Light)]->setText(tr("Light theme", "Visual theme name"));
_buttons[static_cast<int>(Theme::Classic)]->setText(tr("Classic", "Visual theme name"));
_buttons[static_cast<int>(Theme::Dark)]->setText(tr("FreeCAD Dark", "Visual theme name"));
_buttons[static_cast<int>(Theme::Light)]->setText(tr("FreeCAD Light", "Visual theme name"));
_buttons[static_cast<int>(Theme::Classic)]->setText(tr("FreeCAD Classic", "Visual theme name"));
}

4
src/Mod/Start/Gui/ThemeSelectorWidget.h
View File

@@ -36,9 +36,9 @@ namespace StartGui
enum class Theme
{
Dark,
Classic,
Light,
Classic
Dark
};
/// A widget to allow selection of the UI theme (color scheme).