diff --git a/src/Gui/PreferencePacks/CMakeLists.txt b/src/Gui/PreferencePacks/CMakeLists.txt index 04c66d9343..e4685e9251 100644 --- a/src/Gui/PreferencePacks/CMakeLists.txt +++ b/src/Gui/PreferencePacks/CMakeLists.txt @@ -4,10 +4,10 @@ SET(PreferencePacks_Files ) SET(PreferencePacks_Directories -"Classic" +"FreeCAD Classic" "Dark behave" -"Light theme" -"Dark theme" +"FreeCAD Light" +"FreeCAD Dark" ) ADD_CUSTOM_TARGET(PreferencePacks_data ALL diff --git a/src/Gui/PreferencePacks/Classic/Classic.cfg b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg similarity index 97% rename from src/Gui/PreferencePacks/Classic/Classic.cfg rename to src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg index a1ed256bc8..0ffc0c8098 100644 --- a/src/Gui/PreferencePacks/Classic/Classic.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg @@ -5,6 +5,9 @@ + + + @@ -128,6 +131,7 @@ + Light Theme + Dark Background.qss diff --git a/src/Gui/PreferencePacks/Classic/post.FCMacro b/src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro similarity index 100% rename from src/Gui/PreferencePacks/Classic/post.FCMacro rename to src/Gui/PreferencePacks/FreeCAD Classic/post.FCMacro diff --git a/src/Gui/PreferencePacks/Dark theme/Dark theme.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg similarity index 95% rename from src/Gui/PreferencePacks/Dark theme/Dark theme.cfg rename to src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg index 7c3bddd51f..cdb06422a8 100644 --- a/src/Gui/PreferencePacks/Dark theme/Dark theme.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg @@ -84,16 +84,9 @@ - - - - - - - - + @@ -178,7 +171,7 @@ - Dark theme.qss + FreeCAD Dark.qss Dark Theme + Dark Background.qss diff --git a/src/Gui/PreferencePacks/Light theme/Light theme.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg similarity index 95% rename from src/Gui/PreferencePacks/Light theme/Light theme.cfg rename to src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg index d3c344ed15..6e354aca0b 100644 --- a/src/Gui/PreferencePacks/Light theme/Light theme.cfg +++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg @@ -5,14 +5,7 @@ - - - - - - - - StartWorkbench + @@ -208,7 +201,7 @@ - Light theme.qss + FreeCAD Light.qss Light Theme + Light Background.qss diff --git a/src/Gui/PreferencePacks/package.xml b/src/Gui/PreferencePacks/package.xml index 731dae64d9..2746d44981 100644 --- a/src/Gui/PreferencePacks/package.xml +++ b/src/Gui/PreferencePacks/package.xml @@ -3,13 +3,13 @@ Built-In Preference Packs Preference Packs included with the FreeCAD distribution 1.0.0 - MisterMaker + MisterMaker LGPL2 https://github.com/FreeCAD/FreeCAD - Classic + FreeCAD Classic Theme Removes stylesheets, and applies the classic purple/gray background. Resets all colors to default 1.0.0 @@ -19,22 +19,22 @@ classic theme - Light theme + FreeCAD Light Theme Applies a basic light theme. - 0.1.0 + 1.0.0 built-in background - light + light - Dark theme + FreeCAD Dark Theme Applies a basic dark theme. 1.0.0 built-in background - dark + dark diff --git a/src/Gui/Stylesheets/CMakeLists.txt b/src/Gui/Stylesheets/CMakeLists.txt index 5b6fc9e2b9..be3a336508 100644 --- a/src/Gui/Stylesheets/CMakeLists.txt +++ b/src/Gui/Stylesheets/CMakeLists.txt @@ -1,7 +1,7 @@ SET(Stylesheets_Files - "Dark theme.qss" - "Light theme.qss" + "FreeCAD Dark.qss" + "FreeCAD Light.qss" ) SET(Overlay_Stylesheets_Files diff --git a/src/Gui/Stylesheets/Dark theme.qss b/src/Gui/Stylesheets/FreeCAD Dark.qss similarity index 89% rename from src/Gui/Stylesheets/Dark theme.qss rename to src/Gui/Stylesheets/FreeCAD Dark.qss index 6fde3ee5db..c463797768 100644 --- a/src/Gui/Stylesheets/Dark theme.qss +++ b/src/Gui/Stylesheets/FreeCAD Dark.qss @@ -41,6 +41,8 @@ Resetting everything helps to unify styles across different operating systems border-style: none; border-image: none; outline: 0; + color: White; + selection-background-color: @ThemeAccentColor1; } /* specific reset for elements inside QToolBar */ @@ -117,16 +119,16 @@ Gui--NavigationIndicatorGui--BlenderNavigationStyle { } /* QWidget ---------------------------------------------------------------- - +This causes much load time. --------------------------------------------------------------------------- */ -QWidget { +/* QWidget { */ /* background-color: #444444; */ - border: 0px solid #020202; + /* border: 0px solid #020202; padding: 0px; - color: White; - selection-background-color: transparent; - selection-color: White; -} + color: White; */ + /* selection-background-color: @ThemeAccentColor1; */ + /* selection-color: White; */ +/* } */ QWidget:disabled { color: #adadad; @@ -195,8 +197,8 @@ QToolTip { /* If you remove the border property, background stops working on Windows */ border: none; font-weight:bolder; - border-top-width: 0.5px; - border-left-width: 0.5px; + border-top-width: 1px; + border-left-width: 1px; border-right-width: 1.5px; border-bottom-width: 1.5px; border-style: solid; @@ -252,7 +254,7 @@ QCheckBox { } QCheckBox:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QCheckBox QWidget:disabled { @@ -264,28 +266,31 @@ QCheckBox::indicator { background-color: #252525; width: 12px; height: 12px; - image:url(qss:images_classic/checkbox-Empty-white.png); + border: 1px solid #f0f0f0; + /* image:url(qss:images_classic/checkbox-Empty-white.png); */ } QCheckBox::indicator:unchecked { background-color: #252525; - image:url(qss:images_classic/checkbox-Empty-white.png); + border: 1px solid #f0f0f0; + /* image:url(qss:images_classic/checkbox-Empty-white.png); */ } QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed { background-color: @ThemeAccentColor1; - image:url(qss:images_classic/checkbox-Empty-white.png); + border: 1px solid #f0f0f0; + /* image:url(qss:images_classic/checkbox-Empty-white.png); */ } QCheckBox::indicator:unchecked:disabled { background-color: #444444; - image:url(qss:images_classic/checkbox-Empty-lightgray.png); + border: 1px solid #696969; + /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */ } QCheckBox::indicator:checked { - background-color: #252525; - /*border: 1px solid #020202; /* QRadioButton has the same color */ - image:url(qss:images_classic/checkbox-checked-white.png); + /* background-color: #252525; */ + image:url(qss:images_classic/check-checked-white.png); } QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed { @@ -294,18 +299,17 @@ QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed { QCheckBox::indicator:checked:disabled { background-color: #444444; - image: url(qss:images_classic/checkbox-checked-lightgray.png); + image: url(qss:images_classic/check-checked-lightgray.png); } QCheckBox::indicator:indeterminate { - background-color: #252525; - border: 1px solid #020202; - image: url(qss:images_classic/checkbox-indeterminate-white.png); + /* background-color: #252525; */ + image: url(qss:images_classic/Check-indeterminate-mark-white.png); } QCheckBox::indicator:indeterminate:disabled { background-color: #444444; - image: url(qss:images_classic/checkbox-indeterminate-white.png); + image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png); } QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed { @@ -338,6 +342,7 @@ QGroupBox::indicator { border-radius:1px; } + QGroupBox::indicator:unchecked { background-color: #020202; border: 1px solid #020202; @@ -382,7 +387,7 @@ QRadioButton { } QRadioButton:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QRadioButton:disabled { @@ -400,42 +405,41 @@ QRadioButton QWidget { } QRadioButton::indicator { - height: 13px; - width: 13px; - border-image:url(qss:images_classic/Radio-unchecked-white.png); + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-unchecked-white.png); } QRadioButton::indicator:unchecked { - /*image:url(qss:images_classic/Radio-checked-white.png);*/ } QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:pressed { - /* background-color: @ThemeAccentColor1; - border: 1px solid @ThemeAccentColor1; - border-radius: 6px; */ + } QRadioButton::indicator:unchecked:disabled { - /*image:url(qss:images_classic/Radio-checked-lightgray.png);*/ - border: 1px solid #444444; + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-unchecked-lightgray.png); } QRadioButton::indicator:checked { - height: 13px; - width: 13px; - border-image:url(qss:images_classic/Radio-checked-white.png); + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-checked-white.png); } QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed { - /* background-color: @ThemeAccentColor1; - border: 1px solid @ThemeAccentColor1; - border-radius: 6px; - image:url(qss:images_classic/Radio-checked-white.png); */ + } QRadioButton::indicator:checked:disabled { - outline: none; - background-color: #444444; + border-image: none; + width: 14px; + height: 14px; image:url(qss:images_classic/Radio-checked-lightgray.png); } @@ -453,7 +457,7 @@ QMenuBar { } QMenuBar:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QMenuBar::item { @@ -487,8 +491,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu --------------------------------------------------------------------------- */ QMenu { - border-bottom: 2px rgba(0,0,0,140); - border-right: 2px rgba(0,0,0,140); + border: 1px solid #3c3c3c; color: White; margin: 0px; background-color: #252525; @@ -677,8 +680,8 @@ QScrollBar:horizontal { height: 14px; border-right: 14px solid qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202); border-left: 14px solid qlineargradient(x1:1, y1:0, x2:0, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202); - border-top: 0.5px solid #020202; - border-bottom: 0.5px solid #020202; + border-top: 1px solid #020202; + border-bottom: 1px solid #020202; background-color: #202020; } @@ -687,8 +690,8 @@ QScrollBar:vertical { width: 14px; border-top: 14px solid qlineargradient(x1:0, y1:1, x2:0, y2:0, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202); border-bottom: 14px solid qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #020202, stop:0.1 #303030, stop:0.9 #353535, stop:1 #020202); - border-left: 0.5px solid #020202; - border-right: 0.5px solid #020202; + border-left: 1px solid #020202; + border-right: 1px solid #020202; background-color: #202020; } @@ -704,7 +707,7 @@ QScrollBar::handle:horizontal:hover { } QScrollBar::handle:horizontal:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QScrollBar::handle:vertical { @@ -723,7 +726,7 @@ QScrollBar::handle:vertical:hover { } QScrollBar::handle:vertical:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QScrollBar::add-line:horizontal { @@ -794,40 +797,6 @@ QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on { subcontrol-origin: margin; } -/* QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal { - background: none; - border: 1px solid #8800ff; -} */ - -/* QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { - background: none; - border: 1px solid #00ff6a; -} */ - -/* QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; - border: 1px solid #00ff95; */ - /* border: 1px solid #020202; */ -/* } */ - -/* QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; - border: 1px solid #0400ff;*/ - /* border: 1px solid #020202; */ -/*} */ - -/* QScrollBar::add-line { - border: 1px solid #ff0000; - background: none; -} - -QScrollBar::sub-line { - border: 1px solid #00ff44; - background: none; -} */ - - - /* QTextEdit -------------------------------------------------------------- https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets @@ -843,7 +812,7 @@ QTextEdit { } QTextEdit:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QTextEdit:selected { @@ -862,7 +831,7 @@ QPlainTextEdit { } QPlainTextEdit:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QPlainTextEdit:selected { @@ -903,15 +872,15 @@ QToolBar { QToolBar:horizontal { /* border-top: 1px solid #020202; */ - border-bottom: 0.5px solid #020202; + border-bottom: 1px solid #020202; /* spacing: 2px; */ padding-top: 3px; padding-left: 5px; } QToolBar:vertical { - border-left: 0.5px solid #020202; - border-right: 0.5px solid #020202; + border-left: 1px solid #020202; + border-right: 1px solid #020202; /* spacing: 1px; */ padding-top: 3px; padding-left: 2px; @@ -944,14 +913,15 @@ QToolBar::handle:vertical:hover { image: url(qss:images_classic/Vmovetoolbar-white.png); } - QToolBar::separator:horizontal { width: 2px; + padding: 0px 5px; image: url(qss:images_classic/Hsepartoolbar-Darkgray.png); } QToolBar::separator:vertical { height: 2px; + padding: 5px 0px; image: url(qss:images_classic/Vsepartoolbar-Darkgray.png); } @@ -983,6 +953,8 @@ QSpinBox { color: White; border-radius: 2px; min-height: 1.7em; + padding-left: 4px; + padding-right: 4px; } QAbstractSpinBox:up-button { @@ -991,11 +963,8 @@ QAbstractSpinBox:up-button { subcontrol-position: top right; border-top: 1px solid transparent; border-right: 1px solid transparent; + border-bottom: 0px solid transparent; border-top-right-radius: 2px; - border-bottom-left-radius: 2px; - margin-top: 1px; - margin-right: 1px; - } QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off { @@ -1016,13 +985,8 @@ QAbstractSpinBox:down-button { subcontrol-position: bottom right; border-bottom: 1px solid transparent; border-right: 1px solid transparent; - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; - margin-bottom: 1px; - margin-right: 1px; - /* margin: 1px; */ - /*width: 12px; - /*margin-top: -1px;*/ + border-top: 0px solid transparent; + border-bottom-right-radius: 2px; } QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off { @@ -1042,7 +1006,7 @@ QAbstractSpinBox:hover { } QAbstractSpinBox:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QAbstractSpinBox:selected { @@ -1062,7 +1026,15 @@ QLabel { border: 0px solid #020202; padding: 2px; margin: 0px; - color: White; + color: #ffffff; +} + +QLabel#FileCardStartPage { + background-color: transparent; + border: 0px solid #020202; + padding: 2px; + margin: 0px; + color: #ff0000; } QLabel:disabled { @@ -1213,6 +1185,11 @@ QPushButton:checked { outline: none; } +QPushButton:focus { + border: 1px solid @ThemeAccentColor1; +} + + QPushButton:checked:disabled { border: 1px solid @ThemeAccentColor1; color: #adadad; @@ -1311,25 +1288,25 @@ QToolButton:selected { color: White; } -QToolButton[popupMode="0"] { +/* QToolButton[popupMode="0"] { */ /* Only for DelayedPopup */ - padding-right: 20px; -} + /* padding-right: 20px; +} */ QToolButton[popupMode="1"] { /* Only for MenuButtonPopup */ padding-right: 20px; } -QToolButton[popupMode="0"]::menu-button { +/* QToolButton[popupMode="0"]::menu-button { border: none; -} +} */ -QToolButton[popupMode="0"]::menu-button:hover { +/* QToolButton[popupMode="0"]::menu-button:hover { border: none; border-left: 2px solid #202020; border-radius: 3px; -} +} */ QToolButton[popupMode="1"]::menu-button { border: none; } @@ -1342,7 +1319,7 @@ QToolButton[popupMode="1"]::menu-button:hover { QToolButton[popupMode="2"] { /* Only for InstantPopup */ - padding-right: 20px; + padding-right: 15px; } QToolBar > QToolButton#qt_toolbutton_menubutton { padding-right: 15px; /* Hack to add more width to buttons with menu */ @@ -1372,7 +1349,7 @@ QToolButton::menu-button:checked:hover { QToolButton::menu-indicator { /* Exclude a shift for better image */ - subcontrol-position: center center; + subcontrol-position: right center; /* Shift it a bit */ } @@ -1380,11 +1357,9 @@ QToolButton::menu-arrow { image: url(qss:images_classic/Arrow-down-lightgray.png); width: 1.3ex; height: 1.3ex; - subcontrol-position: center center; - background: transparent; + /* background: transparent; */ } QToolButton::menu-arrow:open { - subcontrol-position: center center; image: url(qss:images_classic/Arrow-Down-white.png); width: 1.3ex; height: 1.3ex; @@ -1614,19 +1589,27 @@ padding: 0px; } QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] { - background-image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.png); + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_Unfold_Blue-dark.png); } QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] { - background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-dark.png); + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-dark.png); } QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] { - background-image: url(qss:images_classic/Qsint_header_Fold_Blue-dark.png); + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_Fold_Blue-dark.png); } QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover { - background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-dark.png) ; + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_FoldOver_Blue-dark.png) ; } QSint--ActionGroup QFrame[class="content"] { @@ -1803,7 +1786,7 @@ QSlider::handle:horizontal:hover { QSlider::handle:horizontal:focus { background: @ThemeAccentColor2; - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QSlider::handle:vertical { @@ -1821,7 +1804,7 @@ QSlider::handle:vertical:hover { } QSlider::handle:vertical:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } /* QLineEdit -------------------------------------------------------------- @@ -1924,6 +1907,28 @@ QTabBar, QDockWidget QTabBar { /* left: 5px; move to the right by 5px - removed for fix */ } +QTabBar[style="icon-only"]::tab:top { + min-width: 16px; + padding-right: -1px; +} + +QTabBar[style="icon-only"]::tab:bottom { + min-width: 16px; + padding-right: -1px; +} + +QTabBar[style="icon-only"]::tab:left { + min-height: 16px; + padding: 0px; +} + +QTabBar[style="icon-only"]::tab:right { + min-height: 16px; + padding: 0px; +} + + + QTabBar::close-button, QDockWidget QTabBar::close-button { border: 0; margin: 3px; @@ -1945,62 +1950,12 @@ QTabBar::tab, QDockWidget QTabBar::tab { /* selected ------------------------------------------------------- */ padding: 4px; background-color: #333333; - } -/* -QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled { - color: #adadad; -} - -QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled { - color: #adadad; -} - -QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled { - color: #adadad; -} - -QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled { - color: #adadad; -} - -QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled { - color: #adadad; -} - -QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled { - color: #adadad; - -} - -QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled { - color: #adadad; - -} - -QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled { - color: #adadad; -} - -QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected { - color: #adadad; -} - -QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected { - color: #adadad; -} - -QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected { - color: #adadad; -} - -QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected { - color: #adadad; -} */ QTabBar::tab:top, QDockWidget QTabBar::tab:top { color: white; - padding-left: 9px; + margin-left: 0px; + margin-right: 0px; min-width: 5px; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:0.6 #252525, stop:1 #252525); margin-top: 3px; @@ -2087,7 +2042,7 @@ QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected { QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover { background-color: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #444444, stop:1 #333333); - + margin-right: 0px; } QTabBar::tab:right, QDockWidget QTabBar::tab:right { @@ -2179,7 +2134,7 @@ QDockWidget::close-button { icon-size: 10px; border: none; background: transparent; - background-image: transparent; + background-image: none; border: 0; margin: 0; padding: 0; @@ -2198,7 +2153,7 @@ QDockWidget::float-button { icon-size: 12px; border: none; background: transparent; - background-image: transparent; + background-image: none; border: 0; margin: 0; padding: 0; @@ -2226,18 +2181,15 @@ QTreeView::branch { } QTreeView::branch:has-siblings:!adjoins-item { - /* border-image: url(qss:images_classic/branch_vline_white.png) 0; */ - /* border-image: url(qss:images_classic/Arrow-right-white.png) 0; */ + } QTreeView::branch:has-siblings:adjoins-item { - /* border-image: url(qss:images_classic/Arrow-right-blue.png) 0; */ - /* border-image: url(qss:images_classic/branch_more_white.png) 0; */ + } QTreeView::branch:!has-children:!has-siblings:adjoins-item { - /* border-image: url(qss:images_classic/Arrow-right-lightgray.png) 0; */ - /* border-image: url(qss:images_classic/branch_end_white.png) 0; */ + } QTreeView::branch:closed:has-children:has-siblings { @@ -2245,7 +2197,6 @@ QTreeView::branch:closed:has-children:has-siblings { margin-bottom: 5px; border-image: none; image: url(qss:images_classic/Arrow-right-white.png) 0; - /* border-image: url(qss:images_classic/branch_more_closed_white.png) 0; */ } QTreeView::branch:has-children:!has-siblings:closed { @@ -2253,8 +2204,6 @@ QTreeView::branch:has-children:!has-siblings:closed { margin-bottom: 5px; border-image: none; image: url(qss:images_classic/Arrow-right-white.png) 0; - /* border-image: url(qss:images_classic/Arrow-right-whitey.png) 0; */ - /* border-image: url(qss:images_classic/branch_end_closed_white.png) 0; */ } QTreeView::branch:open:has-children:has-siblings { @@ -2262,7 +2211,6 @@ QTreeView::branch:open:has-children:has-siblings { margin-right: 6px; border-image: none; image: url(qss:images_classic/Arrow-down-white.png) 0; - /* border-image: url(qss:images_classic/branch_more_open_white.png) 0; */ } QTreeView::branch:open:has-children:!has-siblings { @@ -2270,14 +2218,35 @@ QTreeView::branch:open:has-children:!has-siblings { margin-right: 6px; border-image: none; image: url(qss:images_classic/Arrow-down-white.png) 0; - /* border-image: url(qss:images_classic/branch_end_open_white.png) 0; */ +} + +QTreeView::indicator, +QListView::indicator, +QTableView::indicator, +QColumnView::indicator { + border: 1px solid #ffffff; +} + +QTreeView::indicator:unchecked:disabled, +QListView::indicator:unchecked:disabled, +QTableView::indicator:unchecked:disabled, +QColumnView::indicator:unchecked:disabled { + border: 1px solid #696969; } QTreeView::indicator:checked, QListView::indicator:checked, QTableView::indicator:checked, QColumnView::indicator:checked { - image: url(qss:images_classic/checkbox-checked-white.png); + image: url(qss:images_classic/check-checked-white.png); +} + +QTreeView::indicator:checked:disabled , +QListView::indicator:checked:disabled , +QTableView::indicator:checked:disabled , +QColumnView::indicator:checked:disabled { + image: url(qss:images_classic/check-checked-lightgray.png); + border: 1px solid #696969; } QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed, @@ -2290,15 +2259,17 @@ QTableView::indicator:checked:pressed, QColumnView::indicator:checked:hover, QColumnView::indicator:checked:focus, QColumnView::indicator:checked:pressed { - image: url(qss:images_classic/checkbox-checked-blue.png); + /* image: url(qss:images_classic/checkbox-checked-blue.png); */ + background-color: @ThemeAccentColor1; + border: 1px solid #ffffff; } -QTreeView::indicator:unchecked, +/* QTreeView::indicator:unchecked, QListView::indicator:unchecked, QTableView::indicator:unchecked, QColumnView::indicator:unchecked { image: url(qss:images_classic/checkbox-Empty-white.png); -} +} */ QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed, QListView::indicator:unchecked:hover, @@ -2310,16 +2281,18 @@ QTableView::indicator:unchecked:pressed, QColumnView::indicator:unchecked:hover, QColumnView::indicator:unchecked:focus, QColumnView::indicator:unchecked:pressed { - image: url(qss:images_classic/checkbox-Empty-blue.png); + /* image: url(qss:images_classic/checkbox-Empty-blue.png); */ + background-color: @ThemeAccentColor1; + border: 1px solid #ffffff; } QTreeView::indicator:indeterminate, QListView::indicator:indeterminate, QTableView::indicator:indeterminate, QColumnView::indicator:indeterminate { - image: url(qss:images_classic/checkbox-indeterminate-white.png); + image: url(qss:images_classic/Check-indeterminate-mark-white.png); } - +/* :disabled */ QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed, QListView::indicator:indeterminate:hover, QListView::indicator:indeterminate:focus, @@ -2330,7 +2303,9 @@ QTableView::indicator:indeterminate:pressed, QColumnView::indicator:indeterminate:hover, QColumnView::indicator:indeterminate:focus, QColumnView::indicator:indeterminate:pressed { - image: url(qss:images_classic/checkbox-indeterminate-white.png); + image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png); + background-color: @ThemeAccentColor1; + border: 1px solid #ffffff; } QTreeView, @@ -2338,7 +2313,6 @@ QListView, QTableView, QColumnView { background-color: #252525; /* background of a lot of stuff including spreadsheets.*/ - /* border: 1px solid #ef0000; */ color: White; gridline-color: #020202; border-radius: 0px; @@ -2349,6 +2323,9 @@ QListView { background-color: #252525; /* background of a lot of stuff including spreadsheets.*/ } +QTreeView{ +selection-background-color: transparent; /* fix for selection color being visible in preferences */ +} QTreeView:disabled, QListView:disabled, @@ -2384,7 +2361,7 @@ QTreeView::item:selected:active, QListView::item:selected:active, QTableView::item:selected:active, QColumnView::item:selected:active { - background-color: #333333; + background-color: @ThemeAccentColor2; } QTreeView::item:selected:!active, @@ -2392,7 +2369,7 @@ QListView::item:selected:!active, QTableView::item:selected:!active, QColumnView::item:selected:!active { /* color: White; */ - background-color: #333333; + background-color: @ThemeAccentColor1; } QTreeView::item:!selected:hover, @@ -2462,7 +2439,7 @@ QHeaderView::section::vertical { padding-bottom: 0; padding-left: 1px; padding-right: 0px; */ - border-top: 0.5px solid #020202; + border-top: 1px solid #020202; } QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one { @@ -2736,65 +2713,32 @@ Gui--NotificationLabel { border: 1px solid #020202; border-radius: 2px; } - - -Gui--OverlayToolButton:!hover{ - background-color: transparent; - image: url(qss:overlay/close_light.svg); +/* overlay */ +Gui--OverlayToolButton{ + image: url(qss:images_classic/close-lightgray.png); } Gui--OverlayToolButton:hover { - image: url(qss:overlay/close_red.svg); + image: url(qss:images_classic/close-red.png); } -Gui--OverlayToolButton[objectName="OBTN Transparent"]:!checked { - image: url(qss:overlay/transparent_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/transparent_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Transparent"]:checked { - image: url(qss:overlay/transparent_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:!checked{ - image: url(qss:overlay/overlay_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/overlay_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:checked { - image: url(qss:overlay/overlay_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!checked { - image: url(qss:overlay/mode_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/mode_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:checked { - image: url(qss:overlay/mode_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Float"]:!checked { - image: url(qss:overlay/float_light.svg); +Gui--OverlayToolButton[objectName="OBTN Float"] { + image: url(qss:images_classic/float-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/float_lighter.svg); + image: url(qss:images_classic/float-white.png); } -Gui--OverlayToolButton[objectName="OBTN Float"]:checked { - image: url(qss:overlay/float_lighter.svg); +Gui--OverlayToolButton[objectName="OBTN Overlay"] { + image: url(qss:images_classic/overlay-lightgray.png); } +Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { + image: url(qss:images_classic/overlay-white.png); +} + + /*================================================================================================== Forming windows below are the border settings. See also https://forum.freecad.org/viewtopic.php?p=439797#p439797 ==================================================================================================*/ @@ -2856,15 +2800,20 @@ Start page QWidget#thumbnailWidget { background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525); border-radius: 8px; - margin-bottom: 3px; - margin-right: 7px; border: 1px solid #020202; } QWidget#thumbnailWidget[state="hovered"] { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QWidget#thumbnailWidget[state="pressed"] { border: 1px solid @ThemeAccentColor1; -} \ No newline at end of file +} + +/** + * Special handling for WB Tab Bar + */ + #WbTabBar #WbTabBarMore { + padding-right: 12px; + } diff --git a/src/Gui/Stylesheets/Light theme.qss b/src/Gui/Stylesheets/FreeCAD Light.qss similarity index 93% rename from src/Gui/Stylesheets/Light theme.qss rename to src/Gui/Stylesheets/FreeCAD Light.qss index 5f05eff8d0..3325324102 100644 --- a/src/Gui/Stylesheets/Light theme.qss +++ b/src/Gui/Stylesheets/FreeCAD Light.qss @@ -41,6 +41,8 @@ Resetting everything helps to unify styles across different operating systems border-style: none; border-image: none; outline: 0; + color: black; + selection-background-color: @ThemeAccentColor1; } /* specific reset for elements inside QToolBar */ @@ -117,16 +119,16 @@ Gui--NavigationIndicatorGui--BlenderNavigationStyle { } /* QWidget ---------------------------------------------------------------- - +This causes much load time. --------------------------------------------------------------------------- */ -QWidget { +/* QWidget { */ /* background-color: #d8d8d8; */ - border: 0px solid #ababab; - padding: 0px; + /* border: 0px solid #ababab; + padding: 0px; */ /* color: black; */ - selection-background-color: transparent; - selection-color: black; -} + /* selection-background-color: @ThemeAccentColor1; */ + /* selection-color: black; */ +/* } */ QWidget:disabled { color: #adadad; @@ -182,8 +184,8 @@ QToolTip { /* If you remove the border property, background stops working on Windows */ border: none; font-weight:bolder; - border-top-width: 0.5px; - border-left-width: 0.5px; + border-top-width: 1px; + border-left-width: 1px; border-right-width: 1.5px; border-bottom-width: 1.5px; border-style: solid; @@ -239,7 +241,7 @@ QCheckBox { } QCheckBox:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QCheckBox QWidget:disabled { @@ -251,12 +253,14 @@ QCheckBox::indicator { background-color: #f0f0f0; width: 12px; height: 12px; - image:url(qss:images_classic/checkbox-Empty-black.png); + border: 1px solid #1c1c1c; + /* image:url(qss:images_classic/checkbox-Empty-black.png); */ } QCheckBox::indicator:unchecked { background-color: #fdfdfd; - image:url(qss:images_classic/checkbox-Empty-black.png); + border: 1px solid #1c1c1c; + /* image:url(qss:images_classic/checkbox-Empty-black.png); */ } QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed { @@ -266,36 +270,42 @@ QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QChe QCheckBox::indicator:unchecked:disabled { background-color: #d8d8d8; - image:url(qss:images_classic/checkbox-Empty-lightgray.png); + border: 1px solid #646464; + /* image:url(qss:images_classic/checkbox-Empty-lightgray.png); */ } QCheckBox::indicator:checked { background-color: #f0f0f0; - image:url(qss:images_classic/checkbox-checked-black.png); + + image:url(qss:images_classic/check-checked-black.png); } QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed { background-color: @ThemeAccentColor1; + border: 1px solid #1c1c1c; } QCheckBox::indicator:checked:disabled { background-color: #d8d8d8; - image: url(qss:images_classic/checkbox-checked-lightgray.png); + border: 1px solid #ababab; + image: url(qss:images_classic/check-checked-lightgray.png); } QCheckBox::indicator:indeterminate { background-color: #f0f0f0; - border: 1px solid #ababab; - image: url(qss:images_classic/checkbox-indeterminate-black.png); + border: 1px solid #1c1c1c; + image: url(qss:images_classic/Check-indeterminate-mark-black.png); } QCheckBox::indicator:indeterminate:disabled { background-color: #d8d8d8; - image: url(qss:images_classic/checkbox-indeterminate-black.png); + border: 1px solid #ababab; + image: url(qss:images_classic/Check-indeterminate-mark-lightgray.png); } QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed { background-color: @ThemeAccentColor1; /* QRadioButton has the same color */ + border: 1px solid #1c1c1c; } /* QGroupBox -------------------------------------------------------------- @@ -368,7 +378,7 @@ QRadioButton { } QRadioButton:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QRadioButton:disabled { @@ -385,9 +395,10 @@ QRadioButton QWidget { } QRadioButton::indicator { - height: 13px; - width: 13px; - border-image:url(qss:images_classic/Radio-unchecked-black.png); + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-unchecked-black.png); } QRadioButton::indicator:unchecked { @@ -398,13 +409,17 @@ QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:press } QRadioButton::indicator:unchecked:disabled { - border: 1px solid #d8d8d8; + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-unchecked-lightgray.png); } QRadioButton::indicator:checked { - height: 13px; - width: 13px; - border-image:url(qss:images_classic/Radio-checked-black.png); + border-image: none; + width: 14px; + height: 14px; + image:url(qss:images_classic/Radio-checked-black.png); } QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed { @@ -412,8 +427,9 @@ QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed { } QRadioButton::indicator:checked:disabled { - outline: none; - background-color: #d8d8d8; + border-image: none; + width: 14px; + height: 14px; image:url(qss:images_classic/Radio-checked-lightgray.png); } @@ -429,7 +445,7 @@ QMenuBar { } QMenuBar:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QMenuBar::item { @@ -454,8 +470,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu --------------------------------------------------------------------------- */ QMenu { - border-bottom: 2px rgba(0,0,0,140); - border-right: 2px rgba(0,0,0,140); + border: 1px solid #ababab; color: black; margin: 0px; background-color: #f0f0f0; @@ -644,8 +659,8 @@ QScrollBar:horizontal { height: 14px; border-right: 14px solid qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab); border-left: 14px solid qlineargradient(x1:1, y1:0, x2:0, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab); - border-top: 0.5px solid #ababab; - border-bottom: 0.5px solid #ababab; + border-top: 1px solid #ababab; + border-bottom: 1px solid #ababab; background-color: #e6e6e6; } @@ -654,8 +669,8 @@ QScrollBar:vertical { width: 14px; border-top: 14px solid qlineargradient(x1:0, y1:1, x2:0, y2:0, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab); border-bottom: 14px solid qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ababab, stop:0.1 #f9f9f9, stop:0.9 #fafafa, stop:1 #ababab); - border-left: 0.5px solid #ababab; - border-right: 0.5px solid #ababab; + border-left: 1px solid #ababab; + border-right: 1px solid #ababab; background-color: #e6e6e6; } @@ -671,7 +686,7 @@ QScrollBar::handle:horizontal:hover { } QScrollBar::handle:horizontal:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QScrollBar::handle:vertical { @@ -690,7 +705,7 @@ QScrollBar::handle:vertical:hover { } QScrollBar::handle:vertical:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QScrollBar::add-line:horizontal { @@ -776,7 +791,7 @@ QTextEdit { } QTextEdit:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QTextEdit:selected { @@ -795,7 +810,7 @@ QPlainTextEdit { } QPlainTextEdit:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QPlainTextEdit:selected { @@ -835,14 +850,14 @@ QToolBar { } QToolBar:horizontal { - border-bottom: 0.5px solid #ababab; + border-bottom: 1px solid #ababab; padding-top: 3px; padding-left: 5px; } QToolBar:vertical { - border-left: 0.5px solid #ababab; - border-right: 0.5px solid #ababab; + border-left: 1px solid #ababab; + border-right: 1px solid #ababab; padding-top: 3px; padding-left: 2px; } @@ -874,11 +889,13 @@ QToolBar::handle:vertical:hover { QToolBar::separator:horizontal { width: 2px; + padding: 0px 5px; image: url(qss:images_classic/Hsepartoolbar-lightgray.png); } QToolBar::separator:vertical { height: 2px; + padding: 5px 0px; image: url(qss:images_classic/Vsepartoolbar-lightgray.png); } @@ -910,6 +927,8 @@ QSpinBox { color: black; border-radius: 2px; min-height: 1.7em; + padding-left: 4px; + padding-right: 4px; } QAbstractSpinBox:up-button { @@ -918,10 +937,8 @@ QAbstractSpinBox:up-button { subcontrol-position: top right; border-top: 1px solid transparent; border-right: 1px solid transparent; + border-bottom: 0px solid transparent; border-top-right-radius: 2px; - border-bottom-left-radius: 2px; - margin-top: 1px; - margin-right: 1px; border-left: 1px solid #b0b0b0; } @@ -943,14 +960,9 @@ QAbstractSpinBox:down-button { subcontrol-position: bottom right; border-bottom: 1px solid transparent; border-right: 1px solid transparent; - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; - margin-bottom: 1px; - margin-right: 1px; + border-top: 0px solid transparent; + border-bottom-right-radius: 2px; border-left: 1px solid #b0b0b0; - /* margin: 1px; */ - /*width: 12px; - /*margin-top: -1px;*/ } QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off { @@ -969,7 +981,7 @@ QAbstractSpinBox:hover { } QAbstractSpinBox:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QAbstractSpinBox:selected { @@ -1242,25 +1254,25 @@ QToolButton:selected { color: black; } -QToolButton[popupMode="0"] { +/* QToolButton[popupMode="0"] { */ /* Only for DelayedPopup */ - padding-right: 20px; -} + /* padding-right: 20px; +} */ QToolButton[popupMode="1"] { /* Only for MenuButtonPopup */ padding-right: 20px; } -QToolButton[popupMode="0"]::menu-button { +/* QToolButton[popupMode="0"]::menu-button { border: none; -} +} */ -QToolButton[popupMode="0"]::menu-button:hover { +/* QToolButton[popupMode="0"]::menu-button:hover { border: none; border-left: 2px solid #e6e6e6; border-radius: 3px; -} +} */ QToolButton[popupMode="1"]::menu-button { border: none; } @@ -1303,7 +1315,7 @@ QToolButton::menu-button:checked:hover { QToolButton::menu-indicator { /* Exclude a shift for better image */ - subcontrol-position: center center; + subcontrol-position: right center; /* Shift it a bit */ } @@ -1311,11 +1323,9 @@ QToolButton::menu-arrow { image: url(qss:images_classic/Arrow-down-lightgray.png); width: 1.3ex; height: 1.3ex; - subcontrol-position: center center; - background: transparent; + /* background: transparent; */ } QToolButton::menu-arrow:open { - subcontrol-position: center center; image: url(qss:images_classic/Arrow-Down-black.png); width: 1.3ex; height: 1.3ex; @@ -1548,20 +1558,28 @@ margin: 0px; padding: 0px; } -QSint--ActionGroup QFrame[class="header"] QLabel[fold="false"] { - background-image: url(qss:images_classic/Qsint_header_Unfold_Blue-light.png); +QSint--ActionGroup QFrame[class="header"] QLabel{ + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_Unfold_Blue-light.png); } QSint--ActionGroup QFrame[class="header"] QLabel:hover[fold="false"] { - background-image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue-light.png); + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_UnfoldOver_Blue_light.png); } QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"] { - background-image: url(qss:images_classic/Qsint_header_Fold_Blue-light.png); + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_Fold_Blue-light.png); } QSint--ActionGroup QFrame[class="header"] QLabel[fold="true"]:hover { - background-image: url(qss:images_classic/Qsint_header_FoldOver_Blue-light.png) ; + width: 30px; + height: 30px; + image: url(qss:images_classic/Qsint_header_FoldOver_Blue-light.png) ; } QSint--ActionGroup QFrame[class="content"] { @@ -1738,7 +1756,7 @@ QSlider::handle:horizontal:hover { QSlider::handle:horizontal:focus { background: @ThemeAccentColor2; - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QSlider::handle:vertical { @@ -1756,7 +1774,7 @@ QSlider::handle:vertical:hover { } QSlider::handle:vertical:focus { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } /* QLineEdit -------------------------------------------------------------- @@ -1858,6 +1876,25 @@ QTabBar, QDockWidget QTabBar { background-color: #f0f0f0; /* left: 5px; move to the right by 5px - removed for fix */ } +QTabBar[style="icon-only"]::tab:top { + min-width: 16px; + padding-right: -1px; +} + +QTabBar[style="icon-only"]::tab:bottom { + min-width: 16px; + padding-right: -1px; +} + +QTabBar[style="icon-only"]::tab:left { + min-height: 16px; + padding: 0px; +} + +QTabBar[style="icon-only"]::tab:right { + min-height: 16px; + padding: 0px; +} QTabBar::close-button, QDockWidget QTabBar::close-button { border: 0; @@ -2116,7 +2153,7 @@ QDockWidget::close-button { icon-size: 10px; border: none; background: transparent; - background-image: transparent; + background-image: none; border: 0; margin: 0; padding: 0; @@ -2135,7 +2172,7 @@ QDockWidget::float-button { icon-size: 12px; border: none; background: transparent; - background-image: transparent; + background-image: none; border: 0; margin: 0; padding: 0; @@ -2210,11 +2247,33 @@ QTreeView::branch:open:has-children:!has-siblings { /* border-image: url(qss:images_classic/branch_end_open_white.png) 0; */ } +QTreeView::indicator, +QListView::indicator, +QTableView::indicator, +QColumnView::indicator { + border: 1px solid #1c1c1c; +} + +QTreeView::indicator:unchecked:disabled, +QListView::indicator:unchecked:disabled, +QTableView::indicator:unchecked:disabled, +QColumnView::indicator:unchecked:disabled { + border: 1px solid #696969; +} + QTreeView::indicator:checked, QListView::indicator:checked, QTableView::indicator:checked, QColumnView::indicator:checked { - image: url(qss:images_classic/checkbox-checked-black.png); + image: url(qss:images_classic/check-checked-black.png); +} + +QTreeView::indicator:checked:disabled , +QListView::indicator:checked:disabled , +QTableView::indicator:checked:disabled , +QColumnView::indicator:checked:disabled { + image: url(qss:images_classic/check-checked-lightgray.png); + border: 1px solid #696969; } QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed, @@ -2227,15 +2286,17 @@ QTableView::indicator:checked:pressed, QColumnView::indicator:checked:hover, QColumnView::indicator:checked:focus, QColumnView::indicator:checked:pressed { - image: url(qss:images_classic/checkbox-checked-blue.png); + /* image: url(qss:images_classic/checkbox-checked-blue.png); */ + background-color: @ThemeAccentColor1; + border: 1px solid #1c1c1c; } -QTreeView::indicator:unchecked, +/* QTreeView::indicator:unchecked, QListView::indicator:unchecked, QTableView::indicator:unchecked, QColumnView::indicator:unchecked { image: url(qss:images_classic/checkbox-Empty-black.png); -} +} */ QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed, QListView::indicator:unchecked:hover, @@ -2247,14 +2308,16 @@ QTableView::indicator:unchecked:pressed, QColumnView::indicator:unchecked:hover, QColumnView::indicator:unchecked:focus, QColumnView::indicator:unchecked:pressed { - image: url(qss:images_classic/checkbox-Empty-blue.png); + /* image: url(qss:images_classic/checkbox-Empty-blue.png); */ + background-color: @ThemeAccentColor1; + border: 1px solid #1c1c1c; } QTreeView::indicator:indeterminate, QListView::indicator:indeterminate, QTableView::indicator:indeterminate, QColumnView::indicator:indeterminate { - image: url(qss:images_classic/checkbox-indeterminate-black.png); + image: url(qss:images_classic/Check-indeterminate-mark-black.png); } QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed, @@ -2267,7 +2330,9 @@ QTableView::indicator:indeterminate:pressed, QColumnView::indicator:indeterminate:hover, QColumnView::indicator:indeterminate:focus, QColumnView::indicator:indeterminate:pressed { - image: url(qss:images_classic/checkbox-indeterminate-black.png); + image: url(qss:images_classic/Check-indeterminate-mark-black.png); + background-color: @ThemeAccentColor1; + border: 1px solid #1c1c1c; } QTreeView, @@ -2286,6 +2351,10 @@ QListView { background-color: #ffffff; /* background of a lot of stuff including spreadsheets.*/ } +QTreeView{ + selection-background-color: transparent; /* fix for selection color being visible in preferences */ +} + QTreeView:disabled, QListView:disabled, @@ -2321,7 +2390,7 @@ QTreeView::item:selected:active, QListView::item:selected:active, QTableView::item:selected:active, QColumnView::item:selected:active { - background-color: #f0f0f0; + background-color: @ThemeAccentColor2; } QTreeView::item:selected:!active, @@ -2329,7 +2398,8 @@ QListView::item:selected:!active, QTableView::item:selected:!active, QColumnView::item:selected:!active { /* color: black; */ - background-color: #f0f0f0; + + background-color: @ThemeAccentColor1; } QTreeView::item:!selected:hover, @@ -2399,7 +2469,7 @@ QHeaderView::section::vertical { padding-bottom: 0; padding-left: 1px; padding-right: 0px; */ - border-top: 0.5px solid #ababab; + border-top: 1px solid #ababab; } QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one { @@ -2630,6 +2700,7 @@ QAbstractView:selected { PlotWidget { /* Fix cut labels in plots #134 */ padding: 0px; + color: rgba(253, 253, 253, 0.614); } /*================================================================================================== @@ -2673,62 +2744,27 @@ Gui--NotificationLabel { border-radius: 2px; } - -Gui--OverlayToolButton:!hover{ - background-color: transparent; - image: url(qss:overlay/close_lightgray.svg); +Gui--OverlayToolButton{ + image: url(qss:images_classic/close-lightgray.png); } Gui--OverlayToolButton:hover { - image: url(qss:overlay/close_red.svg); + image: url(qss:images_classic/close-red.png); } - -Gui--OverlayToolButton[objectName="OBTN Transparent"]:!checked { - image: url(qss:overlay/transparent_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/transparent_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Transparent"]:checked { - image: url(qss:overlay/transparent_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:!checked{ - image: url(qss:overlay/overlay_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/overlay_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Overlay"]:checked { - image: url(qss:overlay/overlay_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!checked { - image: url(qss:overlay/mode_light.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/mode_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN AutoMode"]:checked { - image: url(qss:overlay/mode_lighter.svg); -} - -Gui--OverlayToolButton[objectName="OBTN Float"]:!checked { - image: url(qss:overlay/float_light.svg); +Gui--OverlayToolButton[objectName="OBTN Float"] { + image: url(qss:images_classic/float-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/float_lighter.svg); + image: url(qss:images_classic/float-black.png); } -Gui--OverlayToolButton[objectName="OBTN Float"]:checked { - image: url(qss:overlay/float_lighter.svg); +Gui--OverlayToolButton[objectName="OBTN Overlay"] { + image: url(qss:images_classic/overlay-lightgray.png); +} + +Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { + image: url(qss:images_classic/overlay-black.png); } /*================================================================================================== @@ -2792,15 +2828,20 @@ Start page QWidget#thumbnailWidget { background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd); border-radius: 8px; - margin-bottom: 3px; - margin-right: 7px; border: 1px solid #ababab; } QWidget#thumbnailWidget[state="hovered"] { - border: 0.5px solid @ThemeAccentColor2; + border: 1px solid @ThemeAccentColor2; } QWidget#thumbnailWidget[state="pressed"] { border: 1px solid @ThemeAccentColor1; -} \ No newline at end of file +} + +/** + * Special handling for WB Tab Bar + */ + #WbTabBar #WbTabBarMore { + padding-right: 12px; + } diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png index 52fccd3287..88ccb90c60 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png index ce56401104..9762851da7 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png index c4ad950228..6b24109178 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png index e07f14613c..1ebc7e5cd2 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png index 05b3e3567e..42fdc0d7e1 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-LeftRight-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png index e5340ac2e9..a10f3b6021 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png index d31d98fe63..e6d71529b1 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png index 835896c0fd..f8be12f0d3 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png index e833e1d996..47f0ded648 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png index d48147818d..54887386db 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-double-UpDown-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-black.png b/src/Gui/Stylesheets/images_classic/Arrow-down-black.png index 9a72428cb3..e6576e7e0c 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png index bd578f501b..11e0534594 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png index ecd077e5a0..2f06a8928b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png index 3441914a4c..af4c6961e2 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-down-white.png b/src/Gui/Stylesheets/images_classic/Arrow-down-white.png index 5aaa258c49..2069d2aa6b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-down-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-down-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-black.png b/src/Gui/Stylesheets/images_classic/Arrow-left-black.png index dcfc9f2ae5..6cda4d2659 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png index 409f0e9c64..28b43accdc 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png index 14764cceb6..4fb7028bfc 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png index 3ecb3ebd58..043e733960 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-left-white.png b/src/Gui/Stylesheets/images_classic/Arrow-left-white.png index 6b31a607df..6e0e1921db 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-left-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-left-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png index bb7ee31e57..af1154ab70 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png index 7b66315058..e7fb5d0664 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png index 65c2492412..d464f064d6 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png index f498bd1bd3..ec401bb51b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png b/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png index b2fc76019c..edd8dcce7a 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png and b/src/Gui/Stylesheets/images_classic/Arrow-leftDown.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-black.png b/src/Gui/Stylesheets/images_classic/Arrow-right-black.png index 676a53c19c..9c966035f7 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png index ae7ab6752d..c53f65e647 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png index 7e5c19ca07..f98346f236 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png index 2538cf3b83..451a569773 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-right-white.png b/src/Gui/Stylesheets/images_classic/Arrow-right-white.png index ac30f27ef8..7e00e5c43b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-right-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-right-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png index fe9798d855..be8e3c856c 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png index b6fc71777c..fe875bab3e 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png index 80458cf2e2..002980daf9 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png index 59d8fd2d52..b8ff2a9eda 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png index 4befe9faa6..fbd45d5480 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-rightDown-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-black.png b/src/Gui/Stylesheets/images_classic/Arrow-up-black.png index e21088ecfc..69330ee6c1 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-black.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png b/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png index 31a959017b..383db86672 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png b/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png index 77a551e746..a468abec86 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png b/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png index bef803cdac..7d6c9e7a56 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Arrow-up-white.png b/src/Gui/Stylesheets/images_classic/Arrow-up-white.png index 017d65f2d4..1ab9ee6774 100644 Binary files a/src/Gui/Stylesheets/images_classic/Arrow-up-white.png and b/src/Gui/Stylesheets/images_classic/Arrow-up-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Capa 1.png b/src/Gui/Stylesheets/images_classic/Capa 1.png new file mode 100644 index 0000000000..78b407f0ef Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Capa 1.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-black.png b/src/Gui/Stylesheets/images_classic/Check-Checked-black.png index 32768dffcc..23509fcee0 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-black.png and b/src/Gui/Stylesheets/images_classic/Check-Checked-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png b/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png index 933768f5f7..0bc64a629a 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png and b/src/Gui/Stylesheets/images_classic/Check-Checked-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png b/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png index e5dd19b481..76dd2110e4 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png and b/src/Gui/Stylesheets/images_classic/Check-Checked-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png b/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png index 75f6b26ebf..a4fc91ab98 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png and b/src/Gui/Stylesheets/images_classic/Check-Checked-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-Checked-white.png b/src/Gui/Stylesheets/images_classic/Check-Checked-white.png index 78da118347..69a6858acf 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-Checked-white.png and b/src/Gui/Stylesheets/images_classic/Check-Checked-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png index 55191cd8fb..9f8311d1e5 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png and b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png new file mode 100644 index 0000000000..650a6bcd06 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png index 2e5c0f1485..a963557573 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png and b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png index 9b5574aa07..6dbaccc122 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png and b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png index f3f2a48a04..de7bf9888e 100644 Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png and b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark.png b/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark.png deleted file mode 100644 index 6fc8f4b035..0000000000 Binary files a/src/Gui/Stylesheets/images_classic/Check-indeterminate-mark.png and /dev/null differ diff --git a/src/Gui/Stylesheets/images_classic/Close-DarkRed.png b/src/Gui/Stylesheets/images_classic/Close-DarkRed.png index e257df2d1a..4977880c32 100644 Binary files a/src/Gui/Stylesheets/images_classic/Close-DarkRed.png and b/src/Gui/Stylesheets/images_classic/Close-DarkRed.png differ diff --git a/src/Gui/Stylesheets/images_classic/Close-lightgray.png b/src/Gui/Stylesheets/images_classic/Close-lightgray.png index 26237c598d..9d98ee431b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Close-lightgray.png and b/src/Gui/Stylesheets/images_classic/Close-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png index 9dfbbd9e9d..b3b33ad810 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png and b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png index fdd33174d6..26ead76483 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png and b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png index bfd1783d0d..9d4679152b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png and b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png index f8157b6bae..3061e8fb79 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png and b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png index b70d911585..794546a820 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png and b/src/Gui/Stylesheets/images_classic/Hmovetoolbar-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png index d66254d0b8..0e5a8396f5 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png and b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png index d6644e8c99..f0ee632ba7 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png and b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png index 4f35ed1d21..083fbf4f6a 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png and b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png index 945d0a66d5..d7ee03a3e9 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png and b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png index 88890c551d..39185ee85f 100644 Binary files a/src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png and b/src/Gui/Stylesheets/images_classic/Hsepartoolbar-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png index c6866b8609..a6f5a962cc 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-Blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png index f427f08082..33d072fa2b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-dark.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png index 65b1cde5aa..064e9402ae 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_FoldOver_Blue-light.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png index b6ed1c1187..0996302d24 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-Blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png index 0c5ef5957f..c2da1e5a3e 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-dark.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png index bdfd0bf240..192c956a66 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Fold_Blue-light.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png index b9ddbb60f2..a4b0b5309a 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnFoldOver_Blue-Blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png index 5035c71c13..c09112baf7 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-dark.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png new file mode 100644 index 0000000000..c3cdf52537 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue-light.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png deleted file mode 100644 index e0456dba8a..0000000000 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_UnfoldOver_Blue_light.png and /dev/null differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png index 6761469737..a36ed1d60d 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-Blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png index 84b1a479ca..84f286a365 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-dark.png differ diff --git a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png index ee6afced02..282aa1040b 100644 Binary files a/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png and b/src/Gui/Stylesheets/images_classic/Qsint_header_Unfold_Blue-light.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-black.png b/src/Gui/Stylesheets/images_classic/Radio-checked-black.png index 3624982a13..26f69b2de9 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-checked-black.png and b/src/Gui/Stylesheets/images_classic/Radio-checked-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-blue.png b/src/Gui/Stylesheets/images_classic/Radio-checked-blue.png index 214fc4462e..985aa856bf 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-checked-blue.png and b/src/Gui/Stylesheets/images_classic/Radio-checked-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png b/src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png index f02e14bf9c..6ee60af00e 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png and b/src/Gui/Stylesheets/images_classic/Radio-checked-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png b/src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png index 0cecff1da7..852b6ddb29 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png and b/src/Gui/Stylesheets/images_classic/Radio-checked-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-checked-white.png b/src/Gui/Stylesheets/images_classic/Radio-checked-white.png index 6445de9013..92a0c094d3 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-checked-white.png and b/src/Gui/Stylesheets/images_classic/Radio-checked-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png b/src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png index c1dfaae3b7..76f751c3ea 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png and b/src/Gui/Stylesheets/images_classic/Radio-unchecked-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png b/src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png index 2398650a62..ffd1132731 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png and b/src/Gui/Stylesheets/images_classic/Radio-unchecked-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png b/src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png index 2fb8f5c7cf..8f2b1e4c10 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png and b/src/Gui/Stylesheets/images_classic/Radio-unchecked-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png b/src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png index f8120aee4d..b6024f8f73 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png and b/src/Gui/Stylesheets/images_classic/Radio-unchecked-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png b/src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png index e7d323930d..03f8b83660 100644 Binary files a/src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png and b/src/Gui/Stylesheets/images_classic/Radio-unchecked-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png index d723697207..9f03d0c977 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png and b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png index 119dbc04b9..f8eda87bee 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png and b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png index cfeec0316b..5f71cd82c1 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png and b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png index 9fe61d8da5..a293149642 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png and b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png index 83fca0ce3b..6f0242ae85 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png and b/src/Gui/Stylesheets/images_classic/Vmovetoolbar-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png index 6031e2e65a..446c85cedb 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png and b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png index c202f0d8a7..58da841582 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png and b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png index 4ee6f9c878..40ced8e103 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png and b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png index fa30de9316..4bb465a83d 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png and b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png index 89b98f316a..75cf099e4a 100644 Binary files a/src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png and b/src/Gui/Stylesheets/images_classic/Vsepartoolbar-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/autohide-black.png b/src/Gui/Stylesheets/images_classic/autohide-black.png new file mode 100644 index 0000000000..9bfbf616c9 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/autohide-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/autohide-blue.png b/src/Gui/Stylesheets/images_classic/autohide-blue.png new file mode 100644 index 0000000000..0389d2901a Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/autohide-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/autohide-darkgray.png b/src/Gui/Stylesheets/images_classic/autohide-darkgray.png new file mode 100644 index 0000000000..0d0c1bba2d Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/autohide-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/autohide-lightgray.png b/src/Gui/Stylesheets/images_classic/autohide-lightgray.png new file mode 100644 index 0000000000..981a05dd42 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/autohide-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/autohide-white.png b/src/Gui/Stylesheets/images_classic/autohide-white.png new file mode 100644 index 0000000000..66347d998f Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/autohide-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/background_freecad.png b/src/Gui/Stylesheets/images_classic/background_freecad.png index 5ed9c67858..55b7f63f1b 100644 Binary files a/src/Gui/Stylesheets/images_classic/background_freecad.png and b/src/Gui/Stylesheets/images_classic/background_freecad.png differ diff --git a/src/Gui/Stylesheets/images_classic/background_freecad_dark.png b/src/Gui/Stylesheets/images_classic/background_freecad_dark.png index 2be5e744ff..d9924de176 100644 Binary files a/src/Gui/Stylesheets/images_classic/background_freecad_dark.png and b/src/Gui/Stylesheets/images_classic/background_freecad_dark.png differ diff --git a/src/Gui/Stylesheets/images_classic/background_freecad_light.png b/src/Gui/Stylesheets/images_classic/background_freecad_light.png index a03b938648..b1b12def39 100644 Binary files a/src/Gui/Stylesheets/images_classic/background_freecad_light.png and b/src/Gui/Stylesheets/images_classic/background_freecad_light.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png b/src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png index 401232f9fe..522467a816 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png and b/src/Gui/Stylesheets/images_classic/checkbox-Empty-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png b/src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png index 49a9c5c4e3..d0852c9110 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png and b/src/Gui/Stylesheets/images_classic/checkbox-Empty-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png b/src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png index 1de7737549..de63baab75 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-Empty-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png b/src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png index d7b981d1cc..aaf4e65bc8 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-Empty-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png b/src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png index 1503f1156d..292063d9c4 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png and b/src/Gui/Stylesheets/images_classic/checkbox-Empty-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-checked-black.png b/src/Gui/Stylesheets/images_classic/checkbox-checked-black.png index f461514a03..9456ca7cb6 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-checked-black.png and b/src/Gui/Stylesheets/images_classic/checkbox-checked-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-checked-blue.png b/src/Gui/Stylesheets/images_classic/checkbox-checked-blue.png index 09da3854dc..500b863a07 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-checked-blue.png and b/src/Gui/Stylesheets/images_classic/checkbox-checked-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-checked-darkgray.png b/src/Gui/Stylesheets/images_classic/checkbox-checked-darkgray.png index 59c1453fcd..0ac7b5b159 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-checked-darkgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-checked-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-checked-lightgray.png b/src/Gui/Stylesheets/images_classic/checkbox-checked-lightgray.png index 7845e34bcd..02f0d39f2a 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-checked-lightgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-checked-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-checked-white.png b/src/Gui/Stylesheets/images_classic/checkbox-checked-white.png index 5c9ef30f25..c522a07307 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-checked-white.png and b/src/Gui/Stylesheets/images_classic/checkbox-checked-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-black.png b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-black.png index a742eb8d01..1f183b2283 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-black.png and b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-blue.png b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-blue.png index 67552d58d6..043281d071 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-blue.png and b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-darkgray.png b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-darkgray.png index bf7bd62cb7..4e2a5e2123 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-darkgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-lightgray.png b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-lightgray.png index 26de520ac3..698daa735b 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-lightgray.png and b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-white.png b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-white.png index 5bcecb68be..b2e895c561 100644 Binary files a/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-white.png and b/src/Gui/Stylesheets/images_classic/checkbox-indeterminate-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-black.png b/src/Gui/Stylesheets/images_classic/close-black.png index 8a18d0662b..40fcc7fc1b 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-black.png and b/src/Gui/Stylesheets/images_classic/close-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-blue.png b/src/Gui/Stylesheets/images_classic/close-blue.png index 9919fa80c8..f4e27d05e9 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-blue.png and b/src/Gui/Stylesheets/images_classic/close-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-darkerred.png b/src/Gui/Stylesheets/images_classic/close-darkerred.png index 724e6dfc2b..bf4c0da028 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-darkerred.png and b/src/Gui/Stylesheets/images_classic/close-darkerred.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-darkgray.png b/src/Gui/Stylesheets/images_classic/close-darkgray.png index 73432ce6ed..f9e422335b 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-darkgray.png and b/src/Gui/Stylesheets/images_classic/close-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-lightred.png b/src/Gui/Stylesheets/images_classic/close-lightred.png index 4751002a0c..53e3b237f3 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-lightred.png and b/src/Gui/Stylesheets/images_classic/close-lightred.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-red.png b/src/Gui/Stylesheets/images_classic/close-red.png index 649e5f3c36..cd9b2a6a15 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-red.png and b/src/Gui/Stylesheets/images_classic/close-red.png differ diff --git a/src/Gui/Stylesheets/images_classic/close-white.png b/src/Gui/Stylesheets/images_classic/close-white.png index 5ab56a0943..98bfa5fc2c 100644 Binary files a/src/Gui/Stylesheets/images_classic/close-white.png and b/src/Gui/Stylesheets/images_classic/close-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/edithide-black.png b/src/Gui/Stylesheets/images_classic/edithide-black.png new file mode 100644 index 0000000000..07239dbbfc Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/edithide-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/edithide-blue.png b/src/Gui/Stylesheets/images_classic/edithide-blue.png new file mode 100644 index 0000000000..37a5347bc0 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/edithide-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/edithide-darkgray.png b/src/Gui/Stylesheets/images_classic/edithide-darkgray.png new file mode 100644 index 0000000000..c227009e80 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/edithide-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/edithide-lightgray.png b/src/Gui/Stylesheets/images_classic/edithide-lightgray.png new file mode 100644 index 0000000000..5f2f8cbcec Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/edithide-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/edithide-white.png b/src/Gui/Stylesheets/images_classic/edithide-white.png new file mode 100644 index 0000000000..e2af42a7ed Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/edithide-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/editshow-black.png b/src/Gui/Stylesheets/images_classic/editshow-black.png new file mode 100644 index 0000000000..ae6dd2dc1e Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/editshow-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/editshow-blue.png b/src/Gui/Stylesheets/images_classic/editshow-blue.png new file mode 100644 index 0000000000..0f9b456d1f Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/editshow-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/editshow-darkgray.png b/src/Gui/Stylesheets/images_classic/editshow-darkgray.png new file mode 100644 index 0000000000..1bff93eda8 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/editshow-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/editshow-lightgray.png b/src/Gui/Stylesheets/images_classic/editshow-lightgray.png new file mode 100644 index 0000000000..281925808c Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/editshow-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/editshow-white.png b/src/Gui/Stylesheets/images_classic/editshow-white.png new file mode 100644 index 0000000000..4c5486974f Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/editshow-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/float-black.png b/src/Gui/Stylesheets/images_classic/float-black.png new file mode 100644 index 0000000000..f9d97548d2 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/float-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/float-blue.png b/src/Gui/Stylesheets/images_classic/float-blue.png new file mode 100644 index 0000000000..562f98578b Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/float-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/float-darkgray.png b/src/Gui/Stylesheets/images_classic/float-darkgray.png new file mode 100644 index 0000000000..771310ef4b Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/float-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/float-lightgray.png b/src/Gui/Stylesheets/images_classic/float-lightgray.png new file mode 100644 index 0000000000..d6c5debc29 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/float-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/float-white.png b/src/Gui/Stylesheets/images_classic/float-white.png new file mode 100644 index 0000000000..6b0fd34121 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/float-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/icons classic.svg b/src/Gui/Stylesheets/images_classic/icons classic.svg index 3d0adeb9cf..baffbff3c6 100644 --- a/src/Gui/Stylesheets/images_classic/icons classic.svg +++ b/src/Gui/Stylesheets/images_classic/icons classic.svg @@ -25,9 +25,9 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:export-bgcolor="#ffffff00" - inkscape:zoom="0.70710678" - inkscape:cx="461.74073" - inkscape:cy="550.12907" + inkscape:zoom="1.0248427" + inkscape:cx="710.84082" + inkscape:cy="700.59534" inkscape:window-width="1920" inkscape:window-height="1028" inkscape:window-x="1913" @@ -161,16 +161,1057 @@ transform="translate(116,88)" id="rect4-3-0" x="0" - y="0" />Arrow-upArrow-upArrow-downArrow-downundockblueundockblueArrow-upArrow-upArrow-downArrow-down + style="opacity:0;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.77953;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/src/Gui/Stylesheets/images_classic/mode-black.png b/src/Gui/Stylesheets/images_classic/mode-black.png new file mode 100644 index 0000000000..6dc73b91a8 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/mode-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/mode-blue.png b/src/Gui/Stylesheets/images_classic/mode-blue.png new file mode 100644 index 0000000000..0d68717d92 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/mode-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/mode-darkgray.png b/src/Gui/Stylesheets/images_classic/mode-darkgray.png new file mode 100644 index 0000000000..8f3c6ff2f2 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/mode-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/mode-lightgray.png b/src/Gui/Stylesheets/images_classic/mode-lightgray.png new file mode 100644 index 0000000000..810adec9bc Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/mode-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/mode-white.png b/src/Gui/Stylesheets/images_classic/mode-white.png new file mode 100644 index 0000000000..a0f1584ef6 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/mode-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/more-black-lightgray.png b/src/Gui/Stylesheets/images_classic/more-black-lightgray.png index 0d550559f7..d39c29bc09 100644 Binary files a/src/Gui/Stylesheets/images_classic/more-black-lightgray.png and b/src/Gui/Stylesheets/images_classic/more-black-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/more-black.png b/src/Gui/Stylesheets/images_classic/more-black.png index 0a97eb09ae..89bebf900f 100644 Binary files a/src/Gui/Stylesheets/images_classic/more-black.png and b/src/Gui/Stylesheets/images_classic/more-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/more-blue.png b/src/Gui/Stylesheets/images_classic/more-blue.png index 3bf1f9958a..3c7d714e9f 100644 Binary files a/src/Gui/Stylesheets/images_classic/more-blue.png and b/src/Gui/Stylesheets/images_classic/more-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/more-darkgray.png b/src/Gui/Stylesheets/images_classic/more-darkgray.png index fa7406462b..0b5c5a0648 100644 Binary files a/src/Gui/Stylesheets/images_classic/more-darkgray.png and b/src/Gui/Stylesheets/images_classic/more-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/more-white.png b/src/Gui/Stylesheets/images_classic/more-white.png index e283ef9ecc..6215f07567 100644 Binary files a/src/Gui/Stylesheets/images_classic/more-white.png and b/src/Gui/Stylesheets/images_classic/more-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/overlay-black.png b/src/Gui/Stylesheets/images_classic/overlay-black.png new file mode 100644 index 0000000000..f0611c922e Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/overlay-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/overlay-blue.png b/src/Gui/Stylesheets/images_classic/overlay-blue.png new file mode 100644 index 0000000000..1f0244697a Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/overlay-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/overlay-lightgray.png b/src/Gui/Stylesheets/images_classic/overlay-lightgray.png new file mode 100644 index 0000000000..399fffd7ae Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/overlay-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/overlay-white.png b/src/Gui/Stylesheets/images_classic/overlay-white.png new file mode 100644 index 0000000000..b5f68bddc3 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/overlay-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/overlay_lighter.png b/src/Gui/Stylesheets/images_classic/overlay_lighter.png new file mode 100644 index 0000000000..4f4dfde402 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/overlay_lighter.png differ diff --git a/src/Gui/Stylesheets/images_classic/sizegrip-black.png b/src/Gui/Stylesheets/images_classic/sizegrip-black.png index cbf4e8a7e3..893c02b404 100644 Binary files a/src/Gui/Stylesheets/images_classic/sizegrip-black.png and b/src/Gui/Stylesheets/images_classic/sizegrip-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/sizegrip-blue.png b/src/Gui/Stylesheets/images_classic/sizegrip-blue.png index d1897c3e86..2339da75b0 100644 Binary files a/src/Gui/Stylesheets/images_classic/sizegrip-blue.png and b/src/Gui/Stylesheets/images_classic/sizegrip-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/sizegrip-darkgray.png b/src/Gui/Stylesheets/images_classic/sizegrip-darkgray.png index e48b4ad546..d574950c66 100644 Binary files a/src/Gui/Stylesheets/images_classic/sizegrip-darkgray.png and b/src/Gui/Stylesheets/images_classic/sizegrip-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/sizegrip-lightgray.png b/src/Gui/Stylesheets/images_classic/sizegrip-lightgray.png index 230440a3ac..94b3fafb37 100644 Binary files a/src/Gui/Stylesheets/images_classic/sizegrip-lightgray.png and b/src/Gui/Stylesheets/images_classic/sizegrip-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/sizegrip-white.png b/src/Gui/Stylesheets/images_classic/sizegrip-white.png index a1f766afab..2c0a19165d 100644 Binary files a/src/Gui/Stylesheets/images_classic/sizegrip-white.png and b/src/Gui/Stylesheets/images_classic/sizegrip-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_horizontal-black.png b/src/Gui/Stylesheets/images_classic/splitter_horizontal-black.png index b98a3cb044..a8b81f4f8a 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_horizontal-black.png and b/src/Gui/Stylesheets/images_classic/splitter_horizontal-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_horizontal-blue.png b/src/Gui/Stylesheets/images_classic/splitter_horizontal-blue.png index 45aee26a26..44d5ad92ba 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_horizontal-blue.png and b/src/Gui/Stylesheets/images_classic/splitter_horizontal-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_horizontal-darkgray.png b/src/Gui/Stylesheets/images_classic/splitter_horizontal-darkgray.png index fcaf5d5cb0..814cfd020e 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_horizontal-darkgray.png and b/src/Gui/Stylesheets/images_classic/splitter_horizontal-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_horizontal-lightgray.png b/src/Gui/Stylesheets/images_classic/splitter_horizontal-lightgray.png index da14e76779..e1140e75ad 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_horizontal-lightgray.png and b/src/Gui/Stylesheets/images_classic/splitter_horizontal-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_horizontal-white.png b/src/Gui/Stylesheets/images_classic/splitter_horizontal-white.png index 9a0ca9e18e..b111ce9353 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_horizontal-white.png and b/src/Gui/Stylesheets/images_classic/splitter_horizontal-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_vertical-black.png b/src/Gui/Stylesheets/images_classic/splitter_vertical-black.png index 1cdb57c763..30ea631a2b 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_vertical-black.png and b/src/Gui/Stylesheets/images_classic/splitter_vertical-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_vertical-blue.png b/src/Gui/Stylesheets/images_classic/splitter_vertical-blue.png index 025f2ebf5e..0c83b2a075 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_vertical-blue.png and b/src/Gui/Stylesheets/images_classic/splitter_vertical-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_vertical-darkgray.png b/src/Gui/Stylesheets/images_classic/splitter_vertical-darkgray.png index fdd4ed7278..dc1422912f 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_vertical-darkgray.png and b/src/Gui/Stylesheets/images_classic/splitter_vertical-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_vertical-lightgray.png b/src/Gui/Stylesheets/images_classic/splitter_vertical-lightgray.png index aa5af97620..08faf2bfa1 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_vertical-lightgray.png and b/src/Gui/Stylesheets/images_classic/splitter_vertical-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/splitter_vertical-white.png b/src/Gui/Stylesheets/images_classic/splitter_vertical-white.png index 3d65edac4a..24d8deb663 100644 Binary files a/src/Gui/Stylesheets/images_classic/splitter_vertical-white.png and b/src/Gui/Stylesheets/images_classic/splitter_vertical-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/taskshow-black.png b/src/Gui/Stylesheets/images_classic/taskshow-black.png new file mode 100644 index 0000000000..08a82c6da2 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/taskshow-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/taskshow-blue.png b/src/Gui/Stylesheets/images_classic/taskshow-blue.png new file mode 100644 index 0000000000..7cc9478302 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/taskshow-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/taskshow-darkgray.png b/src/Gui/Stylesheets/images_classic/taskshow-darkgray.png new file mode 100644 index 0000000000..c987aa9ada Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/taskshow-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/taskshow-lightgray.png b/src/Gui/Stylesheets/images_classic/taskshow-lightgray.png new file mode 100644 index 0000000000..19d67bb709 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/taskshow-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/taskshow-white.png b/src/Gui/Stylesheets/images_classic/taskshow-white.png new file mode 100644 index 0000000000..192283d13a Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/taskshow-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent-black.png b/src/Gui/Stylesheets/images_classic/transparent-black.png new file mode 100644 index 0000000000..220866947e Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/transparent-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent-blue.png b/src/Gui/Stylesheets/images_classic/transparent-blue.png new file mode 100644 index 0000000000..a3be766219 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/transparent-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent-darkgray.png b/src/Gui/Stylesheets/images_classic/transparent-darkgray.png new file mode 100644 index 0000000000..f6232e57ee Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/transparent-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent-lightgray.png b/src/Gui/Stylesheets/images_classic/transparent-lightgray.png new file mode 100644 index 0000000000..60abd60647 Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/transparent-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent-white.png b/src/Gui/Stylesheets/images_classic/transparent-white.png new file mode 100644 index 0000000000..3cb501e1da Binary files /dev/null and b/src/Gui/Stylesheets/images_classic/transparent-white.png differ diff --git a/src/Gui/Stylesheets/images_classic/transparent.png b/src/Gui/Stylesheets/images_classic/transparent.png index 67b5488e63..af41943f7a 100644 Binary files a/src/Gui/Stylesheets/images_classic/transparent.png and b/src/Gui/Stylesheets/images_classic/transparent.png differ diff --git a/src/Gui/Stylesheets/images_classic/undock-black-lightgray.png b/src/Gui/Stylesheets/images_classic/undock-black-lightgray.png index 6ca3b19fa4..310bcfe87a 100644 Binary files a/src/Gui/Stylesheets/images_classic/undock-black-lightgray.png and b/src/Gui/Stylesheets/images_classic/undock-black-lightgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/undock-black.png b/src/Gui/Stylesheets/images_classic/undock-black.png index 000db0a701..6a86925bc4 100644 Binary files a/src/Gui/Stylesheets/images_classic/undock-black.png and b/src/Gui/Stylesheets/images_classic/undock-black.png differ diff --git a/src/Gui/Stylesheets/images_classic/undock-blue.png b/src/Gui/Stylesheets/images_classic/undock-blue.png index 379b9d30a3..20c7772586 100644 Binary files a/src/Gui/Stylesheets/images_classic/undock-blue.png and b/src/Gui/Stylesheets/images_classic/undock-blue.png differ diff --git a/src/Gui/Stylesheets/images_classic/undock-darkgray.png b/src/Gui/Stylesheets/images_classic/undock-darkgray.png index 2bb9703003..17afbebb2a 100644 Binary files a/src/Gui/Stylesheets/images_classic/undock-darkgray.png and b/src/Gui/Stylesheets/images_classic/undock-darkgray.png differ diff --git a/src/Gui/Stylesheets/images_classic/undock-white.png b/src/Gui/Stylesheets/images_classic/undock-white.png index f106969b78..b238c3395e 100644 Binary files a/src/Gui/Stylesheets/images_classic/undock-white.png and b/src/Gui/Stylesheets/images_classic/undock-white.png differ diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss index 38b5408b9f..a3b9159119 100644 --- a/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss +++ b/src/Gui/Stylesheets/overlay/Dark Theme + Dark Background.qss @@ -1,23 +1,26 @@ -* { - /* color: #ffffff; */ - } +QFrame { + border: none; +} QTabWidget::pane{ - background-color: rgba(0, 0, 0, 0.01); + background-color: transparent; border: transparent; } + QAbstractItemView { alternate-background-color: rgba(0, 0, 0, 0.119); color: White; border: transparent; padding-right: 5px; } - Gui--OverlayTabWidget[transparent="true"] QWidget { - selection-background-color: transparent; + + Gui--OverlayTitleBar, + Gui--OverlaySplitterHandle { + background-color: transparent; } Gui--OverlayTabWidget[transparent="false"] QTreeView::item { color: #ffffff; -} + } Gui--OverlayTabWidget[transparent="true"] QTreeView::item { color: #ffffff; @@ -53,6 +56,7 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus { qproperty-effectHeight: 1; qproperty-enableEffect: 1; } + Gui--OverlayTabWidget#OverlayBottom { qproperty-effectColor: rgba(100, 100, 100, 220); qproperty-effectBlurRadius: 5; @@ -63,6 +67,10 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus { qproperty-enableEffect: 1; } + Gui--PropertyEditor--PropertyEditor { + qproperty-itemBackground: #333333; +} + Gui--OverlayTabWidget::pane { background-color: transparent; border: transparent; @@ -90,63 +98,68 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus { } Gui--OverlayToolButton { - background: transparent; - padding: 0px; - border: none; - } + border: 0.5px solid transparent; + border-radius: 2px; +} - Gui--OverlayToolButton::hover { - background: rgba(250,250,250,200); - } +Gui--OverlayToolButton:hover { + border: 0.5px solid #f5f5f5; + border-radius: 2px; +} - Gui--OverlayToolButton::focus { - background: rgba(250,250,250,255); - } +Gui--OverlayToolButton:focus { + border: 0.5px solid #0099ff; + border-radius: 2px; +} - Gui--OverlayToolButton::pressed, - Gui--OverlayToolButton::checked { - background: rgba(150,150,50,80); - border: 1px inset #f5f5f5; - } +Gui--OverlayToolButton::pressed, +Gui--OverlayToolButton:checked { + border: 0.5px solid #696969; + border-radius: 2px; + background-color: #696969; +} - Gui--OverlayToolButton::checked:hover { - background: rgba(150,150,150,200); - border: 1px inset #f5f5f5; - } - QFrame { - border: none; - } +Gui--OverlayToolButton:checked:hover { + border: 0.5px solid #f5f5f5; +} Gui--OverlayToolButton[objectName="OBTN Transparent"] { - image: url(qss:overlay/icons/transparent_light.svg); + image: url(qss:overlay/icons/mode_lighter.svg); + } Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/icons/transparent_lighter.svg); + image: url(qss:overlay/icons/mode_lighter.svg); + } - Gui--OverlayToolButton[objectName="OBTN Overlay"] { - image: url(qss:overlay/icons/overlay_light.svg); + Gui--OverlayToolButton[objectName="OBTN Overlay"] { + image: url(qss:overlay/icons/mode_lighter.svg); + } Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/icons/overlay_lighter.svg); + image: url(qss:overlay/icons/mode_lighter.svg); + } - Gui--OverlayToolButton[objectName="OBTN AutoMode"] { - image: url(qss:overlay/icons/mode_light.svg); + Gui--OverlayToolButton[objectName="OBTN AutoMode"] { + image: url(qss:overlay/icons/mode_lighter.svg); + } Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/icons/mode_lighter.svg); + image: url(qss:overlay/icons/mode_lighter.svg); + } Gui--OverlaySplitterHandle Gui--OverlayToolButton, - Gui--OverlayToolButton[objectName="OBTN Float"] { - image: url(qss:overlay/icons/float_light.svg); + Gui--OverlayToolButton[objectName="OBTN Float"] { + image: url(qss:overlay/icons/mode_lighter.svg); + } Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover, Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/icons/float_lighter.svg); + image: url(qss:overlay/icons/mode_lighter.svg); } \ No newline at end of file diff --git a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss index 513a92fff5..df24149e16 100644 --- a/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss +++ b/src/Gui/Stylesheets/overlay/Dark Theme + Light Background.qss @@ -1,28 +1,37 @@ -QTabWidget::pane{ - background-color: rgba(255, 255, 255, 0.01); - border: transparent; +QFrame { + border: none; } + QTabWidget::pane{ + background-color: transparent; + border: transparent; + } -QAbstractItemView { - alternate-background-color: rgba(0, 0, 0, 0.119); - color: White; - border: transparent; - padding-right: 5px; -} + QAbstractItemView { + alternate-background-color: rgba(0, 0, 0, 0.273); + color: White; + border: transparent; + padding-right: 5px; + } -QTreeView { - background-color: #cecece; + Gui--OverlayTitleBar, + Gui--OverlaySplitterHandle { + background-color: #252525; + } + + QTreeView { + background-color: rgba(0, 0, 0, 0.55); border: 0px solid #696968; /* alternate-background-color: rgba(255, 0, 0, 0.611); */ - color: #0e0e0e; + color: #fdfdfd; gridline-color: #696968; border-radius: 0px; } -Gui--OverlayTabWidget[transparent="true"] QWidget { - selection-background-color: transparent; + QTreeView::item { + color: #ffffff; } -Gui--OverlayTabWidget[transparent="false"] QTreeView::item { + + Gui--OverlayTabWidget[transparent="false"] QTreeView::item { color: #ffffff; } @@ -32,24 +41,17 @@ Gui--OverlayTabWidget[transparent="true"] QTreeView::item { Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected { color: #000000; - background-color: #c7def5; + background-color: #799fff; } Gui--OverlayTabWidget[transparent="true"] QTreeView::item:focus { color: #000000; - background-color: #c7def5; + background-color: #799fff; } Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected:focus { color: #000000; - background-color: #c7def5; -} - -Gui--OverlayTabWidget[transparent="true"] QTreeView::item:disabled { - color: #8b8b8b; -} -Gui--OverlayTabWidget[transparent="true"] QTreeView::item { - color: #000000; + background-color: #799fff; } /* The OverlayTabWidget is named as OverlayLeft, OverlayRight, OverlayTop, OverlayBottom. @@ -77,119 +79,120 @@ Gui--OverlayTabWidget { qproperty-enableEffect: 1; } - Gui--OverlayTabWidget::pane { - background-color: transparent; - border: transparent; - } +Gui--PropertyEditor--PropertyEditor { + qproperty-itemBackground: #333333; +} - QSint--ActionGroup QFrame[class="content"] { - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - } + Gui--OverlayTabWidget::pane { + background-color: transparent; + border: transparent; + } - Gui--OverlayTabWidget::tab-bar:top, - Gui--OverlayTabWidget::tab-bar:bottom { - left: 10px; - alignment: left; - } + QSint--ActionGroup QFrame[class="content"] { + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + } - Gui--OverlayTabWidget::tab-bar:left, - Gui--OverlayTabWidget::tab-bar:right { - top: 10px; - alignment: top; - } + Gui--OverlayTabWidget::tab-bar:top, + Gui--OverlayTabWidget::tab-bar:bottom { + left: 10px; + alignment: left; + } - Gui--OverlayProxyWidget { - qproperty-hintColor: rgba(250, 250, 250, 0.6); - } + Gui--OverlayTabWidget::tab-bar:left, + Gui--OverlayTabWidget::tab-bar:right { + top: 10px; + alignment: top; + } - Gui--OverlayToolButton { - background: transparent; - padding: 0px; - border: none; - } + Gui--OverlayProxyWidget { + qproperty-hintColor: rgba(250, 250, 250, 0.6); + } - Gui--OverlayToolButton::hover { - background: rgba(250,250,250,200); - } + Gui--OverlayToolButton { + border: 0.5px solid transparent; + border-radius: 2px; +} - Gui--OverlayToolButton::focus { - background: rgba(250,250,250,255); - } +Gui--OverlayToolButton:hover { + border: 0.5px solid #f5f5f5; + border-radius: 2px; +} - Gui--OverlayToolButton::pressed, - Gui--OverlayToolButton::checked { - background: rgba(150,150,50,80); - border: 1px inset #f5f5f5; - } +Gui--OverlayToolButton:focus { + border: 0.5px solid #0099ff; + border-radius: 2px; +} - Gui--OverlayToolButton::checked:hover { - background: rgba(150,150,150,200); - border: 1px inset #f5f5f5; - } +Gui--OverlayToolButton::pressed, +Gui--OverlayToolButton:checked { + border: 0.5px solid #696969; + border-radius: 2px; + background-color: #696969; +} - QFrame { - border: none; - } +Gui--OverlayToolButton:checked:hover { + border: 0.5px solid #696969; +} - Gui--OverlayToolButton[objectName="OBTN Transparent"] { - image: url(qss:overlay/icons/transparent_light.svg); - } + Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover { + image: url(qss:images_classic/transparent-lightgray.png); + } - Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/icons/transparent_lighter.svg); - } + Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { + image: url(qss:images_classic/transparent-white.png); + } - Gui--OverlayToolButton[objectName="OBTN Overlay"] { - image: url(qss:overlay/icons/overlay_light.svg); - } + Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover { + image: url(qss:images_classic/overlay-lightgray.png); + } - Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/icons/overlay_lighter.svg); - } + Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { + image: url(qss:images_classic/overlay-white.png); + } - Gui--OverlayToolButton[objectName="OBTN AutoMode"] { - image: url(qss:overlay/icons/mode_light.svg); - } + Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover { + image: url(qss:images_classic/mode-lightgray.png); +} - Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/icons/mode_lighter.svg); - } + Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { + image: url(qss:images_classic/mode-white.png); + } - Gui--OverlaySplitterHandle Gui--OverlayToolButton, - Gui--OverlayToolButton[objectName="OBTN Float"] { - image: url(qss:overlay/icons/float_light.svg); - } + Gui--OverlaySplitterHandle Gui--OverlayToolButton, + Gui--OverlayToolButton[objectName="OBTN Float"]:!hover { + image: url(qss:images_classic/float-lightgray.png); + } - Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover, - Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/icons/float_lighter.svg); - } + Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover, + Gui--OverlayToolButton[objectName="OBTN Float"]:hover { + image: url(qss:images_classic/float-white.png); + } - QTreeView::branch:closed:has-children:has-siblings { - margin-top: 5px; - margin-bottom: 5px; - border-image: none; - image: url(qss:images_classic/Arrow-right-black.png) 0; - } + QTreeView::branch:open:has-children:has-siblings { + margin-left: 6px; + margin-right: 6px; + border-image: none; + image: url(qss:images_classic/Arrow-down-black.png); +} - QTreeView::branch:has-children:!has-siblings:closed { - margin-top: 5px; - margin-bottom: 5px; - border-image: none; - image: url(qss:images_classic/Arrow-right-black.png) 0; - } + QTreeView::branch:open:has-children:!has-siblings { + margin-left: 6px; + margin-right: 6px; + border-image: none; + image: url(qss:images_classic/Arrow-down-black.png); +} - QTreeView::branch:open:has-children:has-siblings { - margin-left: 6px; - margin-right: 6px; - border-image: none; - image: url(qss:images_classic/Arrow-down-black.png) 0; - } +QTreeView::branch:closed:has-children:has-siblings { + margin-top: 5px; + margin-bottom: 5px; + border-image: none; + image: url(qss:images_classic/Arrow-right-black.png) 0; +} - QTreeView::branch:open:has-children:!has-siblings { - margin-left: 6px; - margin-right: 6px; - border-image: none; - image: url(qss:images_classic/Arrow-down-black.png) 0; - } +QTreeView::branch:has-children:!has-siblings:closed { + margin-top: 5px; + margin-bottom: 5px; + border-image: none; + image: url(qss:images_classic/Arrow-right-black.png) 0; +} diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss index 5dd957e23d..51456bcc58 100644 --- a/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss +++ b/src/Gui/Stylesheets/overlay/Light Theme + Dark Background.qss @@ -1,20 +1,28 @@ +QFrame { + border: none; +} + QTabWidget::pane{ - background-color: rgba(0, 0, 0, 0.01); + background-color: transparent; border: transparent; } + QAbstractItemView { - alternate-background-color: rgba(255, 255, 255, 0.119); + alternate-background-color: rgba(255, 255, 255, 0.13); color: #000000; border: transparent; - padding-right: 6px; -} -Gui--OverlayTabWidget[transparent="true"] QWidget { - selection-background-color: transparent; + padding-right: 5px; } +Gui--OverlayTitleBar, +Gui--OverlaySplitterHandle { + background-color: #f0f0f0; + } + + /* Overwrites Properties panel to use white text. */ QTreeView { - background-color: #5f5f5f; + background-color: rgba(70, 70, 70, 0.539); border: 0px solid #696968; /* alternate-background-color: rgba(255, 0, 0, 0.611); */ color: #fdfdfd; @@ -22,6 +30,18 @@ QTreeView { border-radius: 0px; } +QTreeView::item { + color: #000000; +} + +QTreeView:disabled { + color: #696968; +} + +Gui--PropertyEditor--PropertyEditor { + qproperty-itemBackground: #333333; +} + Gui--OverlayTabWidget[transparent="false"] QTreeView::item { color: #ffffff; } @@ -91,8 +111,8 @@ Gui--OverlayTabWidget::pane { } QSint--ActionGroup QFrame[class="content"] { - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; } Gui--OverlayTabWidget::tab-bar:top, @@ -112,81 +132,60 @@ Gui--OverlayProxyWidget { } Gui--OverlayToolButton { - background: transparent; - padding: 0px; - border: none; + border: 0.5px solid transparent; + border-radius: 2px; } -Gui--OverlayToolButton::hover { - background: rgba(250,250,250,200); +Gui--OverlayToolButton:hover { + border: 0.5px solid #000000; + border-radius: 2px; } -Gui--OverlayToolButton::focus { - background: rgba(250,250,250,255); +Gui--OverlayToolButton:focus { + border: 0.5px solid #0099ff; + border-radius: 2px; } Gui--OverlayToolButton::pressed, -Gui--OverlayToolButton::checked { - background: rgba(150,150,50,80); - border: 1px inset #f5f5f5; +Gui--OverlayToolButton:checked { + border: 0.5px solid #ababab; + border-radius: 2px; + background-color: #ffffff; } -Gui--OverlayToolButton::checked:hover { - background: rgba(150,150,150,200); - border: 1px inset #f5f5f5; +Gui--OverlayToolButton:checked:hover { + border: 0.5px solid #000000; } -QFrame { - border: none; +Gui--OverlayToolButton:!hover{ + image: url(qss:images_classic/close-lightgray.png); } - -Gui--OverlayToolButton[objectName="OBTN Transparent"] { - image: url(qss:overlay/icons/transparent_dark.svg); +Gui--OverlayToolButton:hover { + image: url(qss:images_classic/close-red.png); } +Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover { + image: url(qss:images_classic/transparent-lightgray.png);} + Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/icons/transparent_light.svg); + image: url(qss:images_classic/transparent-black.png); } -Gui--OverlayToolButton[objectName="OBTN Overlay"] { - image: url(qss:overlay/icons/overlay_dark.svg); +Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover { + image: url(qss:images_classic/overlay-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/icons/overlay_light.svg); + image: url(qss:images_classic/overlay-black.png); } -Gui--OverlayToolButton[objectName="OBTN AutoMode"] { - image: url(qss:overlay/icons/mode_dark.svg); +Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover { + image: url(qss:images_classic/mode-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/icons/mode_light.svg); -} - -Gui--OverlaySplitterHandle Gui--OverlayToolButton, -Gui--OverlayToolButton[objectName="OBTN Float"] { - image: url(qss:overlay/icons/float_dark.svg); -} - -Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover, -Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/icons/float_light.svg); -} - - QTreeView::branch:closed:has-children:has-siblings { - margin-top: 5px; - margin-bottom: 5px; - border-image: none; - image: url(qss:images_classic/Arrow-right-white.png) 0; -} - - QTreeView::branch:has-children:!has-siblings:closed { - margin-top: 5px; - margin-bottom: 5px; - border-image: none; - image: url(qss:images_classic/Arrow-right-white.png) 0; + image: url(qss:images_classic/mode-black.png); } QTreeView::branch:open:has-children:has-siblings { @@ -203,3 +202,17 @@ Gui--OverlayToolButton[objectName="OBTN Float"]:hover { image: url(qss:images_classic/Arrow-down-white.png) 0; } + +QTreeView::branch:closed:has-children:has-siblings { + margin-top: 5px; + margin-bottom: 5px; + border-image: none; + image: url(qss:images_classic/Arrow-right-white.png) 0; +} + +QTreeView::branch:has-children:!has-siblings:closed { + margin-top: 5px; + margin-bottom: 5px; + border-image: none; + image: url(qss:images_classic/Arrow-right-white.png) 0; +} diff --git a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss index fc77aac61f..a1a08f96b1 100644 --- a/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss +++ b/src/Gui/Stylesheets/overlay/Light Theme + Light Background.qss @@ -1,24 +1,35 @@ +QFrame { + border: none; +} + QTabWidget::pane{ - background-color: rgba(255, 255, 255, 0.01); + background-color: transparent; border: transparent; } QAbstractItemView { - alternate-background-color: rgba(255, 255, 255, 0.13); + alternate-background-color: #f0f0f0; color: #000000; border: transparent; padding-right: 5px; } -Gui--OverlayTabWidget[transparent="true"] QWidget { - selection-background-color: transparent; +Gui--PropertyEditor--PropertyEditor { + qproperty-itemBackground: #ffffff; } +Gui--OverlayTitleBar, +Gui--OverlaySplitterHandle { + background-color: #f0f0f0; + } + Gui--OverlayTabWidget[transparent="false"] QTreeView::item { color: #000000; + selection-background-color: #ff8800; } Gui--OverlayTabWidget[transparent="true"] QTreeView::item { color: #000000; + selection-background-color: #850000; } Gui--OverlayTabWidget[transparent="true"] QTreeView::item:selected { @@ -88,64 +99,58 @@ Gui--OverlayProxyWidget { } Gui--OverlayToolButton { - background: transparent; - padding: 0px; - border: none; + border: 0.5px solid transparent; + border-radius: 2px; } -Gui--OverlayToolButton::hover { - background: rgba(250,250,250,200); +Gui--OverlayToolButton:hover { + border: 0.5px solid #000000; + border-radius: 2px; } -Gui--OverlayToolButton::focus { - background: rgba(250,250,250,255); +Gui--OverlayToolButton:focus { + border: 0.5px solid #0099ff; + border-radius: 2px; } Gui--OverlayToolButton::pressed, -Gui--OverlayToolButton::checked { - background: rgba(150,150,50,80); - border: 1px inset #f5f5f5; +Gui--OverlayToolButton:checked { + border: 0.5px solid #ababab; + border-radius: 2px; + background-color: #ffffff; } -Gui--OverlayToolButton::checked:hover { - background: rgba(150,150,150,200); - border: 1px inset #f5f5f5; +Gui--OverlayToolButton:checked:hover { + border: 0.5px solid #000000; } -QFrame { - border: none; +Gui--OverlayToolButton:!hover{ + image: url(qss:images_classic/close-lightgray.png); } -Gui--OverlayToolButton[objectName="OBTN Transparent"] { - image: url(qss:overlay/icons/transparent_dark.svg); +Gui--OverlayToolButton:hover { + image: url(qss:images_classic/close-red.png); } +Gui--OverlayToolButton[objectName="OBTN Transparent"]:!hover { + image: url(qss:images_classic/transparent-lightgray.png);} + Gui--OverlayToolButton[objectName="OBTN Transparent"]:hover { - image: url(qss:overlay/icons/transparent_light.svg); + image: url(qss:images_classic/transparent-black.png); } -Gui--OverlayToolButton[objectName="OBTN Overlay"] { - image: url(qss:overlay/icons/overlay_dark.svg); +Gui--OverlayToolButton[objectName="OBTN Overlay"]:!hover { + image: url(qss:images_classic/overlay-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN Overlay"]:hover { - image: url(qss:overlay/icons/overlay_light.svg); + image: url(qss:images_classic/overlay-black.png); } -Gui--OverlayToolButton[objectName="OBTN AutoMode"] { - image: url(qss:overlay/icons/mode_dark.svg); +Gui--OverlayToolButton[objectName="OBTN AutoMode"]:!hover { + image: url(qss:images_classic/mode-lightgray.png); } Gui--OverlayToolButton[objectName="OBTN AutoMode"]:hover { - image: url(qss:overlay/icons/mode_light.svg); -} - -Gui--OverlaySplitterHandle Gui--OverlayToolButton, -Gui--OverlayToolButton[objectName="OBTN Float"] { - image: url(qss:overlay/icons/float_dark.svg); -} - -Gui--OverlaySplitterHandle Gui--OverlayToolButton:hover, -Gui--OverlayToolButton[objectName="OBTN Float"]:hover { - image: url(qss:overlay/icons/float_light.svg); + image: url(qss:images_classic/mode-black.png); } diff --git a/src/Mod/Start/Gui/ThemeSelectorWidget.cpp b/src/Mod/Start/Gui/ThemeSelectorWidget.cpp index 7c5c726a98..44d3bb843a 100644 --- a/src/Mod/Start/Gui/ThemeSelectorWidget.cpp +++ b/src/Mod/Start/Gui/ThemeSelectorWidget.cpp @@ -55,9 +55,9 @@ void ThemeSelectorWidget::setupButtons(QBoxLayout* layout) if (!layout) { return; } - std::map themeMap {{Theme::Classic, tr("Classic")}, - {Theme::Dark, tr("Dark theme")}, - {Theme::Light, tr("Light theme")}}; + std::map themeMap {{Theme::Classic, tr("FreeCAD Classic")}, + {Theme::Dark, tr("FreeCAD Dark")}, + {Theme::Light, tr("FreeCAD Light")}}; std::map 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("

") + tr("Theme") + QLatin1String("

")); _descriptionLabel->setText(tr("Looking for more themes? You can obtain them using " "Addon Manager.")); - _buttons[static_cast(Theme::Dark)]->setText(tr("Dark theme", "Visual theme name")); - _buttons[static_cast(Theme::Light)]->setText(tr("Light theme", "Visual theme name")); - _buttons[static_cast(Theme::Classic)]->setText(tr("Classic", "Visual theme name")); + _buttons[static_cast(Theme::Dark)]->setText(tr("FreeCAD Dark", "Visual theme name")); + _buttons[static_cast(Theme::Light)]->setText(tr("FreeCAD Light", "Visual theme name")); + _buttons[static_cast(Theme::Classic)]->setText(tr("FreeCAD Classic", "Visual theme name")); } diff --git a/src/Mod/Start/Gui/ThemeSelectorWidget.h b/src/Mod/Start/Gui/ThemeSelectorWidget.h index 3ff9ebbc44..3535849f66 100644 --- a/src/Mod/Start/Gui/ThemeSelectorWidget.h +++ b/src/Mod/Start/Gui/ThemeSelectorWidget.h @@ -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).