diff --git a/src/Gui/Stylesheets/Dark-blue.qss b/src/Gui/Stylesheets/Dark-blue.qss index 82d4e9a8b7..39f3349629 100644 --- a/src/Gui/Stylesheets/Dark-blue.qss +++ b/src/Gui/Stylesheets/Dark-blue.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.10 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: black; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } @@ -1129,6 +1130,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1170,8 +1179,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #c8c8c8; border: 1px solid #505050; } diff --git a/src/Gui/Stylesheets/Dark-green.qss b/src/Gui/Stylesheets/Dark-green.qss index f9284ccb54..29502a4fdd 100644 --- a/src/Gui/Stylesheets/Dark-green.qss +++ b/src/Gui/Stylesheets/Dark-green.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.10 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: black; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } @@ -1129,6 +1130,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1170,8 +1179,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #c8c8c8; border: 1px solid #505050; } diff --git a/src/Gui/Stylesheets/Dark-orange.qss b/src/Gui/Stylesheets/Dark-orange.qss index e9c2477bef..cc12addb97 100644 --- a/src/Gui/Stylesheets/Dark-orange.qss +++ b/src/Gui/Stylesheets/Dark-orange.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.10 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: black; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #5a5a5a; /* set color for all QTabBars */ } @@ -1129,6 +1130,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1170,8 +1179,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #c8c8c8; border: 1px solid #505050; } diff --git a/src/Gui/Stylesheets/Light-blue.qss b/src/Gui/Stylesheets/Light-blue.qss index 49d1697aea..2a2db94b5c 100644 --- a/src/Gui/Stylesheets/Light-blue.qss +++ b/src/Gui/Stylesheets/Light-blue.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.09 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: #505050; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } @@ -1127,6 +1128,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1168,8 +1177,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #f0f0f0; border: 1px solid #c3c3c3; } @@ -1559,7 +1569,7 @@ Radio button ==================================================================================================*/ QRadioButton::indicator:unchecked{ color: #505050; - background-color: rgba(0, 0, 0, 20); + background-color: rgba(0,0,0,20); border: 1px solid #505050; } @@ -1577,6 +1587,10 @@ QRadioButton:disabled { background-color: transparent; } +QRadioButton:disabled { + color: rgba(0,0,0,40); +} + QRadioButton::indicator { width: 11px; height: 11px; diff --git a/src/Gui/Stylesheets/Light-green.qss b/src/Gui/Stylesheets/Light-green.qss index c502316dbe..c525592f7f 100644 --- a/src/Gui/Stylesheets/Light-green.qss +++ b/src/Gui/Stylesheets/Light-green.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.09 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: #505050; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } @@ -1127,6 +1128,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1168,8 +1177,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #f0f0f0; border: 1px solid #c3c3c3; } @@ -1559,7 +1569,7 @@ Radio button ==================================================================================================*/ QRadioButton::indicator:unchecked{ color: #505050; - background-color: rgba(0, 0, 0, 20); + background-color: rgba(0,0,0,20); border: 1px solid #505050; } @@ -1577,6 +1587,10 @@ QRadioButton:disabled { background-color: transparent; } +QRadioButton:disabled { + color: rgba(0,0,0,40); +} + QRadioButton::indicator { width: 11px; height: 11px; diff --git a/src/Gui/Stylesheets/Light-orange.qss b/src/Gui/Stylesheets/Light-orange.qss index 2ec8b681bf..eb9c36ed53 100644 --- a/src/Gui/Stylesheets/Light-orange.qss +++ b/src/Gui/Stylesheets/Light-orange.qss @@ -1,14 +1,14 @@ /* ABOUT ============================================================================================================ -version 2.09 +version 2.20 Qt theme (stylesheet) specially developed for FreeCAD (http://www.freecadweb.org/). It might work with other software that uses Qt styling. LICENSE ============================================================================================================ -Copyright (c) 2018 Pablo Gil Fernández +Copyright (c) 2019 Pablo Gil Fernández This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. @@ -72,6 +72,7 @@ Reset elements border-style: none; border-image: none; outline: 0; + color: #505050; /* Default color for labels and different text elements that usually use dark colors */ } /* specific reset for elements inside QToolBar */ @@ -92,7 +93,7 @@ QToolBar { } QMdiArea { - background-image: url(qss:images_dark-light/background_freecad.svg); + background-image: url(qss:images_dark-light/background_freecad_dark.svg); background-position: center center; background-repeat: no-repeat; } @@ -497,7 +498,7 @@ QTabBar { background-color: transparent; } -/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */ +/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */ QTabBar { border-top: 1px solid #d2d2d2; /* set color for all QTabBars */ } @@ -1127,6 +1128,14 @@ QSint--ActionGroup QFrame[class="content"] > QWidget > QPushButton { margin: 0px; } +/* Fix for lists inside task panels */ +/* QSint--ActionGroup QFrame[class="content"] QTreeView, +QSint--ActionGroup QFrame[class="content"] QListView, +QSint--ActionGroup QFrame[class="content"] QTableView { + color: #f5f5f5; + background-color: #787878; +} */ + /*================================================================================================== Buttons @@ -1168,8 +1177,9 @@ QDateTimeEdit { padding-right: 20px; } -/* when QTextEdit are no editable */ -QTextEdit:!editable { +/* when QTextEdit are no editable (like Report view)*/ +QTextEdit:!editable, +QTextEdit:!editable:focus { background-color: #f0f0f0; border: 1px solid #c3c3c3; } @@ -1559,7 +1569,7 @@ Radio button ==================================================================================================*/ QRadioButton::indicator:unchecked{ color: #505050; - background-color: rgba(0, 0, 0, 20); + background-color: rgba(0,0,0,20); border: 1px solid #505050; } @@ -1577,6 +1587,10 @@ QRadioButton:disabled { background-color: transparent; } +QRadioButton:disabled { + color: rgba(0,0,0,40); +} + QRadioButton::indicator { width: 11px; height: 11px;