Default stylesheets revision + clean-up (#13772)

* Added the new QSS file with images

Added the new QSS file with images

* fixed some disabled colors to be the same everywhere.

* update

* big update fixed the scrollbars and lots more.

* small tweaks

* small fixes

* fixed groupbox in qsint

* Added light classic

This light theme is basicallyt exactly no-stylesheet.

* fixed the tabs

* fixed background reportview

* updated overlay stylesheets

* Added preference settings from Opentheme @obelisk79

* tabbar tweaks

* forgot the gradients on dark

* Overlay stylesheets clean-up +move icon to folder.

* removing old stylesheets

removing old stylesheets

* it was icons not icon, fixed it.

* updated cmake and package.xml

* to many spaces

* removing old theme's

* updated default overlay qss

* removed my settings files

* updated cfg files

* Bunch of fixes

I compiled it and didn't see any issues anymore. Could be some discussions about the new startpage thumbnails.

* fixed up double arrows and the correct logo!

* updated the work file for the icons

* Sets no-stylesheet overlay to a stylesheet.

* type in cmakelist

* type in filename

* oeps did set the dark theme

* Update OverlayManager.cpp

I removed a bit to much reverting this line

* fixed text color issue in Qsint on the light theme and dark background

* Update Light Theme + Dark Background.qss

Fine tuning the treeview it now works good for ligth theme and dark brackgrounds.

* removed prodark added back Behave dark overlay

@Syres916 I deleted the overlay qss behave dark by accident.
But you might want to check this PR out since it changes a lot.

I deleted Pro-dark since it was not updated and is outdated and it looks also a lot like the default dark.

* Update Light Theme + Light Background.qss

Fixes

* small fixes

small fixes

* remove ProDark

* Update CMakeLists.txt

* changed the thumbnails

Also removed teh dimensions in the filename since that got annoying real fast :)

* Updated other overlay stylesheets

* missing extension

* cleanup and some fixes to the overlay.

* Update Dark Theme + Light Background.qss

udpated the dark theme overaly with light background for all you maniacs who use this.

* Title bar fix for windows

This makes it so that it uses black title bar in windows if you have dark mode

* updated white background and some colors

* I think I fix merge issue now.

* Some cleanup on the thumbnails

* Create CMakePresets.json

* idk

* trying to fix conflicts

* removing old themes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Some fixes for Qsint sketcher toolbars icons

* fixed merge issue with maingui

* trying to fix merge conflicts

* and removing again.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
MisterMaker
2024-06-14 05:13:05 +02:00
committed by GitHub
parent 5594d23b5a
commit 7a80632a4e
220 changed files with 9327 additions and 17192 deletions

View File

@@ -76,9 +76,9 @@ SET(StartGuiIcon_SVG
)
SET(StartGuiThumbnail_PNG
Resources/thumbnails/Classic512.png
Resources/thumbnails/OpenDark512.png
Resources/thumbnails/OpenLight512.png
Resources/thumbnails/Theme_thumbnail_classic.png
Resources/thumbnails/Theme_thumbnail_dark.png
Resources/thumbnails/Theme_thumbnail_light.png
)
# TODO: Evaluate PCH use with Qt6/QtQuick/Qml

View File

@@ -2,8 +2,8 @@
<qresource prefix="/">
<file>icons/StartCommandIcon.svg</file>
<file>icons/PartDesignWorkbench.svg</file>
<file>thumbnails/Classic512.png</file>
<file>thumbnails/OpenLight512.png</file>
<file>thumbnails/OpenDark512.png</file>
<file>thumbnails/Theme_thumbnail_classic.png</file>
<file>thumbnails/Theme_thumbnail_light.png</file>
<file>thumbnails/Theme_thumbnail_dark.png</file>
</qresource>
</RCC>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 580 KiB

View File

@@ -56,12 +56,12 @@ void ThemeSelectorWidget::setupButtons(QBoxLayout* layout)
return;
}
std::map<Theme, QString> themeMap {{Theme::Classic, tr("Classic")},
{Theme::Light, tr("Light")},
{Theme::Dark, tr("Dark")}};
{Theme::Dark, tr("Dark theme")},
{Theme::Light, tr("Light theme")}};
std::map<Theme, QIcon> iconMap {
{Theme::Classic, QIcon(QLatin1String(":/thumbnails/Classic512.png"))},
{Theme::Light, QIcon(QLatin1String(":/thumbnails/OpenLight512.png"))},
{Theme::Dark, QIcon(QLatin1String(":/thumbnails/OpenDark512.png"))}};
{Theme::Classic, QIcon(QLatin1String(":/thumbnails/Theme_thumbnail_classic.png"))},
{Theme::Light, QIcon(QLatin1String(":/thumbnails/Theme_thumbnail_light.png"))},
{Theme::Dark, QIcon(QLatin1String(":/thumbnails/Theme_thumbnail_dark.png"))}};
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/MainWindow");
auto styleSheetName = QString::fromStdString(hGrp->GetASCII("StyleSheet"));
@@ -77,12 +77,12 @@ void ThemeSelectorWidget::setupButtons(QBoxLayout* layout)
button->setChecked(true);
}
else if (theme.first == Theme::Light
&& styleSheetName.contains(QLatin1String("light"),
&& styleSheetName.contains(QLatin1String("Light theme"),
Qt::CaseSensitivity::CaseInsensitive)) {
button->setChecked(true);
}
else if (theme.first == Theme::Dark
&& styleSheetName.contains(QLatin1String("dark"),
&& styleSheetName.contains(QLatin1String("Dark theme"),
Qt::CaseSensitivity::CaseInsensitive)) {
button->setChecked(true);
}
@@ -116,10 +116,10 @@ void ThemeSelectorWidget::themeChanged(Theme newTheme)
prefPackManager->apply("Classic");
break;
case Theme::Dark:
prefPackManager->apply("Dark");
prefPackManager->apply("Dark theme");
break;
case Theme::Light:
prefPackManager->apply("Light");
prefPackManager->apply("Light theme");
break;
}
}
@@ -136,7 +136,7 @@ void ThemeSelectorWidget::retranslateUi()
{
_titleLabel->setText(QLatin1String("<h2>") + tr("Theme") + QLatin1String("</h2>"));
_descriptionLabel->setText(tr("More themes are available online using the Addon Manager"));
_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::Light)]->setText(tr("Light", "Visual theme name"));
_buttons[static_cast<int>(Theme::Dark)]->setText(tr("Dark", "Visual theme name"));
}

View File

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