OpenToonz - An open-source full-featured 2D animation creation software
C
Stylesheet Fixes for v1.5
Kited70a4ff7b672
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qssindex 307155f20..69eb343f8 100644--- a/stuff/config/qss/Blue/Blue.qss+++ b/stuff/config/qss/Blue/Blue.qss@@ -7,8 +7,7 @@ QToolButton,#CameraSettingsRadioButton::indicator,#ForceSquaredPixelButton,#EditToolLockButton::indicator,-#flipCustomize,-#SceneCast QToolBar QToolButton {+#flipCustomize {background-color: transparent;border: 1 solid transparent;border-radius: 2;@@ -22,8 +21,7 @@ QToolButton:hover,#colorSliderAddButton:hover,#colorSliderSubButton:hover,#EditToolLockButton::indicator:hover,-#flipCustomize:hover,-#SceneCast QToolBar QToolButton:hover {+#flipCustomize:hover {background-color: #696c6f;border-color: #696c6f;color: #e4e5e9;@@ -36,8 +34,7 @@ QToolButton:pressed,#colorSliderAddButton:pressed,#colorSliderSubButton:pressed,#EditToolLockButton::indicator:pressed,-#flipCustomize:pressed,-#SceneCast QToolBar QToolButton:pressed {+#flipCustomize:pressed {background-color: #262728;border-color: #212223;color: #e4e5e9;@@ -48,8 +45,7 @@ QToolButton:checked,#CameraSettingsRadioButton::indicator:checked,#ForceSquaredPixelButton:checked,#EditToolLockButton::indicator:checked,-#flipCustomize:checked,-#SceneCast QToolBar QToolButton:checked {+#flipCustomize:checked {background-color: #5385a6;border-color: #5385a6;color: #ffffff;@@ -60,8 +56,7 @@ QToolButton:checked:hover,#CameraSettingsRadioButton::indicator:checked:hover,#ForceSquaredPixelButton:checked:hover,#EditToolLockButton::indicator:checked:hover,-#flipCustomize:checked:hover,-#SceneCast QToolBar QToolButton:checked:hover {+#flipCustomize:checked:hover {background-color: #6c98b6;border-color: #6c98b6;}@@ -71,8 +66,7 @@ QToolButton:disabled,#CameraSettingsRadioButton::indicator:disabled,#ForceSquaredPixelButton:disabled,#EditToolLockButton::indicator:disabled,-#flipCustomize:disabled,-#SceneCast QToolBar QToolButton:disabled {+#flipCustomize:disabled {color: rgba(214, 216, 221, 0.4);}.button-tool:disabled:checked,@@ -81,8 +75,7 @@ QToolButton:disabled:checked,#CameraSettingsRadioButton::indicator:disabled:checked,#ForceSquaredPixelButton:disabled:checked,#EditToolLockButton::indicator:disabled:checked,-#flipCustomize:disabled:checked,-#SceneCast QToolBar QToolButton:disabled:checked {+#flipCustomize:disabled:checked {background-color: rgba(83, 133, 166, 0.4);border-color: rgba(83, 133, 166, 0.4);}@@ -345,7 +338,7 @@ QMenu::separator {QMenu::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('../Default/imgs/white/none');@@ -355,7 +348,7 @@ QMenu::icon:checked {border: 1 solid #5385a6;}QMenu::indicator {- margin-left: 7;+ margin-left: 8;}/* -----------------------------------------------------------------------------Titlebars@@ -714,24 +707,30 @@ QTreeView::item:selected,background-color: #5385a6;color: #ffffff;}+.treeview::branch,+QTreeWidget::branch,+QTreeView::branch,+#FunctionEditorTree::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+}.treeview::branch:adjoins-item,QTreeWidget::branch:adjoins-item,QTreeView::branch:adjoins-item,#FunctionEditorTree::branch:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings,QTreeWidget::branch:has-siblings,QTreeView::branch:has-siblings,#FunctionEditorTree::branch:has-siblings {- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings:adjoins-item,QTreeWidget::branch:has-siblings:adjoins-item,QTreeView::branch:has-siblings:adjoins-item,#FunctionEditorTree::branch:has-siblings:adjoins-item {- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-children:closed,QTreeWidget::branch:has-children:closed,@@ -1015,7 +1014,6 @@ QCheckBox:disabled {}.CheckBox::indicator,QMenu::indicator:non-exclusive,-QMenu::indicator:non-exclusive,QCheckBox::indicator,.GroupBox::indicator,QGroupBox::indicator {@@ -1030,15 +1028,12 @@ QGroupBox::indicator {}.CheckBox::indicator:hover,QMenu::indicator:non-exclusive:hover,-QMenu::indicator:non-exclusive:hover,.CheckBox::indicator:checked:hover,.CheckBox::indicator:indeterminate:hover,QCheckBox::indicator:hover,.GroupBox::indicator:hover,QMenu::indicator:non-exclusive:checked:hover,QMenu::indicator:non-exclusive:indeterminate:hover,-QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:indeterminate:hover,QCheckBox::indicator:checked:hover,QCheckBox::indicator:indeterminate:hover,.GroupBox::indicator:checked:hover,@@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {}.CheckBox::indicator:checked,QMenu::indicator:non-exclusive:checked,-QMenu::indicator:non-exclusive:checked,QCheckBox::indicator:checked,.GroupBox::indicator:checked,QGroupBox::indicator:checked {@@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {}.CheckBox::indicator:checked:hover,QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:checked:hover,QCheckBox::indicator:checked:hover,.GroupBox::indicator:checked:hover,QGroupBox::indicator:checked:hover {@@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {}.CheckBox::indicator:checked:disabled,QMenu::indicator:non-exclusive:checked:disabled,-QMenu::indicator:non-exclusive:checked:disabled,QCheckBox::indicator:checked:disabled,.GroupBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled {@@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {}.CheckBox::indicator:indeterminate,QMenu::indicator:non-exclusive:indeterminate,-QMenu::indicator:non-exclusive:indeterminate,QCheckBox::indicator:indeterminate,.GroupBox::indicator:indeterminate,QGroupBox::indicator:indeterminate {@@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {}.CheckBox::indicator:indeterminate:disabled,QMenu::indicator:non-exclusive:indeterminate:disabled,-QMenu::indicator:non-exclusive:indeterminate:disabled,QCheckBox::indicator:indeterminate:disabled,.GroupBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled {@@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {}.CheckBox::indicator:disabled,QMenu::indicator:non-exclusive:disabled,-QMenu::indicator:non-exclusive:disabled,QCheckBox::indicator:disabled,.GroupBox::indicator:disabled,QGroupBox::indicator:disabled {@@ -1130,7 +1119,6 @@ QRadioButton:disabled {}.RadioButton::indicator,QMenu::indicator:exclusive,-QMenu::indicator:exclusive,QRadioButton::indicator,#CameraSettingsRadioButton_Small::indicator {width: 13;@@ -1141,28 +1129,24 @@ QRadioButton::indicator,}.RadioButton::indicator:unchecked,QMenu::indicator:exclusive:unchecked,-QMenu::indicator:exclusive:unchecked,QRadioButton::indicator:unchecked,#CameraSettingsRadioButton_Small::indicator:unchecked {image: url('../Default/imgs/white/radiobutton_unchecked.svg');}.RadioButton::indicator:unchecked:hover,QMenu::indicator:exclusive:unchecked:hover,-QMenu::indicator:exclusive:unchecked:hover,QRadioButton::indicator:unchecked:hover,#CameraSettingsRadioButton_Small::indicator:unchecked:hover {image: url('../Default/imgs/white/radiobutton_unchecked_hover.svg');}.RadioButton::indicator:checked,QMenu::indicator:exclusive:checked,-QMenu::indicator:exclusive:checked,QRadioButton::indicator:checked,#CameraSettingsRadioButton_Small::indicator:checked {image: url('../Default/imgs/white/radiobutton_checked.svg');}.RadioButton::indicator:checked:disabled,QMenu::indicator:exclusive:checked:disabled,-QMenu::indicator:exclusive:checked:disabled,QRadioButton::indicator:checked:disabled,#CameraSettingsRadioButton_Small::indicator:checked:disabled {background-color: transparent;@@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,}.RadioButton::indicator:disabled,QMenu::indicator:exclusive:disabled,-QMenu::indicator:exclusive:disabled,QRadioButton::indicator:disabled,#CameraSettingsRadioButton_Small::indicator:disabled {image: url('../Default/imgs/white/radiobutton_unchecked_disabled.svg');@@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {qproperty-ColTextColor: #d6d8dd;qproperty-ColBorderColor: #262728;}-#FileBrowser,-#SceneCast {+#FileBrowser {background-color: #414345;}-#FileBrowser QLabel,-#SceneCast QLabel {+#FileBrowser QLabel {background-color: transparent;}-#FileBrowser QToolBar,-#SceneCast QToolBar {+#FileBrowser QToolBar {background-color: #414345;}-#FileBrowser #castFrame,-#SceneCast #castFrame {+#FileBrowser #castFrame {border-top: 1 solid #262728;border-right: 1 solid #262728;border-bottom: 1 solid #262728;@@ -1721,11 +1700,11 @@ SchematicViewer {qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;- qproperty-ChildColumnColor: #6A526B;+ qproperty-ChildColumnColor: #6b4e69;qproperty-FullcolorColumnColor: #657A96;- qproperty-FxColumnColor: #6d6349;+ qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;- qproperty-MeshColumnColor: #5e4d72;+ qproperty-MeshColumnColor: #594d75;qproperty-ReferenceColumnColor: #4d5052;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -2252,24 +2231,24 @@ XsheetViewer {qproperty-VectorColumnColor: #7B7B4C;qproperty-VectorColumnBorderColor: #5b5b39;qproperty-SelectedVectorColumnColor: #85906c;- qproperty-ChildColumnColor: #6A526B;- qproperty-ChildColumnBorderColor: #4d3c4e;- qproperty-SelectedChildColumnColor: #756a89;+ qproperty-ChildColumnColor: #6b4e69;+ qproperty-ChildColumnBorderColor: #4e384c;+ qproperty-SelectedChildColumnColor: #766787;qproperty-FullcolorColumnColor: #657A96;qproperty-FullcolorColumnBorderColor: #506178;qproperty-SelectedFullcolorColumnColor: #708fb1;- qproperty-FxColumnColor: #6d6349;- qproperty-FxColumnBorderColor: #4e4735;- qproperty-SelectedFxColumnColor: #787a6a;+ qproperty-FxColumnColor: #5e5645;+ qproperty-FxColumnBorderColor: #413b2f;+ qproperty-SelectedFxColumnColor: #6a6e66;qproperty-ReferenceColumnColor: #4d5052;qproperty-ReferenceColumnBorderColor: #353638;qproperty-SelectedReferenceColumnColor: #5b6872;qproperty-PaletteColumnColor: #42756e;qproperty-PaletteColumnBorderColor: #30544f;qproperty-SelectedPaletteColumnColor: #508b8c;- qproperty-MeshColumnColor: #5e4d72;- qproperty-MeshColumnBorderColor: #453854;- qproperty-SelectedMeshColumnColor: #6a6690;+ qproperty-MeshColumnColor: #594d75;+ qproperty-MeshColumnBorderColor: #423956;+ qproperty-SelectedMeshColumnColor: #656692;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qssindex 6b638fd4f..2309af892 100644--- a/stuff/config/qss/Dark/Dark.qss+++ b/stuff/config/qss/Dark/Dark.qss@@ -7,12 +7,11 @@ QToolButton,#CameraSettingsRadioButton::indicator,#ForceSquaredPixelButton,#EditToolLockButton::indicator,-#flipCustomize,-#SceneCast QToolBar QToolButton {+#flipCustomize {background-color: transparent;border: 1 solid transparent;border-radius: 2;- color: #f3f3f3;+ color: #e4e4e4;}.button-tool:hover,QToolButton:hover,@@ -22,11 +21,10 @@ QToolButton:hover,#colorSliderAddButton:hover,#colorSliderSubButton:hover,#EditToolLockButton::indicator:hover,-#flipCustomize:hover,-#SceneCast QToolBar QToolButton:hover {+#flipCustomize:hover {background-color: #595959;border-color: #595959;- color: #f3f3f3;+ color: #e4e4e4;}.button-tool:pressed,QToolButton:pressed,@@ -36,11 +34,10 @@ QToolButton:pressed,#colorSliderAddButton:pressed,#colorSliderSubButton:pressed,#EditToolLockButton::indicator:pressed,-#flipCustomize:pressed,-#SceneCast QToolBar QToolButton:pressed {+#flipCustomize:pressed {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}.button-tool:checked,QToolButton:checked,@@ -48,8 +45,7 @@ QToolButton:checked,#CameraSettingsRadioButton::indicator:checked,#ForceSquaredPixelButton:checked,#EditToolLockButton::indicator:checked,-#flipCustomize:checked,-#SceneCast QToolBar QToolButton:checked {+#flipCustomize:checked {background-color: #5385a6;border-color: #5385a6;color: #ffffff;@@ -60,8 +56,7 @@ QToolButton:checked:hover,#CameraSettingsRadioButton::indicator:checked:hover,#ForceSquaredPixelButton:checked:hover,#EditToolLockButton::indicator:checked:hover,-#flipCustomize:checked:hover,-#SceneCast QToolBar QToolButton:checked:hover {+#flipCustomize:checked:hover {background-color: #6c98b6;border-color: #6c98b6;}@@ -71,9 +66,8 @@ QToolButton:disabled,#CameraSettingsRadioButton::indicator:disabled,#ForceSquaredPixelButton:disabled,#EditToolLockButton::indicator:disabled,-#flipCustomize:disabled,-#SceneCast QToolBar QToolButton:disabled {- color: rgba(230, 230, 230, 0.4);+#flipCustomize:disabled {+ color: rgba(215, 215, 215, 0.4);}.button-tool:disabled:checked,QToolButton:disabled:checked,@@ -81,8 +75,7 @@ QToolButton:disabled:checked,#CameraSettingsRadioButton::indicator:disabled:checked,#ForceSquaredPixelButton:disabled:checked,#EditToolLockButton::indicator:disabled:checked,-#flipCustomize:disabled:checked,-#SceneCast QToolBar QToolButton:disabled:checked {+#flipCustomize:disabled:checked {background-color: rgba(83, 133, 166, 0.4);border-color: rgba(83, 133, 166, 0.4);}@@ -134,13 +127,13 @@ QTabBar::tab {background-color: #262626;border-right: 1 solid #0c0c0c;border-bottom: 1 solid #111111;- color: #999999;+ color: #909090;padding: 3 4 3 4;}.tab-flat:hover,QTabBar::tab:hover {background-color: #333333;- color: #999999;+ color: #909090;}.tab-flat:selected,QTabBar::tab:selected {@@ -158,13 +151,13 @@ QTabBar::tab:only-one {border-right: 1 solid #111111;border-left: 1 solid #111111;border-bottom: 1 solid #111111;- color: #999999;+ color: #909090;margin: 3 -1 0 0;padding: 2 7 1 7;}.tab-round:hover {background-color: #333333;- color: #999999;+ color: #909090;}.tab-round:selected {background-color: #303030;@@ -192,11 +185,11 @@ QTabBar::tab:only-one {QWidget,QTextEdit[readOnly="true"] {background-color: #303030;- color: #e6e6e6;+ color: #d7d7d7;}QWidget:disabled,QTextEdit[readOnly="true"]:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}QFrame {border: 0;@@ -262,7 +255,7 @@ QMenuBar::item {}QMenuBar::item:selected {background-color: rgba(255, 255, 255, 0.1);- color: #e6e6e6;+ color: #d7d7d7;}QMenuBar::item:pressed {background-color: #5385a6;@@ -279,13 +272,13 @@ QMenuBar::item:pressed {background-color: #262626;border-top: 1 solid #0c0c0c;border-right: 1 solid #0c0c0c;- color: #999999;+ color: #909090;margin: 0 0 -1 0;padding: 2 8 3 8;}#TopBarTab::tab:hover {background-color: #333333;- color: #999999;+ color: #909090;}#TopBarTab::tab:selected {background-color: #5385a6;@@ -310,8 +303,8 @@ QMenuBar::item:pressed {----------------------------------------------------------------------------- */QMenu {background-color: #262626;- border: 1 solid #4c4c4c;- color: #e6e6e6;+ border: 1 solid #3f3f3f;+ color: #d7d7d7;padding: 2 0;}QMenu::item {@@ -323,7 +316,7 @@ QMenu::item:selected {color: #ffffff;}QMenu::item:checked {- color: #e6e6e6;+ color: #d7d7d7;}QMenu::item:checked:selected {background-color: #5385a6;@@ -331,21 +324,21 @@ QMenu::item:checked:selected {}QMenu::item:disabled {background: none;- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}QMenu::item:disabled:selected {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);/* fix for disabled indicator */}QMenu::separator {- border-top: 1 solid #4c4c4c;+ border-top: 1 solid #3f3f3f;height: 0;margin: 2 0;}QMenu::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('../Default/imgs/white/none');@@ -355,7 +348,7 @@ QMenu::icon:checked {border: 1 solid #5385a6;}QMenu::indicator {- margin-left: 7;+ margin-left: 8;}/* -----------------------------------------------------------------------------Titlebars@@ -692,7 +685,7 @@ QTabBar QToolButton:pressed {border-color: #111111;}QTabBar QToolButton:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}/* -----------------------------------------------------------------------------Item Tree@@ -714,24 +707,30 @@ QTreeView::item:selected,background-color: #5385a6;color: #ffffff;}+.treeview::branch,+QTreeWidget::branch,+QTreeView::branch,+#FunctionEditorTree::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+}.treeview::branch:adjoins-item,QTreeWidget::branch:adjoins-item,QTreeView::branch:adjoins-item,#FunctionEditorTree::branch:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings,QTreeWidget::branch:has-siblings,QTreeView::branch:has-siblings,#FunctionEditorTree::branch:has-siblings {- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings:adjoins-item,QTreeWidget::branch:has-siblings:adjoins-item,QTreeView::branch:has-siblings:adjoins-item,#FunctionEditorTree::branch:has-siblings:adjoins-item {- border-image: url('');+ border-image: url('../Default/imgs/white/transparent_16x16.png');}.treeview::branch:has-children:closed,QTreeWidget::branch:has-children:closed,@@ -780,24 +779,24 @@ QListView {background-color: #4c4c4c;border: 1 solid #303030;border-radius: 2;- color: #f3f3f3;+ color: #e4e4e4;margin: 0;padding: 0;}#toolOptionsPanel QPushButton:hover {background-color: #595959;border-color: #303030;- color: #f3f3f3;+ color: #e4e4e4;}#toolOptionsPanel QPushButton:pressed {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}#toolOptionsPanel QPushButton:checked {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}#toolOptionsPanel QPushButton:checked:hover {background-color: #282828;@@ -808,7 +807,7 @@ QListView {#toolOptionsPanel QPushButton:disabled {background-color: #3d3d3d;border-color: #303030;- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}/* -----------------------------------------------------------------------------Push Button@@ -823,7 +822,7 @@ QComboBox {border-width: 1;border-style: solid;border-radius: 2;- color: #f3f3f3;+ color: #e4e4e4;margin: 0;padding: 3 15;}@@ -834,7 +833,7 @@ QPushButton:hover,#enableBlankFrameButton:hover {background-color: #595959;border-color: #303030;- color: #f3f3f3;+ color: #e4e4e4;}.Button:pressed,QPushButton:pressed,@@ -843,14 +842,14 @@ QPushButton:pressed,#enableBlankFrameButton:pressed {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}.Button:checked,QPushButton:checked,#enableBlankFrameButton:checked {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}.Button:checked:hover,QPushButton:checked:hover,@@ -872,7 +871,7 @@ QPushButton:disabled,QComboBox:disabled {background-color: #3d3d3d;border-color: #303030;- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}#PushButton_NoPadding {padding: 3;@@ -888,9 +887,9 @@ QComboBox {.ComboBox:editable,QComboBox:editable {/* for editable ComboBox */- color: #e6e6e6;+ color: #d7d7d7;background-color: #1c1c1c;- border-color: #565656;+ border-color: #4a4a4a;padding: 1 0 1 3;selection-background-color: #5385a6;selection-color: #ffffff;@@ -945,7 +944,7 @@ QComboBox::drop-down:disabled:editable {.ComboBox QAbstractItemView,QComboBox QAbstractItemView {background-color: #262626;- border: 1 solid #4c4c4c;+ border: 1 solid #3f3f3f;selection-background-color: #5385a6;selection-color: #ffffff;}@@ -960,9 +959,9 @@ QTextEdit,#tasksRemoveBox,#tasksAddBox {background-color: #1c1c1c;- border: 1 solid #565656;+ border: 1 solid #4a4a4a;border-radius: 2;- color: #e6e6e6;+ color: #d7d7d7;selection-background-color: #5385a6;selection-color: #ffffff;padding: 0 0 0 1;@@ -976,7 +975,7 @@ QTextEdit:focus,#tasksAddBox:focus {background-color: #1c1c1c;border-color: #5385a6;- color: #e6e6e6;+ color: #d7d7d7;}.LineEdit:disabled,QPlainTextEdit:disabled,@@ -986,8 +985,8 @@ QTextEdit:disabled,#tasksRemoveBox:disabled,#tasksAddBox:disabled {background-color: #262626;- border-color: #434343;- color: rgba(230, 230, 230, 0.4);+ border-color: #3d3d3d;+ color: rgba(215, 215, 215, 0.4);}QTextEdit[readOnly="true"] {border: 0;@@ -995,7 +994,7 @@ QTextEdit[readOnly="true"] {QTextEdit[readOnly="true"]:focus,QTextEdit[readOnly="true"]:disabled {background-color: #303030;- color: #e6e6e6;+ color: #d7d7d7;border: 0;}/* -----------------------------------------------------------------------------@@ -1003,7 +1002,7 @@ QTextEdit[readOnly="true"]:disabled {----------------------------------------------------------------------------- */.CheckBox,QCheckBox {- color: #e6e6e6;+ color: #d7d7d7;}.CheckBox:hover,QCheckBox:hover {@@ -1011,16 +1010,15 @@ QCheckBox:hover {}.CheckBox:disabled,QCheckBox:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}.CheckBox::indicator,QMenu::indicator:non-exclusive,-QMenu::indicator:non-exclusive,QCheckBox::indicator,.GroupBox::indicator,QGroupBox::indicator {background-color: #1c1c1c;- border: 1 solid #565656;+ border: 1 solid #4a4a4a;border-radius: 2;height: 9;/* fix for QGroupBox */@@ -1030,15 +1028,12 @@ QGroupBox::indicator {}.CheckBox::indicator:hover,QMenu::indicator:non-exclusive:hover,-QMenu::indicator:non-exclusive:hover,.CheckBox::indicator:checked:hover,.CheckBox::indicator:indeterminate:hover,QCheckBox::indicator:hover,.GroupBox::indicator:hover,QMenu::indicator:non-exclusive:checked:hover,QMenu::indicator:non-exclusive:indeterminate:hover,-QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:indeterminate:hover,QCheckBox::indicator:checked:hover,QCheckBox::indicator:indeterminate:hover,.GroupBox::indicator:checked:hover,@@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {}.CheckBox::indicator:checked,QMenu::indicator:non-exclusive:checked,-QMenu::indicator:non-exclusive:checked,QCheckBox::indicator:checked,.GroupBox::indicator:checked,QGroupBox::indicator:checked {@@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {}.CheckBox::indicator:checked:hover,QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:checked:hover,QCheckBox::indicator:checked:hover,.GroupBox::indicator:checked:hover,QGroupBox::indicator:checked:hover {@@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {}.CheckBox::indicator:checked:disabled,QMenu::indicator:non-exclusive:checked:disabled,-QMenu::indicator:non-exclusive:checked:disabled,QCheckBox::indicator:checked:disabled,.GroupBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled {@@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {}.CheckBox::indicator:indeterminate,QMenu::indicator:non-exclusive:indeterminate,-QMenu::indicator:non-exclusive:indeterminate,QCheckBox::indicator:indeterminate,.GroupBox::indicator:indeterminate,QGroupBox::indicator:indeterminate {@@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {}.CheckBox::indicator:indeterminate:disabled,QMenu::indicator:non-exclusive:indeterminate:disabled,-QMenu::indicator:non-exclusive:indeterminate:disabled,QCheckBox::indicator:indeterminate:disabled,.GroupBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled {@@ -1100,19 +1090,18 @@ QGroupBox::indicator:indeterminate:disabled {}.CheckBox::indicator:disabled,QMenu::indicator:non-exclusive:disabled,-QMenu::indicator:non-exclusive:disabled,QCheckBox::indicator:disabled,.GroupBox::indicator:disabled,QGroupBox::indicator:disabled {background-color: #262626;- border-color: #434343;+ border-color: #3d3d3d;}/* -----------------------------------------------------------------------------RadioButton----------------------------------------------------------------------------- */.RadioButton,QRadioButton {- color: #e6e6e6;+ color: #d7d7d7;padding: 0;margin: 0;}@@ -1122,15 +1111,14 @@ QRadioButton:hover {}.RadioButton:checked,QRadioButton:checked {- color: #e6e6e6;+ color: #d7d7d7;}.RadioButton:disabled,QRadioButton:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}.RadioButton::indicator,QMenu::indicator:exclusive,-QMenu::indicator:exclusive,QRadioButton::indicator,#CameraSettingsRadioButton_Small::indicator {width: 13;@@ -1141,28 +1129,24 @@ QRadioButton::indicator,}.RadioButton::indicator:unchecked,QMenu::indicator:exclusive:unchecked,-QMenu::indicator:exclusive:unchecked,QRadioButton::indicator:unchecked,#CameraSettingsRadioButton_Small::indicator:unchecked {image: url('../Default/imgs/white/radiobutton-dark_unchecked.svg');}.RadioButton::indicator:unchecked:hover,QMenu::indicator:exclusive:unchecked:hover,-QMenu::indicator:exclusive:unchecked:hover,QRadioButton::indicator:unchecked:hover,#CameraSettingsRadioButton_Small::indicator:unchecked:hover {image: url('../Default/imgs/white/radiobutton-dark_unchecked_hover.svg');}.RadioButton::indicator:checked,QMenu::indicator:exclusive:checked,-QMenu::indicator:exclusive:checked,QRadioButton::indicator:checked,#CameraSettingsRadioButton_Small::indicator:checked {image: url('../Default/imgs/white/radiobutton_checked.svg');}.RadioButton::indicator:checked:disabled,QMenu::indicator:exclusive:checked:disabled,-QMenu::indicator:exclusive:checked:disabled,QRadioButton::indicator:checked:disabled,#CameraSettingsRadioButton_Small::indicator:checked:disabled {background-color: transparent;@@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,}.RadioButton::indicator:disabled,QMenu::indicator:exclusive:disabled,-QMenu::indicator:exclusive:disabled,QRadioButton::indicator:disabled,#CameraSettingsRadioButton_Small::indicator:disabled {image: url('../Default/imgs/white/radiobutton-dark_unchecked_disabled.svg');@@ -1196,7 +1179,7 @@ QGroupBox::title:hover {}.GroupBox::title:disabled,QGroupBox::title:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}.GroupBox::indicator,QGroupBox::indicator {@@ -1205,7 +1188,7 @@ QGroupBox::indicator {}.GroupBox:disabled,QGroupBox:disabled {- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);}/* -----------------------------------------------------------------------------Slider@@ -1280,9 +1263,9 @@ QProgressBar::chunk {/* Right Pane----------------------------------------------------------------------------- */DvItemViewerPanel {- background-color: #282828;- qproperty-TextColor: #e6e6e6;- qproperty-AlternateBackground: #303030;+ background-color: #303030;+ qproperty-TextColor: #d7d7d7;+ qproperty-AlternateBackground: #383838;qproperty-SelectedTextColor: #ffffff;qproperty-FolderTextColor: #9fdaff;qproperty-SelectedItemBackground: #5385a6;@@ -1290,30 +1273,26 @@ DvItemViewerPanel {DvItemViewerTitleBar {qproperty-ColColor: #232323;qproperty-ColSortedColor: #232323;- qproperty-ColTextColor: #e6e6e6;+ qproperty-ColTextColor: #d7d7d7;qproperty-ColBorderColor: #111111;}-#FileBrowser,-#SceneCast {+#FileBrowser {background-color: #303030;}-#FileBrowser QLabel,-#SceneCast QLabel {+#FileBrowser QLabel {background-color: transparent;}-#FileBrowser QToolBar,-#SceneCast QToolBar {+#FileBrowser QToolBar {background-color: #303030;}-#FileBrowser #castFrame,-#SceneCast #castFrame {+#FileBrowser #castFrame {border-top: 1 solid #111111;border-right: 1 solid #111111;border-bottom: 1 solid #111111;margin: 0;}StyledTreeView {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-SelectedTextColor: #ffffff;qproperty-SelectedItemBackground: #5385a6;qproperty-FolderTextColor: #9fdaff;@@ -1377,7 +1356,7 @@ StyledTreeView {margin-bottom: 3;}ParamsPage {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;}/* -----------------------------------------------------------------------------Camera Settings@@ -1589,7 +1568,7 @@ PaletteViewer QToolBar #keyFrameNavigator #KeyTotal {margin: 0;}#PageViewer {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-SelectedBorderColor: #ffffff;qproperty-NumpadShortcutBgColor: rgba(0, 0, 0, 0.3);qproperty-NumpadShortcutBorderColor: #8d8d8d;@@ -1633,7 +1612,7 @@ QDialog #dialogButtonFrame QPushButton {QDialog #dialogButtonFrame QPushButton:focus {background-color: #5385a6;border-color: #262626;- color: #ffffff;+ color: #fdfdfd;}QDialog #dialogButtonFrame QPushButton:focus:hover {background-color: #6c98b6;@@ -1641,7 +1620,7 @@ QDialog #dialogButtonFrame QPushButton:focus:hover {QDialog #dialogButtonFrame QPushButton:focus:pressed {background-color: #141414;border-color: #0f0f0f;- color: #f3f3f3;+ color: #e4e4e4;}/* -----------------------------------------------------------------------------Scene Settings@@ -1667,7 +1646,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {#PreferencesPopup QListWidget::item:hover,#OutputSettingsPopup QListWidget::item:hover {background-color: rgba(255, 255, 255, 0.1);- color: #e6e6e6;+ color: #d7d7d7;}#PreferencesPopup QListWidget::item:selected,#OutputSettingsPopup QListWidget::item:selected {@@ -1717,15 +1696,15 @@ ProjectPopup QLabel {Schematic Viewer----------------------------------------------------------------------------- */SchematicViewer {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;- qproperty-ChildColumnColor: #6A526B;+ qproperty-ChildColumnColor: #6b4e69;qproperty-FullcolorColumnColor: #657A96;- qproperty-FxColumnColor: #6d6349;+ qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;- qproperty-MeshColumnColor: #5e4d72;+ qproperty-MeshColumnColor: #594d75;qproperty-ReferenceColumnColor: #3d3d3d;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -1777,7 +1756,7 @@ SchematicViewer {margin-bottom: 2;}#SchematicSceneViewer {- background-color: #232323;+ background-color: #262626;border-bottom: 1 solid #111111;}/* -----------------------------------------------------------------------------@@ -1817,7 +1796,7 @@ FxSettings QToolBar QToolButton {background-color: #595959;}ChannelBar {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;}/* Keyframe Button Colors----------------------------------------------------------------------------- */@@ -1852,7 +1831,7 @@ ParamFieldKeyToggle {Task Viewer----------------------------------------------------------------------------- */#TaskSheetItemLabel {- color: #e6e6e6;+ color: #d7d7d7;}#Tasks QToolBar {border-bottom: 1 solid #111111;@@ -1886,7 +1865,7 @@ ParamFieldKeyToggle {#expandButton:checked {background-color: transparent;border-color: transparent;- color: #e6e6e6;+ color: #d7d7d7;}#expandButton:checked:hover {background-color: #595959;@@ -2151,7 +2130,7 @@ FlipSlider {}Ruler {qproperty-ParentBGColor: #303030;- qproperty-ScaleColor: rgba(230, 230, 230, 0.7);+ qproperty-ScaleColor: rgba(215, 215, 215, 0.7);qproperty-HandleColor: #64b0e2;qproperty-HandleDragColor: yellow;qproperty-BorderColor: rgba(17, 17, 17, 0.7);@@ -2162,7 +2141,7 @@ Ruler {#enableBlankFrameButton {background-color: transparent;border-color: transparent;- color: rgba(230, 230, 230, 0.4);+ color: rgba(215, 215, 215, 0.4);padding: 0;font-weight: bold;}@@ -2225,7 +2204,7 @@ Ruler {/* XSheet Spreadsheet----------------------------------------------------------------------------- */XsheetViewer {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-ErrorTextColor: #ff7b7b;qproperty-BGColor: #303030;qproperty-LightLineColor: rgba(0, 0, 0, 0.3);@@ -2252,24 +2231,24 @@ XsheetViewer {qproperty-VectorColumnColor: #7B7B4C;qproperty-VectorColumnBorderColor: #5b5b39;qproperty-SelectedVectorColumnColor: #85906c;- qproperty-ChildColumnColor: #6A526B;- qproperty-ChildColumnBorderColor: #4d3c4e;- qproperty-SelectedChildColumnColor: #756a89;+ qproperty-ChildColumnColor: #6b4e69;+ qproperty-ChildColumnBorderColor: #4e384c;+ qproperty-SelectedChildColumnColor: #766787;qproperty-FullcolorColumnColor: #657A96;qproperty-FullcolorColumnBorderColor: #506178;qproperty-SelectedFullcolorColumnColor: #708fb1;- qproperty-FxColumnColor: #6d6349;- qproperty-FxColumnBorderColor: #4e4735;- qproperty-SelectedFxColumnColor: #787a6a;+ qproperty-FxColumnColor: #5e5645;+ qproperty-FxColumnBorderColor: #413b2f;+ qproperty-SelectedFxColumnColor: #6a6e66;qproperty-ReferenceColumnColor: #3d3d3d;qproperty-ReferenceColumnBorderColor: #232323;qproperty-SelectedReferenceColumnColor: #4b575e;qproperty-PaletteColumnColor: #42756e;qproperty-PaletteColumnBorderColor: #30544f;qproperty-SelectedPaletteColumnColor: #508b8c;- qproperty-MeshColumnColor: #5e4d72;- qproperty-MeshColumnBorderColor: #453854;- qproperty-SelectedMeshColumnColor: #6a6690;+ qproperty-MeshColumnColor: #594d75;+ qproperty-MeshColumnBorderColor: #423956;+ qproperty-SelectedMeshColumnColor: #656692;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;@@ -2345,7 +2324,7 @@ XsheetViewer {border-top: 1 solid #111111;}FunctionTreeView {- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;}/* Function Editor Spreadsheet----------------------------------------------------------------------------- */@@ -2365,7 +2344,7 @@ FunctionPanel {qproperty-FrameLineColor: rgba(0, 0, 0, 0.1);qproperty-OtherCurvesColor: #7d7d7d;qproperty-RulerBackground: #282828;- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-SubColor: #303030;qproperty-SelectedColor: #FFA500;}@@ -2388,7 +2367,7 @@ SpreadsheetViewer {qproperty-SelectedIgnoredInBetweenColor: #93807d;qproperty-SelectedEmptyColor: rgba(90, 100, 106, 0.5);qproperty-SelectedSceneRangeEmptyColor: rgba(90, 100, 106, 0.5);- qproperty-TextColor: #e6e6e6;+ qproperty-TextColor: #d7d7d7;qproperty-ColumnHeaderBorderColor: #4a4a4a;}#ExpressionField {diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qssindex bf3c7e3e5..9d4fb1d2a 100644--- a/stuff/config/qss/Default/Default.qss+++ b/stuff/config/qss/Default/Default.qss@@ -7,8 +7,7 @@ QToolButton,#CameraSettingsRadioButton::indicator,#ForceSquaredPixelButton,#EditToolLockButton::indicator,-#flipCustomize,-#SceneCast QToolBar QToolButton {+#flipCustomize {background-color: transparent;border: 1 solid transparent;border-radius: 2;@@ -22,8 +21,7 @@ QToolButton:hover,#colorSliderAddButton:hover,#colorSliderSubButton:hover,#EditToolLockButton::indicator:hover,-#flipCustomize:hover,-#SceneCast QToolBar QToolButton:hover {+#flipCustomize:hover {background-color: #717171;border-color: #717171;color: #f3f3f3;@@ -36,8 +34,7 @@ QToolButton:pressed,#colorSliderAddButton:pressed,#colorSliderSubButton:pressed,#EditToolLockButton::indicator:pressed,-#flipCustomize:pressed,-#SceneCast QToolBar QToolButton:pressed {+#flipCustomize:pressed {background-color: #2c2c2c;border-color: #272727;color: #f3f3f3;@@ -48,8 +45,7 @@ QToolButton:checked,#CameraSettingsRadioButton::indicator:checked,#ForceSquaredPixelButton:checked,#EditToolLockButton::indicator:checked,-#flipCustomize:checked,-#SceneCast QToolBar QToolButton:checked {+#flipCustomize:checked {background-color: #5385a6;border-color: #5385a6;color: #ffffff;@@ -60,8 +56,7 @@ QToolButton:checked:hover,#CameraSettingsRadioButton::indicator:checked:hover,#ForceSquaredPixelButton:checked:hover,#EditToolLockButton::indicator:checked:hover,-#flipCustomize:checked:hover,-#SceneCast QToolBar QToolButton:checked:hover {+#flipCustomize:checked:hover {background-color: #6c98b6;border-color: #6c98b6;}@@ -71,8 +66,7 @@ QToolButton:disabled,#CameraSettingsRadioButton::indicator:disabled,#ForceSquaredPixelButton:disabled,#EditToolLockButton::indicator:disabled,-#flipCustomize:disabled,-#SceneCast QToolBar QToolButton:disabled {+#flipCustomize:disabled {color: rgba(230, 230, 230, 0.4);}.button-tool:disabled:checked,@@ -81,8 +75,7 @@ QToolButton:disabled:checked,#CameraSettingsRadioButton::indicator:disabled:checked,#ForceSquaredPixelButton:disabled:checked,#EditToolLockButton::indicator:disabled:checked,-#flipCustomize:disabled:checked,-#SceneCast QToolBar QToolButton:disabled:checked {+#flipCustomize:disabled:checked {background-color: rgba(83, 133, 166, 0.4);border-color: rgba(83, 133, 166, 0.4);}@@ -345,7 +338,7 @@ QMenu::separator {QMenu::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('imgs/white/none');@@ -355,7 +348,7 @@ QMenu::icon:checked {border: 1 solid #5385a6;}QMenu::indicator {- margin-left: 7;+ margin-left: 8;}/* -----------------------------------------------------------------------------Titlebars@@ -714,24 +707,30 @@ QTreeView::item:selected,background-color: #5385a6;color: #ffffff;}+.treeview::branch,+QTreeWidget::branch,+QTreeView::branch,+#FunctionEditorTree::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+}.treeview::branch:adjoins-item,QTreeWidget::branch:adjoins-item,QTreeView::branch:adjoins-item,#FunctionEditorTree::branch:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings,QTreeWidget::branch:has-siblings,QTreeView::branch:has-siblings,#FunctionEditorTree::branch:has-siblings {- border-image: url('');+ border-image: url('imgs/white/transparent_16x16.png');}.treeview::branch:has-siblings:adjoins-item,QTreeWidget::branch:has-siblings:adjoins-item,QTreeView::branch:has-siblings:adjoins-item,#FunctionEditorTree::branch:has-siblings:adjoins-item {- border-image: url('');+ border-image: url('imgs/white/transparent_16x16.png');}.treeview::branch:has-children:closed,QTreeWidget::branch:has-children:closed,@@ -1015,7 +1014,6 @@ QCheckBox:disabled {}.CheckBox::indicator,QMenu::indicator:non-exclusive,-QMenu::indicator:non-exclusive,QCheckBox::indicator,.GroupBox::indicator,QGroupBox::indicator {@@ -1030,15 +1028,12 @@ QGroupBox::indicator {}.CheckBox::indicator:hover,QMenu::indicator:non-exclusive:hover,-QMenu::indicator:non-exclusive:hover,.CheckBox::indicator:checked:hover,.CheckBox::indicator:indeterminate:hover,QCheckBox::indicator:hover,.GroupBox::indicator:hover,QMenu::indicator:non-exclusive:checked:hover,QMenu::indicator:non-exclusive:indeterminate:hover,-QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:indeterminate:hover,QCheckBox::indicator:checked:hover,QCheckBox::indicator:indeterminate:hover,.GroupBox::indicator:checked:hover,@@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {}.CheckBox::indicator:checked,QMenu::indicator:non-exclusive:checked,-QMenu::indicator:non-exclusive:checked,QCheckBox::indicator:checked,.GroupBox::indicator:checked,QGroupBox::indicator:checked {@@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {}.CheckBox::indicator:checked:hover,QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:checked:hover,QCheckBox::indicator:checked:hover,.GroupBox::indicator:checked:hover,QGroupBox::indicator:checked:hover {@@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {}.CheckBox::indicator:checked:disabled,QMenu::indicator:non-exclusive:checked:disabled,-QMenu::indicator:non-exclusive:checked:disabled,QCheckBox::indicator:checked:disabled,.GroupBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled {@@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {}.CheckBox::indicator:indeterminate,QMenu::indicator:non-exclusive:indeterminate,-QMenu::indicator:non-exclusive:indeterminate,QCheckBox::indicator:indeterminate,.GroupBox::indicator:indeterminate,QGroupBox::indicator:indeterminate {@@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {}.CheckBox::indicator:indeterminate:disabled,QMenu::indicator:non-exclusive:indeterminate:disabled,-QMenu::indicator:non-exclusive:indeterminate:disabled,QCheckBox::indicator:indeterminate:disabled,.GroupBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled {@@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {}.CheckBox::indicator:disabled,QMenu::indicator:non-exclusive:disabled,-QMenu::indicator:non-exclusive:disabled,QCheckBox::indicator:disabled,.GroupBox::indicator:disabled,QGroupBox::indicator:disabled {@@ -1130,7 +1119,6 @@ QRadioButton:disabled {}.RadioButton::indicator,QMenu::indicator:exclusive,-QMenu::indicator:exclusive,QRadioButton::indicator,#CameraSettingsRadioButton_Small::indicator {width: 13;@@ -1141,28 +1129,24 @@ QRadioButton::indicator,}.RadioButton::indicator:unchecked,QMenu::indicator:exclusive:unchecked,-QMenu::indicator:exclusive:unchecked,QRadioButton::indicator:unchecked,#CameraSettingsRadioButton_Small::indicator:unchecked {image: url('imgs/white/radiobutton_unchecked.svg');}.RadioButton::indicator:unchecked:hover,QMenu::indicator:exclusive:unchecked:hover,-QMenu::indicator:exclusive:unchecked:hover,QRadioButton::indicator:unchecked:hover,#CameraSettingsRadioButton_Small::indicator:unchecked:hover {image: url('imgs/white/radiobutton_unchecked_hover.svg');}.RadioButton::indicator:checked,QMenu::indicator:exclusive:checked,-QMenu::indicator:exclusive:checked,QRadioButton::indicator:checked,#CameraSettingsRadioButton_Small::indicator:checked {image: url('imgs/white/radiobutton_checked.svg');}.RadioButton::indicator:checked:disabled,QMenu::indicator:exclusive:checked:disabled,-QMenu::indicator:exclusive:checked:disabled,QRadioButton::indicator:checked:disabled,#CameraSettingsRadioButton_Small::indicator:checked:disabled {background-color: transparent;@@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,}.RadioButton::indicator:disabled,QMenu::indicator:exclusive:disabled,-QMenu::indicator:exclusive:disabled,QRadioButton::indicator:disabled,#CameraSettingsRadioButton_Small::indicator:disabled {image: url('imgs/white/radiobutton_unchecked_disabled.svg');@@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {qproperty-ColTextColor: #e6e6e6;qproperty-ColBorderColor: #2c2c2c;}-#FileBrowser,-#SceneCast {+#FileBrowser {background-color: #484848;}-#FileBrowser QLabel,-#SceneCast QLabel {+#FileBrowser QLabel {background-color: transparent;}-#FileBrowser QToolBar,-#SceneCast QToolBar {+#FileBrowser QToolBar {background-color: #484848;}-#FileBrowser #castFrame,-#SceneCast #castFrame {+#FileBrowser #castFrame {border-top: 1 solid #2c2c2c;border-right: 1 solid #2c2c2c;border-bottom: 1 solid #2c2c2c;@@ -1721,11 +1700,11 @@ SchematicViewer {qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);qproperty-LevelColumnColor: #4C6E4C;qproperty-VectorColumnColor: #7B7B4C;- qproperty-ChildColumnColor: #6A526B;+ qproperty-ChildColumnColor: #6b4e69;qproperty-FullcolorColumnColor: #657A96;- qproperty-FxColumnColor: #6d6349;+ qproperty-FxColumnColor: #5e5645;qproperty-PaletteColumnColor: #42756e;- qproperty-MeshColumnColor: #5e4d72;+ qproperty-MeshColumnColor: #594d75;qproperty-ReferenceColumnColor: #555555;qproperty-TableColor: #62628c;qproperty-ActiveCameraColor: #4073a3;@@ -2252,24 +2231,24 @@ XsheetViewer {qproperty-VectorColumnColor: #7B7B4C;qproperty-VectorColumnBorderColor: #5b5b39;qproperty-SelectedVectorColumnColor: #85906c;- qproperty-ChildColumnColor: #6A526B;- qproperty-ChildColumnBorderColor: #4d3c4e;- qproperty-SelectedChildColumnColor: #756a89;+ qproperty-ChildColumnColor: #6b4e69;+ qproperty-ChildColumnBorderColor: #4e384c;+ qproperty-SelectedChildColumnColor: #766787;qproperty-FullcolorColumnColor: #657A96;qproperty-FullcolorColumnBorderColor: #506178;qproperty-SelectedFullcolorColumnColor: #708fb1;- qproperty-FxColumnColor: #6d6349;- qproperty-FxColumnBorderColor: #4e4735;- qproperty-SelectedFxColumnColor: #787a6a;+ qproperty-FxColumnColor: #5e5645;+ qproperty-FxColumnBorderColor: #413b2f;+ qproperty-SelectedFxColumnColor: #6a6e66;qproperty-ReferenceColumnColor: #555555;qproperty-ReferenceColumnBorderColor: #3b3b3b;qproperty-SelectedReferenceColumnColor: #616d74;qproperty-PaletteColumnColor: #42756e;qproperty-PaletteColumnBorderColor: #30544f;qproperty-SelectedPaletteColumnColor: #508b8c;- qproperty-MeshColumnColor: #5e4d72;- qproperty-MeshColumnBorderColor: #453854;- qproperty-SelectedMeshColumnColor: #6a6690;+ qproperty-MeshColumnColor: #594d75;+ qproperty-MeshColumnBorderColor: #423956;+ qproperty-SelectedMeshColumnColor: #656692;qproperty-SoundTextColumnColor: #a7a7a7;qproperty-SoundTextColumnBorderColor: #8e8e8e;qproperty-SelectedSoundTextColumnColor: #adb9c0;diff --git a/stuff/config/qss/Default/imgs/black/transparent_16x16.png b/stuff/config/qss/Default/imgs/black/transparent_16x16.pngnew file mode 100644index 000000000..8d036ea3cBinary files /dev/null and b/stuff/config/qss/Default/imgs/black/transparent_16x16.png differdiff --git a/stuff/config/qss/Default/imgs/white/transparent_16x16.png b/stuff/config/qss/Default/imgs/white/transparent_16x16.pngnew file mode 100644index 000000000..8d036ea3cBinary files /dev/null and b/stuff/config/qss/Default/imgs/white/transparent_16x16.png differdiff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.lessindex 873b8ab64..49a65d23d 100644--- a/stuff/config/qss/Default/less/Default.less+++ b/stuff/config/qss/Default/less/Default.less@@ -425,12 +425,12 @@@xsheet-LevelColumn-color: #4C6E4C;@xsheet-VectorColumn-color: #7B7B4C;-@xsheet-ChildColumn-color: #6A526B;+@xsheet-ChildColumn-color: #6b4e69;@xsheet-FullColorColumn-color: #657A96;-@xsheet-FxColumn-color: #6d6349;+@xsheet-FxColumn-color: #5e5645;@xsheet-ReferenceColumn-color: lighten(@bg, 5);@xsheet-PaletteColumn-color: #42756e;-@xsheet-MeshColumn-color: #5e4d72;+@xsheet-MeshColumn-color: #594d75;@xsheet-SoundTextColumn-color: #a7a7a7;@xsheet-SoundColumn-color: #578a8a;@xsheet-SoundColumnHL-color: #34FE5E;diff --git a/stuff/config/qss/Default/less/layouts/filebrowser.less b/stuff/config/qss/Default/less/layouts/filebrowser.lessindex dba8940b2..5084f762b 100644--- a/stuff/config/qss/Default/less/layouts/filebrowser.less+++ b/stuff/config/qss/Default/less/layouts/filebrowser.less@@ -80,7 +80,6 @@ StyledTreeView {----------------------------------------------------------------------------- */#SceneCast {- &:extend(#FileBrowser all);& QToolBar {border-top: 1 solid @accent;&::separator {diff --git a/stuff/config/qss/Default/less/layouts/mainwindow.less b/stuff/config/qss/Default/less/layouts/mainwindow.lessindex 5aaf60088..e79e69cfa 100644--- a/stuff/config/qss/Default/less/layouts/mainwindow.less+++ b/stuff/config/qss/Default/less/layouts/mainwindow.less@@ -167,7 +167,7 @@ QMenu {&::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('@{img-url}/none');@@ -183,13 +183,7 @@ QMenu {&:exclusive {&:extend(.RadioButton::indicator all);}- margin-left: 7;- &:non-exclusive {- &:extend(.CheckBox::indicator all);- }- &:exclusive {- &:extend(.RadioButton::indicator all);- }+ margin-left: 8;}}@@ -575,14 +569,17 @@ QTabBar {}&::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+ @blank_img: '@{img-url}/transparent_16x16.png';+&:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('@{blank_img}');}&:has-siblings {- border-image: url('');+ border-image: url('@{blank_img}');&:adjoins-item {- border-image: url('');+ border-image: url('@{blank_img}');}}&:has-children {diff --git a/stuff/config/qss/Default/less/themes/Dark.less b/stuff/config/qss/Default/less/themes/Dark.lessindex f429b03c2..b4b91c85a 100644--- a/stuff/config/qss/Default/less/themes/Dark.less+++ b/stuff/config/qss/Default/less/themes/Dark.less@@ -14,20 +14,21 @@@accent: darken(@bg, 12);@dock-bg-color: darken(@bg, 12);@tabbar-bg-color: darken(@bg, 4);+@text-color: rgb(215, 215, 215);// -----------------------------------------------------------------------------// Menu// -----------------------------------------------------------------------------@menu-bg-color: darken(@bg, 4);-@menu-border-color: lighten(@menu-bg-color, 15);+@menu-border-color: lighten(@menu-bg-color, 10);// -----------------------------------------------------------------------------// File Browser / Trees// -----------------------------------------------------------------------------@tree-bg-color: darken(@bg, 4);-@browser-itemview-bg-color: darken(@bg, 3);+@browser-itemview-bg-color: darken(@bg, 0);@prefs-tree-bg-color: darken(@bg, 4);// -----------------------------------------------------------------------------@@ -41,7 +42,7 @@// -----------------------------------------------------------------------------@input-bg-color: darken(@bg, 8);-@input-border-color: lighten(@bg, 15);+@input-border-color: lighten(@bg, 10);// -----------------------------------------------------------------------------// CheckBox@@ -111,4 +112,11 @@// Function Spreadsheet Viewer@function-ColumnHeaderBorder-color: lighten(@bg, 10);-@function-ColumnHeaderBG-color: darken(@bg, 4);\ No newline at end of file+@function-ColumnHeaderBG-color: darken(@bg, 4);++// -----------------------------------------------------------------------------+// Schematic Viewer+// -----------------------------------------------------------------------------++// Node Viewer+@schematic-viewer-bg-color: darken(@bg, 4);diff --git a/stuff/config/qss/Default/less/themes/Light.less b/stuff/config/qss/Default/less/themes/Light.lessindex b134facb0..0abf22be5 100644--- a/stuff/config/qss/Default/less/themes/Light.less+++ b/stuff/config/qss/Default/less/themes/Light.less@@ -44,10 +44,7 @@// -----------------------------------------------------------------------------// Container-@scrollbar-bg-color: darken(@bg, 5);-@scrollbar-handle-bg-color: darken(@bg, 28);-@scrollbar-handle-bg-color-hover: darken(@scrollbar-handle-bg-color, 10);-@scrollbar-handle-bg-color-pressed: darken(@scrollbar-handle-bg-color-hover, 15);+@scrollbar-handle-bg-color: darken(@bg, 15);// -----------------------------------------------------------------------------// Titlebars@@ -196,7 +193,7 @@@xsheet-NotEmptyColumn-color: @xsheet-bg-color;@xsheet-SelectedEmptyCell-color: fade(mix(lighten(@xsheet-EmptyCell-color, -20), @cellHighlightTintColor, 80), 50);-@xsheet-LevelColumn-color: #9ed49e;+@xsheet-LevelColumn-color: #a1cea1;@xsheet-VectorColumn-color: #d3cf9a;@xsheet-ChildColumn-color: #cca3cc;@xsheet-FullColorColumn-color: #b0cbdd;diff --git a/stuff/config/qss/Default/less/themes/Neutral.less b/stuff/config/qss/Default/less/themes/Neutral.lessindex 0edf12aa2..2cedd2a08 100644--- a/stuff/config/qss/Default/less/themes/Neutral.less+++ b/stuff/config/qss/Default/less/themes/Neutral.less@@ -51,8 +51,10 @@// Scrollbars// ------------------------------------------------------------------------------@scrollbar-bg-color: darken(@bg, 6);-@scrollbar-handle-bg-color: lighten(@bg, 10);+@scrollbar-bg-color: darken(@bg, 0);+@scrollbar-handle-bg-color: darken(@bg, 12);+@scrollbar-handle-bg-color-hover: darken(@scrollbar-handle-bg-color, 6);+@scrollbar-handle-bg-color-pressed: darken(@scrollbar-handle-bg-color-hover, 6);// -----------------------------------------------------------------------------// Palette Windowdiff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qssindex 5456b8725..2b3017ac3 100644--- a/stuff/config/qss/Light/Light.qss+++ b/stuff/config/qss/Light/Light.qss@@ -7,8 +7,7 @@ QToolButton,#CameraSettingsRadioButton::indicator,#ForceSquaredPixelButton,#EditToolLockButton::indicator,-#flipCustomize,-#SceneCast QToolBar QToolButton {+#flipCustomize {background-color: transparent;border: 1 solid transparent;border-radius: 2;@@ -22,8 +21,7 @@ QToolButton:hover,#colorSliderAddButton:hover,#colorSliderSubButton:hover,#EditToolLockButton::indicator:hover,-#flipCustomize:hover,-#SceneCast QToolBar QToolButton:hover {+#flipCustomize:hover {background-color: #b5b5b5;border-color: #a0a0a0;color: #0d0d0d;@@ -36,8 +34,7 @@ QToolButton:pressed,#colorSliderAddButton:pressed,#colorSliderSubButton:pressed,#EditToolLockButton::indicator:pressed,-#flipCustomize:pressed,-#SceneCast QToolBar QToolButton:pressed {+#flipCustomize:pressed {background-color: #8f8f8f;border-color: #7a7a7a;color: #0d0d0d;@@ -48,8 +45,7 @@ QToolButton:checked,#CameraSettingsRadioButton::indicator:checked,#ForceSquaredPixelButton:checked,#EditToolLockButton::indicator:checked,-#flipCustomize:checked,-#SceneCast QToolBar QToolButton:checked {+#flipCustomize:checked {background-color: #a0c1dd;border-color: #7aa8d0;color: #000;@@ -60,8 +56,7 @@ QToolButton:checked:hover,#CameraSettingsRadioButton::indicator:checked:hover,#ForceSquaredPixelButton:checked:hover,#EditToolLockButton::indicator:checked:hover,-#flipCustomize:checked:hover,-#SceneCast QToolBar QToolButton:checked:hover {+#flipCustomize:checked:hover {background-color: #bed5e8;border-color: #7aa8d0;}@@ -71,8 +66,7 @@ QToolButton:disabled,#CameraSettingsRadioButton::indicator:disabled,#ForceSquaredPixelButton:disabled,#EditToolLockButton::indicator:disabled,-#flipCustomize:disabled,-#SceneCast QToolBar QToolButton:disabled {+#flipCustomize:disabled {color: rgba(0, 0, 0, 0.4);}.button-tool:disabled:checked,@@ -81,8 +75,7 @@ QToolButton:disabled:checked,#CameraSettingsRadioButton::indicator:disabled:checked,#ForceSquaredPixelButton:disabled:checked,#EditToolLockButton::indicator:disabled:checked,-#flipCustomize:disabled:checked,-#SceneCast QToolBar QToolButton:disabled:checked {+#flipCustomize:disabled:checked {background-color: rgba(160, 193, 221, 0.4);border-color: rgba(160, 193, 221, 0.4);}@@ -345,7 +338,7 @@ QMenu::separator {QMenu::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('../Default/imgs/black/none');@@ -355,7 +348,7 @@ QMenu::icon:checked {border: 1 solid #7aa8d0;}QMenu::indicator {- margin-left: 7;+ margin-left: 8;}/* -----------------------------------------------------------------------------Titlebars@@ -382,10 +375,10 @@ TPanelTitleBarButton {Scrollbars----------------------------------------------------------------------------- */QAbstractScrollArea::corner {- background-color: #cecece;+ background-color: #dbdbdb;}QScrollBar {- background-color: #cecece;+ background-color: #dbdbdb;border: 0;}QScrollBar:horizontal {@@ -397,26 +390,26 @@ QScrollBar:vertical {width: 15;}QScrollBar::handle {- border: 0 solid #949494;+ border: 0 solid #b5b5b5;border-radius: 4;}QScrollBar::handle:horizontal:hover,QScrollBar::handle:vertical:hover {- background-color: #7a7a7a;- border-color: #7a7a7a;+ background-color: #a5a5a5;+ border-color: #a5a5a5;}QScrollBar::handle:horizontal:pressed,QScrollBar::handle:vertical:pressed {- background-color: #545454;- border-color: #545454;+ background-color: #969696;+ border-color: #969696;}QScrollBar::handle:horizontal {- background-color: #949494;+ background-color: #b5b5b5;margin: 3 16;min-width: 20;}QScrollBar::handle:vertical {- background-color: #949494;+ background-color: #b5b5b5;margin: 16 3 16 3;min-height: 20;}@@ -426,13 +419,13 @@ QScrollBar::add-line {}QScrollBar::add-line:horizontal {subcontrol-position: right;- background-color: #cecece;+ background-color: #dbdbdb;margin: 0;width: 16;}QScrollBar::add-line:vertical {subcontrol-position: bottom;- background-color: #cecece;+ background-color: #dbdbdb;margin: 0;height: 16;}@@ -442,13 +435,13 @@ QScrollBar::sub-line {}QScrollBar::sub-line:horizontal {subcontrol-position: left;- background-color: #cecece;+ background-color: #dbdbdb;margin: 0;width: 16;}QScrollBar::sub-line:vertical {subcontrol-position: top;- background-color: #cecece;+ background-color: #dbdbdb;margin: 0;height: 16;}@@ -714,24 +707,30 @@ QTreeView::item:selected,background-color: #a0c1dd;color: #000;}+.treeview::branch,+QTreeWidget::branch,+QTreeView::branch,+#FunctionEditorTree::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+}.treeview::branch:adjoins-item,QTreeWidget::branch:adjoins-item,QTreeView::branch:adjoins-item,#FunctionEditorTree::branch:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-siblings,QTreeWidget::branch:has-siblings,QTreeView::branch:has-siblings,#FunctionEditorTree::branch:has-siblings {- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-siblings:adjoins-item,QTreeWidget::branch:has-siblings:adjoins-item,QTreeView::branch:has-siblings:adjoins-item,#FunctionEditorTree::branch:has-siblings:adjoins-item {- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-children:closed,QTreeWidget::branch:has-children:closed,@@ -1015,7 +1014,6 @@ QCheckBox:disabled {}.CheckBox::indicator,QMenu::indicator:non-exclusive,-QMenu::indicator:non-exclusive,QCheckBox::indicator,.GroupBox::indicator,QGroupBox::indicator {@@ -1030,15 +1028,12 @@ QGroupBox::indicator {}.CheckBox::indicator:hover,QMenu::indicator:non-exclusive:hover,-QMenu::indicator:non-exclusive:hover,.CheckBox::indicator:checked:hover,.CheckBox::indicator:indeterminate:hover,QCheckBox::indicator:hover,.GroupBox::indicator:hover,QMenu::indicator:non-exclusive:checked:hover,QMenu::indicator:non-exclusive:indeterminate:hover,-QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:indeterminate:hover,QCheckBox::indicator:checked:hover,QCheckBox::indicator:indeterminate:hover,.GroupBox::indicator:checked:hover,@@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {}.CheckBox::indicator:checked,QMenu::indicator:non-exclusive:checked,-QMenu::indicator:non-exclusive:checked,QCheckBox::indicator:checked,.GroupBox::indicator:checked,QGroupBox::indicator:checked {@@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {}.CheckBox::indicator:checked:hover,QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:checked:hover,QCheckBox::indicator:checked:hover,.GroupBox::indicator:checked:hover,QGroupBox::indicator:checked:hover {@@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {}.CheckBox::indicator:checked:disabled,QMenu::indicator:non-exclusive:checked:disabled,-QMenu::indicator:non-exclusive:checked:disabled,QCheckBox::indicator:checked:disabled,.GroupBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled {@@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {}.CheckBox::indicator:indeterminate,QMenu::indicator:non-exclusive:indeterminate,-QMenu::indicator:non-exclusive:indeterminate,QCheckBox::indicator:indeterminate,.GroupBox::indicator:indeterminate,QGroupBox::indicator:indeterminate {@@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {}.CheckBox::indicator:indeterminate:disabled,QMenu::indicator:non-exclusive:indeterminate:disabled,-QMenu::indicator:non-exclusive:indeterminate:disabled,QCheckBox::indicator:indeterminate:disabled,.GroupBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled {@@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {}.CheckBox::indicator:disabled,QMenu::indicator:non-exclusive:disabled,-QMenu::indicator:non-exclusive:disabled,QCheckBox::indicator:disabled,.GroupBox::indicator:disabled,QGroupBox::indicator:disabled {@@ -1130,7 +1119,6 @@ QRadioButton:disabled {}.RadioButton::indicator,QMenu::indicator:exclusive,-QMenu::indicator:exclusive,QRadioButton::indicator,#CameraSettingsRadioButton_Small::indicator {width: 13;@@ -1141,28 +1129,24 @@ QRadioButton::indicator,}.RadioButton::indicator:unchecked,QMenu::indicator:exclusive:unchecked,-QMenu::indicator:exclusive:unchecked,QRadioButton::indicator:unchecked,#CameraSettingsRadioButton_Small::indicator:unchecked {image: url('../Default/imgs/black/radiobutton_unchecked.svg');}.RadioButton::indicator:unchecked:hover,QMenu::indicator:exclusive:unchecked:hover,-QMenu::indicator:exclusive:unchecked:hover,QRadioButton::indicator:unchecked:hover,#CameraSettingsRadioButton_Small::indicator:unchecked:hover {image: url('../Default/imgs/black/radiobutton_unchecked_hover.svg');}.RadioButton::indicator:checked,QMenu::indicator:exclusive:checked,-QMenu::indicator:exclusive:checked,QRadioButton::indicator:checked,#CameraSettingsRadioButton_Small::indicator:checked {image: url('../Default/imgs/black/radiobutton_checked.svg');}.RadioButton::indicator:checked:disabled,QMenu::indicator:exclusive:checked:disabled,-QMenu::indicator:exclusive:checked:disabled,QRadioButton::indicator:checked:disabled,#CameraSettingsRadioButton_Small::indicator:checked:disabled {background-color: transparent;@@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,}.RadioButton::indicator:disabled,QMenu::indicator:exclusive:disabled,-QMenu::indicator:exclusive:disabled,QRadioButton::indicator:disabled,#CameraSettingsRadioButton_Small::indicator:disabled {image: url('../Default/imgs/black/radiobutton_unchecked_disabled.svg');@@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {qproperty-ColTextColor: #000;qproperty-ColBorderColor: #a8a8a8;}-#FileBrowser,-#SceneCast {+#FileBrowser {background-color: #DBDBDB;}-#FileBrowser QLabel,-#SceneCast QLabel {+#FileBrowser QLabel {background-color: transparent;}-#FileBrowser QToolBar,-#SceneCast QToolBar {+#FileBrowser QToolBar {background-color: #DBDBDB;}-#FileBrowser #castFrame,-#SceneCast #castFrame {+#FileBrowser #castFrame {border-top: 1 solid #a8a8a8;border-right: 1 solid #a8a8a8;border-bottom: 1 solid #a8a8a8;@@ -1719,7 +1698,7 @@ ProjectPopup QLabel {SchematicViewer {qproperty-TextColor: #000;qproperty-VerticalLineColor: rgba(0, 0, 0, 0.15);- qproperty-LevelColumnColor: #9ed49e;+ qproperty-LevelColumnColor: #a1cea1;qproperty-VectorColumnColor: #d3cf9a;qproperty-ChildColumnColor: #cca3cc;qproperty-FullcolorColumnColor: #b0cbdd;@@ -2246,9 +2225,9 @@ XsheetViewer {qproperty-EmptyCellColor: #c2c2c2;qproperty-NotEmptyColumnColor: #cecece;qproperty-SelectedEmptyCellColor: rgba(146, 153, 158, 0.5);- qproperty-LevelColumnColor: #9ed49e;- qproperty-LevelColumnBorderColor: #72b472;- qproperty-SelectedLevelColumnColor: #92bfa0;+ qproperty-LevelColumnColor: #a1cea1;+ qproperty-LevelColumnBorderColor: #77ab77;+ qproperty-SelectedLevelColumnColor: #94bba2;qproperty-VectorColumnColor: #d3cf9a;qproperty-VectorColumnBorderColor: #b3ae6e;qproperty-SelectedVectorColumnColor: #b7bc9e;diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qssindex 0cf3c0029..48a367ee8 100644--- a/stuff/config/qss/Neutral/Neutral.qss+++ b/stuff/config/qss/Neutral/Neutral.qss@@ -7,8 +7,7 @@ QToolButton,#CameraSettingsRadioButton::indicator,#ForceSquaredPixelButton,#EditToolLockButton::indicator,-#flipCustomize,-#SceneCast QToolBar QToolButton {+#flipCustomize {background-color: transparent;border: 1 solid transparent;border-radius: 2;@@ -22,8 +21,7 @@ QToolButton:hover,#colorSliderAddButton:hover,#colorSliderSubButton:hover,#EditToolLockButton::indicator:hover,-#flipCustomize:hover,-#SceneCast QToolBar QToolButton:hover {+#flipCustomize:hover {background-color: #b3b3b3;border-color: #616161;color: #0d0d0d;@@ -36,8 +34,7 @@ QToolButton:pressed,#colorSliderAddButton:pressed,#colorSliderSubButton:pressed,#EditToolLockButton::indicator:pressed,-#flipCustomize:pressed,-#SceneCast QToolBar QToolButton:pressed {+#flipCustomize:pressed {background-color: #676767;border-color: #525252;color: #0d0d0d;@@ -48,8 +45,7 @@ QToolButton:checked,#CameraSettingsRadioButton::indicator:checked,#ForceSquaredPixelButton:checked,#EditToolLockButton::indicator:checked,-#flipCustomize:checked,-#SceneCast QToolBar QToolButton:checked {+#flipCustomize:checked {background-color: #8FA0B2;border-color: #445464;color: #000;@@ -60,8 +56,7 @@ QToolButton:checked:hover,#CameraSettingsRadioButton::indicator:checked:hover,#ForceSquaredPixelButton:checked:hover,#EditToolLockButton::indicator:checked:hover,-#flipCustomize:checked:hover,-#SceneCast QToolBar QToolButton:checked:hover {+#flipCustomize:checked:hover {background-color: #a7b5c3;border-color: #445464;}@@ -71,8 +66,7 @@ QToolButton:disabled,#CameraSettingsRadioButton::indicator:disabled,#ForceSquaredPixelButton:disabled,#EditToolLockButton::indicator:disabled,-#flipCustomize:disabled,-#SceneCast QToolBar QToolButton:disabled {+#flipCustomize:disabled {color: rgba(0, 0, 0, 0.4);}.button-tool:disabled:checked,@@ -81,8 +75,7 @@ QToolButton:disabled:checked,#CameraSettingsRadioButton::indicator:disabled:checked,#ForceSquaredPixelButton:disabled:checked,#EditToolLockButton::indicator:disabled:checked,-#flipCustomize:disabled:checked,-#SceneCast QToolBar QToolButton:disabled:checked {+#flipCustomize:disabled:checked {background-color: rgba(143, 160, 178, 0.4);border-color: rgba(143, 160, 178, 0.4);}@@ -345,7 +338,7 @@ QMenu::separator {QMenu::icon {border-radius: 2;position: absolute;- left: 5;+ left: 7;padding: 0;margin: 0;qproperty-icon: url('../Default/imgs/black/none');@@ -355,7 +348,7 @@ QMenu::icon:checked {border: 1 solid #445464;}QMenu::indicator {- margin-left: 7;+ margin-left: 8;}/* -----------------------------------------------------------------------------Titlebars@@ -382,10 +375,10 @@ TPanelTitleBarButton {Scrollbars----------------------------------------------------------------------------- */QAbstractScrollArea::corner {- background-color: #717171;+ background-color: #808080;}QScrollBar {- background-color: #717171;+ background-color: #808080;border: 0;}QScrollBar:horizontal {@@ -397,26 +390,26 @@ QScrollBar:vertical {width: 15;}QScrollBar::handle {- border: 0 solid #9a9a9a;+ border: 0 solid #616161;border-radius: 4;}QScrollBar::handle:horizontal:hover,QScrollBar::handle:vertical:hover {- background-color: #aeaeae;- border-color: #aeaeae;+ background-color: #525252;+ border-color: #525252;}QScrollBar::handle:horizontal:pressed,QScrollBar::handle:vertical:pressed {- background-color: #c2c2c2;- border-color: #c2c2c2;+ background-color: #434343;+ border-color: #434343;}QScrollBar::handle:horizontal {- background-color: #9a9a9a;+ background-color: #616161;margin: 3 16;min-width: 20;}QScrollBar::handle:vertical {- background-color: #9a9a9a;+ background-color: #616161;margin: 16 3 16 3;min-height: 20;}@@ -426,13 +419,13 @@ QScrollBar::add-line {}QScrollBar::add-line:horizontal {subcontrol-position: right;- background-color: #717171;+ background-color: #808080;margin: 0;width: 16;}QScrollBar::add-line:vertical {subcontrol-position: bottom;- background-color: #717171;+ background-color: #808080;margin: 0;height: 16;}@@ -442,13 +435,13 @@ QScrollBar::sub-line {}QScrollBar::sub-line:horizontal {subcontrol-position: left;- background-color: #717171;+ background-color: #808080;margin: 0;width: 16;}QScrollBar::sub-line:vertical {subcontrol-position: top;- background-color: #717171;+ background-color: #808080;margin: 0;height: 16;}@@ -714,24 +707,30 @@ QTreeView::item:selected,background-color: #8FA0B2;color: #000;}+.treeview::branch,+QTreeWidget::branch,+QTreeView::branch,+#FunctionEditorTree::branch {+ /* A blank URL may not hide the Qt branch style in Linux, so we add+ a transparent PNG which does. */+}.treeview::branch:adjoins-item,QTreeWidget::branch:adjoins-item,QTreeView::branch:adjoins-item,#FunctionEditorTree::branch:adjoins-item {- /* blank URL hides default Qt branch icons where it is not wanted */- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-siblings,QTreeWidget::branch:has-siblings,QTreeView::branch:has-siblings,#FunctionEditorTree::branch:has-siblings {- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-siblings:adjoins-item,QTreeWidget::branch:has-siblings:adjoins-item,QTreeView::branch:has-siblings:adjoins-item,#FunctionEditorTree::branch:has-siblings:adjoins-item {- border-image: url('');+ border-image: url('../Default/imgs/black/transparent_16x16.png');}.treeview::branch:has-children:closed,QTreeWidget::branch:has-children:closed,@@ -1015,7 +1014,6 @@ QCheckBox:disabled {}.CheckBox::indicator,QMenu::indicator:non-exclusive,-QMenu::indicator:non-exclusive,QCheckBox::indicator,.GroupBox::indicator,QGroupBox::indicator {@@ -1030,15 +1028,12 @@ QGroupBox::indicator {}.CheckBox::indicator:hover,QMenu::indicator:non-exclusive:hover,-QMenu::indicator:non-exclusive:hover,.CheckBox::indicator:checked:hover,.CheckBox::indicator:indeterminate:hover,QCheckBox::indicator:hover,.GroupBox::indicator:hover,QMenu::indicator:non-exclusive:checked:hover,QMenu::indicator:non-exclusive:indeterminate:hover,-QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:indeterminate:hover,QCheckBox::indicator:checked:hover,QCheckBox::indicator:indeterminate:hover,.GroupBox::indicator:checked:hover,@@ -1051,7 +1046,6 @@ QGroupBox::indicator:indeterminate:hover {}.CheckBox::indicator:checked,QMenu::indicator:non-exclusive:checked,-QMenu::indicator:non-exclusive:checked,QCheckBox::indicator:checked,.GroupBox::indicator:checked,QGroupBox::indicator:checked {@@ -1061,7 +1055,6 @@ QGroupBox::indicator:checked {}.CheckBox::indicator:checked:hover,QMenu::indicator:non-exclusive:checked:hover,-QMenu::indicator:non-exclusive:checked:hover,QCheckBox::indicator:checked:hover,.GroupBox::indicator:checked:hover,QGroupBox::indicator:checked:hover {@@ -1070,7 +1063,6 @@ QGroupBox::indicator:checked:hover {}.CheckBox::indicator:checked:disabled,QMenu::indicator:non-exclusive:checked:disabled,-QMenu::indicator:non-exclusive:checked:disabled,QCheckBox::indicator:checked:disabled,.GroupBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled {@@ -1080,7 +1072,6 @@ QGroupBox::indicator:checked:disabled {}.CheckBox::indicator:indeterminate,QMenu::indicator:non-exclusive:indeterminate,-QMenu::indicator:non-exclusive:indeterminate,QCheckBox::indicator:indeterminate,.GroupBox::indicator:indeterminate,QGroupBox::indicator:indeterminate {@@ -1090,7 +1081,6 @@ QGroupBox::indicator:indeterminate {}.CheckBox::indicator:indeterminate:disabled,QMenu::indicator:non-exclusive:indeterminate:disabled,-QMenu::indicator:non-exclusive:indeterminate:disabled,QCheckBox::indicator:indeterminate:disabled,.GroupBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled {@@ -1100,7 +1090,6 @@ QGroupBox::indicator:indeterminate:disabled {}.CheckBox::indicator:disabled,QMenu::indicator:non-exclusive:disabled,-QMenu::indicator:non-exclusive:disabled,QCheckBox::indicator:disabled,.GroupBox::indicator:disabled,QGroupBox::indicator:disabled {@@ -1130,7 +1119,6 @@ QRadioButton:disabled {}.RadioButton::indicator,QMenu::indicator:exclusive,-QMenu::indicator:exclusive,QRadioButton::indicator,#CameraSettingsRadioButton_Small::indicator {width: 13;@@ -1141,28 +1129,24 @@ QRadioButton::indicator,}.RadioButton::indicator:unchecked,QMenu::indicator:exclusive:unchecked,-QMenu::indicator:exclusive:unchecked,QRadioButton::indicator:unchecked,#CameraSettingsRadioButton_Small::indicator:unchecked {image: url('../Default/imgs/black/radiobutton_unchecked.svg');}.RadioButton::indicator:unchecked:hover,QMenu::indicator:exclusive:unchecked:hover,-QMenu::indicator:exclusive:unchecked:hover,QRadioButton::indicator:unchecked:hover,#CameraSettingsRadioButton_Small::indicator:unchecked:hover {image: url('../Default/imgs/black/radiobutton_unchecked_hover.svg');}.RadioButton::indicator:checked,QMenu::indicator:exclusive:checked,-QMenu::indicator:exclusive:checked,QRadioButton::indicator:checked,#CameraSettingsRadioButton_Small::indicator:checked {image: url('../Default/imgs/black/radiobutton_checked.svg');}.RadioButton::indicator:checked:disabled,QMenu::indicator:exclusive:checked:disabled,-QMenu::indicator:exclusive:checked:disabled,QRadioButton::indicator:checked:disabled,#CameraSettingsRadioButton_Small::indicator:checked:disabled {background-color: transparent;@@ -1170,7 +1154,6 @@ QRadioButton::indicator:checked:disabled,}.RadioButton::indicator:disabled,QMenu::indicator:exclusive:disabled,-QMenu::indicator:exclusive:disabled,QRadioButton::indicator:disabled,#CameraSettingsRadioButton_Small::indicator:disabled {image: url('../Default/imgs/black/radiobutton_unchecked_disabled.svg');@@ -1293,20 +1276,16 @@ DvItemViewerTitleBar {qproperty-ColTextColor: #000;qproperty-ColBorderColor: #5a5a5a;}-#FileBrowser,-#SceneCast {+#FileBrowser {background-color: #808080;}-#FileBrowser QLabel,-#SceneCast QLabel {+#FileBrowser QLabel {background-color: transparent;}-#FileBrowser QToolBar,-#SceneCast QToolBar {+#FileBrowser QToolBar {background-color: #808080;}-#FileBrowser #castFrame,-#SceneCast #castFrame {+#FileBrowser #castFrame {border-top: 1 solid #5a5a5a;border-right: 1 solid #5a5a5a;border-bottom: 1 solid #5a5a5a;