diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..35c33bea
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,21 @@
+{
+ "files.associations": {
+ "array": "cpp",
+ "bitset": "cpp",
+ "deque": "cpp",
+ "initializer_list": "cpp",
+ "list": "cpp",
+ "queue": "cpp",
+ "random": "cpp",
+ "regex": "cpp",
+ "stack": "cpp",
+ "type_traits": "cpp",
+ "valarray": "cpp",
+ "vector": "cpp",
+ "xhash": "cpp",
+ "xstring": "cpp",
+ "xtree": "cpp",
+ "xutility": "cpp",
+ "*.ipp": "cpp"
+ }
+}
\ No newline at end of file
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qss
index b00022f5..2065875b 100644
--- a/stuff/config/qss/Blue/Blue.qss
+++ b/stuff/config/qss/Blue/Blue.qss
@@ -120,7 +120,7 @@ PaletteViewer QToolBar QToolButton:hover {
}
.button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed {
- background-color: #212223;
+ background-color: #1c1d1e;
}
/* -----------------------------------------------------------------------------
Component: Frames
@@ -129,96 +129,19 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
-#CleanupSettingsFrame,
+#CleanupSettings #CleanupSettingsFrame,
+#CleanupSettings QScrollArea,
#OutputSettingsBox,
#OutputSettingsCameraBox,
#SolidLineFrame,
#FunctionParametersPanel,
QGroupBox {
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
Component: Icons
----------------------------------------------------------------------------- */
-/* -----------------------------------------------------------------------------
- Component: Tabs
------------------------------------------------------------------------------ */
-.tab-container,
-#TabBarContainer {
- background-color: transparent;
- qproperty-BottomAboveLineColor: #323435;
- qproperty-BottomBelowLineColor: #212223;
-}
-.tab-flat,
-#StopMotionTabBar::tab,
-#StyleEditorTabBar::tab,
-#PaletteTabBar::tab,
-#FxSettingsTabBar::tab {
- background-color: #323435;
- border-right: 1 solid #212223;
- border-bottom: 1 solid #212223;
- color: #94969a;
- padding: 3 4 3 4;
-}
-.tab-flat:hover,
-#StopMotionTabBar::tab:hover,
-#StyleEditorTabBar::tab:hover,
-#PaletteTabBar::tab:hover,
-#FxSettingsTabBar::tab:hover {
- background-color: #414345;
- color: #94969a;
-}
-.tab-flat:selected,
-#StopMotionTabBar::tab:selected,
-#StyleEditorTabBar::tab:selected,
-#PaletteTabBar::tab:selected,
-#FxSettingsTabBar::tab:selected {
- background-color: #414345;
- color: #ffffff;
- border-bottom-color: #414345;
-}
-.tab-flat:only-one,
-#StopMotionTabBar::tab:only-one,
-#StyleEditorTabBar::tab:only-one,
-#PaletteTabBar::tab:only-one,
-#FxSettingsTabBar::tab:only-one {
- margin: 0;
-}
-.tab-round {
- background-color: #323435;
- border-top: 1 solid #212223;
- border-right: 1 solid #212223;
- border-left: 1 solid #212223;
- border-bottom: 1 solid #212223;
- color: #94969a;
- margin: 3 -1 0 0;
- padding: 2 7 1 7;
-}
-.tab-round:hover {
- background-color: #414345;
- color: #94969a;
-}
-.tab-round:selected {
- background-color: #414345;
- border-top-right-radius: 2;
- border-top-left-radius: 2;
- border-bottom-color: #414345;
- color: #ffffff;
- margin: 1 -1 -1 0;
- padding: 2 7 2 7;
-}
-.tab-round:only-one {
- margin: 1 0 0 0;
- padding: 3 7 3 7;
-}
-.tab-round:last {
- margin-right: 0;
- border-top-right-radius: 2;
-}
-.tab-round:first {
- border-top-left-radius: 2;
-}
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
@@ -249,7 +172,7 @@ QSplitter::handle {
width: 4;
}
#TDockPlaceholder {
- background-color: #F77272;
+ background-color: rgba(0, 0, 0, 0.5);
}
TPanel {
background-color: #141516;
@@ -260,7 +183,7 @@ TPanel {
#TopBar {
background: #414345;
border: 0;
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
height: 21;
}
#TopBar #EditToolLockButton {
@@ -292,7 +215,7 @@ QMenuBar::item {
background-color: #414345;
border-left: 1 solid #414345;
margin: 0;
- padding: 3 5;
+ padding: 3 5 3 5;
}
QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15);
@@ -305,38 +228,33 @@ QMenuBar::item:pressed {
/* -----------------------------------------------------------------------------
Workspaces
----------------------------------------------------------------------------- */
-#TopBarTab {
- margin: 0;
- padding: 0;
-}
#TopBarTab::tab {
- background-color: #323435;
- border-top: 1 solid #212223;
- border-right: 1 solid #212223;
- color: #94969a;
- margin: 0 0 0 0;
- padding: 2 8 3 8;
+ margin: 0;
+ padding: 2 7 3 8;
+ border-bottom: 0;
}
-#TopBarTab::tab:hover {
- background-color: #414345;
- color: #94969a;
+#TopBarTab::tab:hover,
+#TopBarTab::tab:selected {
+ border-bottom: 0;
}
#TopBarTab::tab:selected {
- background-color: #414345;
color: #ffffff;
+ background-color: #5385a6;
}
-#TopBarTab::tab:first {
- border-left: 1 solid #212223;
-}
-#TopBarTab::tab:last {
- border-right: 1 solid #212223;
+#TopBarTab QToolButton {
+ border-left: 2 solid #1c1d1e;
+ border-top: 1 solid #1c1d1e;
+ border-right: 1 solid #1c1d1e;
+ border-bottom: 0;
+ margin-left: -1;
+ margin-top: 0;
}
/* -----------------------------------------------------------------------------
Menu
----------------------------------------------------------------------------- */
QMenu {
background-color: #414345;
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
color: #d6d8dd;
padding: 2 0;
}
@@ -365,14 +283,14 @@ QMenu::item:disabled:selected {
/* fix for disabled indicator */
}
QMenu::separator {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
height: 0;
margin: 2 0;
}
QMenu::icon {
border-radius: 2;
margin: 0 0 0 3;
- padding: 1;
+ padding: 0;
}
QMenu::icon:checked {
background-color: #5385a6;
@@ -385,7 +303,7 @@ QMenu::indicator {
----------------------------------------------------------------------------- */
TPanelTitleBar {
background-color: #323435;
- border-color: #212223;
+ border-color: #1c1d1e;
border-style: solid;
border-width: 0 0 1 0;
height: 20;
@@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none');
}
+TPanelTitleBarButton {
+ qproperty-RolloverColor: #6e7174;
+ qproperty-PressedColor: #5385a6;
+ qproperty-FreezeColor: #C34040;
+ qproperty-PreviewColor: #00ff9d;
+}
/* -----------------------------------------------------------------------------
Scrollbars
----------------------------------------------------------------------------- */
QAbstractScrollArea::corner {
- background-color: #2d2f30;
+ background-color: #28292b;
}
QScrollBar {
- background-color: #2d2f30;
+ background-color: #28292b;
border: 0;
}
QScrollBar:horizontal {
@@ -445,13 +369,13 @@ QScrollBar::add-line {
}
QScrollBar::add-line:horizontal {
subcontrol-position: right;
- background-color: #2d2f30;
+ background-color: #28292b;
margin: 0;
width: 16;
}
QScrollBar::add-line:vertical {
subcontrol-position: bottom;
- background-color: #2d2f30;
+ background-color: #28292b;
margin: 0;
height: 16;
}
@@ -461,13 +385,13 @@ QScrollBar::sub-line {
}
QScrollBar::sub-line:horizontal {
subcontrol-position: left;
- background-color: #2d2f30;
+ background-color: #28292b;
margin: 0;
width: 16;
}
QScrollBar::sub-line:vertical {
subcontrol-position: top;
- background-color: #2d2f30;
+ background-color: #28292b;
margin: 0;
height: 16;
}
@@ -512,12 +436,12 @@ QToolBar {
padding: 0;
}
QToolBar::separator:horizontal {
- border-left: 1 solid #212223;
+ border-left: 1 solid #1c1d1e;
margin: 0 1;
width: 0;
}
QToolBar::separator:vertical {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
height: 0;
margin: 1 0;
}
@@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton,
#ScrollUpButton QPushButton,
#ScrollDownButton QPushButton {
- background-color: #616467;
- border: 0 solid red;
+ background-color: #414345;
+ border: 0 solid #1c1d1e;
border-radius: 0;
padding: 0;
max-width: 16;
@@ -572,11 +496,11 @@ DvScrollWidget QPushButton:pressed,
min-width: 16;
}
#ScrollLeftButton {
- border-right: 1 solid #212223;
+ border-right: 1 solid #1c1d1e;
image: url('../Medium/imgs/white/scroll-left.svg');
}
#ScrollRightButton {
- border-left: 1 solid #212223;
+ border-left: 1 solid #1c1d1e;
margin-left: 3;
image: url('../Medium/imgs/white/scroll-right.svg');
}
@@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('../Medium/imgs/white/nextkey_disabled.svg');
}
/* -----------------------------------------------------------------------------
- Trees
+ Item Tree
----------------------------------------------------------------------------- */
.treeview,
QTreeWidget,
QTreeView,
#FunctionEditorTree {
- background-color: #2d2f30;
- alternate-background-color: #323435;
+ background-color: #28292b;
+ alternate-background-color: #303133;
border: 0;
margin: 0;
outline: 0;
@@ -688,14 +612,58 @@ QTreeView::branch:has-children:has-siblings:open,
}
QListView {
outline: 0;
- background: #2d2f30;
- alternate-background-color: #323435;
+ background: #28292b;
+ alternate-background-color: #303133;
}
/* -----------------------------------------------------------------------------
- Tab Systems
+ Tabs
----------------------------------------------------------------------------- */
#TabBarContainer {
background-color: #323435;
+ qproperty-BottomAboveLineColor: #323435;
+ qproperty-BottomBelowLineColor: #1c1d1e;
+}
+QTabBar {
+ background-color: #323435;
+ margin-bottom: 1;
+}
+QTabBar QToolButton {
+ background-color: #414345;
+ border-radius: 0;
+ margin-right: 0;
+ margin-top: -1;
+ margin-bottom: 0;
+ border-bottom: 1 solid #1c1d1e;
+ border-left: 1 solid #1c1d1e;
+ padding: 3 2 2 2;
+}
+QTabBar QToolButton:hover {
+ border-bottom: 1 solid #1c1d1e;
+ border-left: 1 solid #1c1d1e;
+}
+QTabBar QToolButton:disabled {
+ color: rgba(230, 230, 230, 0.4);
+}
+QTabBar::tab {
+ margin-top: -1;
+ background-color: #323435;
+ border: 1 solid #1c1d1e;
+ border-right: 0;
+ color: #94969a;
+ min-width: 8ex;
+ padding: 3 4 4 4;
+}
+QTabBar::tab:selected {
+ background-color: #414345;
+ border-bottom-color: #414345;
+ color: #d6d8dd;
+}
+QTabBar::tab:hover {
+ background-color: #414345;
+}
+QTabBar::tab:last,
+QTabBar::tab:only-one {
+ border-right: 1 solid #1c1d1e;
}
/* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget
@@ -861,7 +829,7 @@ QComboBox::drop-down:disabled:editable {
.ComboBox QAbstractItemView,
QComboBox QAbstractItemView {
background-color: #414345;
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
selection-background-color: #5385a6;
selection-color: #ffffff;
}
@@ -1158,7 +1126,7 @@ QSlider::handle:horizontal:disabled {
QProgressBar {
text-align: center;
background-color: #28292b;
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
border-radius: 3;
/* 2 fits inside 3 */
padding: 0;
@@ -1167,7 +1135,7 @@ QProgressBar::chunk {
margin: -1;
/* hide border of chunk except for right side */
background-color: #15a136;
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
@@ -1176,29 +1144,36 @@ QProgressBar::chunk {
/* Left Pane
----------------------------------------------------------------------------- */
#DirTreeView {
- background-color: #2d2f30;
- alternate-background-color: #2d2f30;
- border: 1 solid #212223;
+ background-color: #28292b;
+ alternate-background-color: #28292b;
+ border: 1 solid #1c1d1e;
border-right: 0;
}
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
qproperty-TextColor: #d6d8dd;
- qproperty-AlternateBackground: #3a3b3d;
+ qproperty-AlternateBackground: #303133;
qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6;
}
+DvItemViewerTitleBar {
+ qproperty-ColColor: #414345;
+ qproperty-ColSortedColor: #414345;
+ qproperty-ColTextColor: #d6d8dd;
+ qproperty-ColBorderColor: #1c1d1e;
+ qproperty-ColReliefColor: #414345;
+}
#FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel {
- background-color: #414345;
+ background-color: #28292b;
}
#FileBrowser #castFrame,
#SceneCast #castFrame {
- border-top: 1 solid #212223;
- border-right: 1 solid #212223;
- border-bottom: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
+ border-right: 1 solid #1c1d1e;
+ border-bottom: 1 solid #1c1d1e;
margin: 0;
}
#FileBrowser QToolButton,
@@ -1211,9 +1186,9 @@ StyledTreeView {
qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff;
- alternate-background-color: #323435;
- background-color: #2d2f30;
- border: 1 solid #212223;
+ alternate-background-color: #303133;
+ background-color: #28292b;
+ border: 1 solid #1c1d1e;
}
#FileDoesNotExistLabel {
color: #ff0000;
@@ -1222,7 +1197,7 @@ StyledTreeView {
Scene Cast
----------------------------------------------------------------------------- */
#SceneCast QToolBar {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
}
#SceneCast QToolButton {
margin: 3 1 2 1;
@@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0;
margin: 0;
}
+#CastBrowser QSplitter::handle {
+ height: 4;
+}
+#CastBrowserFolderName {
+ border-bottom: 1px solid #1c1d1e;
+}
/* -----------------------------------------------------------------------------
Level Strip
----------------------------------------------------------------------------- */
@@ -1347,14 +1328,14 @@ PencilTestPopup {
margin-left: -4;
}
#StopMotionController #bottomWidget {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
padding: 3 2 8 3;
}
#StopMotionController #bottomWidget QPushButton {
padding: 3 5;
}
#StopMotionTabBar::tab::first {
- border-left: 1 solid #212223;
+ border-left: 1 solid #1c1d1e;
}
/* -----------------------------------------------------------------------------
Unknowns + Legacy
@@ -1385,21 +1366,18 @@ QStatusBar #StatusBarLabel {
Style Editor
----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer {
- margin-left: -5;
+ margin-left: -5px;
}
#StyleEditor #bottomWidget {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
padding: 3 2 8 3;
}
#StyleEditor #bottomWidget QPushButton {
padding: 3 5;
}
-#StyleEditorTabBar {
- padding: 0;
- margin: 0;
-}
-#StyleEditorTabBar::tab:first {
- border-left: 1 solid #212223;
+#StyleEditorTabBar::tab:first,
+#StyleEditorTabBar::tab:only-one {
+ border-left: 0;
}
#HexagonalColorWheel {
qproperty-BGColor: #414345;
@@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center;
min-height: 16;
padding: 0;
- min-width: 18;
+ min-width: 10;
}
#colorSliderAddButton {
image: url('../Medium/imgs/white/scroll-right.svg');
@@ -1430,7 +1408,7 @@ QStatusBar #StatusBarLabel {
image: url('../Medium/imgs/white/scroll-left.svg');
}
#PlainColorPageParts {
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
}
#PlainColorPageParts QLineEdit {
max-width: 35;
@@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0;
padding: 2 0 2 0;
}
-#PaletteTabBar::tab {
- padding-bottom: 4;
+#PaletteTabBar::tab:first,
+#PaletteTabBar::tab:only-one {
+ border-left: 0;
+}
+#PaletteTabBar::tab:only-one {
+ border-right: 1 solid #1c1d1e;
}
#PageViewer {
qproperty-TextColor: #d6d8dd;
+ qproperty-ListLineColor: #1c1d1e;
}
#PaletteLockButton {
border-radius: 0;
@@ -1496,7 +1479,7 @@ QDialog {
}
QDialog #dialogButtonFrame {
background-color: #37393a;
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
}
QDialog #dialogButtonFrame QPushButton {
border-color: #37393a;
@@ -1525,9 +1508,9 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences
----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget {
- background-color: #2d2f30;
- alternate-background-color: #2d2f30;
- border: 1 solid #212223;
+ background-color: #28292b;
+ alternate-background-color: #28292b;
+ border: 1 solid #1c1d1e;
font-size: 13px;
}
#PreferencesPopup QListWidget::item {
@@ -1546,7 +1529,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Keyboard Shortcuts
----------------------------------------------------------------------------- */
#ShortcutTree {
- border: 1 solid #212223;
+ border: 1 solid #1c1d1e;
}
#ShortcutTree::item {
padding: 1 0;
@@ -1642,22 +1625,13 @@ SchematicViewer {
}
#SchematicSceneViewer {
background-color: #353638;
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
}
/* -----------------------------------------------------------------------------
FX Settings
----------------------------------------------------------------------------- */
-#FxSettingsTabBar::tab {
- border-top: 1 solid #212223;
-}
-#FxSettingsTabBar::tab::first,
-#FxSettingsTabBar::tab::only-one {
- border-left: 1 solid #212223;
-}
FxSettings QToolBar {
- border-top: 1 solid #212223;
- border-right: 1 solid #212223;
- border-left: 1 solid #212223;
+ border: 1 1 0 1 solid #1c1d1e;
min-height: 23;
padding: 3 0;
}
@@ -1701,7 +1675,7 @@ ChannelBar {
color: #d6d8dd;
}
#Tasks QToolBar {
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
margin: 0;
padding: 0;
}
@@ -1718,11 +1692,11 @@ ChannelBar {
Tool Options
----------------------------------------------------------------------------- */
#ToolOptions TPanelTitleBar {
- border-right: 1 solid #212223;
+ border-right: 1 solid #1c1d1e;
border-bottom: 0;
}
#CommandBar TPanelTitleBar {
- border-right: 1 solid #212223;
+ border-right: 1 solid #1c1d1e;
border-bottom: 0;
}
IconViewField {
@@ -1815,7 +1789,7 @@ QToolBar#WidePaddingToolBar QToolButton {
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
#ComboViewerPanel Toolbar {
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
}
#ComboViewerPanel Toolbar::separator:horizontal {
margin: 0 0 0 2;
@@ -1824,14 +1798,14 @@ QToolBar#WidePaddingToolBar QToolButton {
margin: 2 0 3 2;
}
#ComboViewerToolOptions {
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
}
#ComboViewer #ToolBarContainer,
#ViewerPanel #ToolBarContainer,
FlipBook #ToolBarContainer {
background-color: transparent;
- border-top: 2 solid #212223;
- border-bottom: 1 solid #212223;
+ border-top: 2 solid #1c1d1e;
+ border-bottom: 1 solid #1c1d1e;
padding-right: -1;
}
#flipCustomize {
@@ -2069,7 +2043,7 @@ XsheetViewer {
Function Editor
----------------------------------------------------------------------------- */
#FunctionEditor QToolBar {
- border-bottom: 1 solid #212223;
+ border-bottom: 1 solid #1c1d1e;
}
#FunctionEditor QToolBar QToolBar {
border: 0;
@@ -2081,7 +2055,7 @@ XsheetViewer {
height: 18;
}
#FunctionEditorTree {
- border-top: 1 solid #212223;
+ border-top: 1 solid #1c1d1e;
}
FunctionTreeView {
qproperty-TextColor: #d6d8dd;
diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss
index 69a7b406..eb9b5900 100644
--- a/stuff/config/qss/Dark/Dark.qss
+++ b/stuff/config/qss/Dark/Dark.qss
@@ -18,8 +18,8 @@
#CleanupSettingsShowButton:checked,
#OutputSettingsShowButton:checked,
#FxSettingsPreviewShowButton:checked {
- background-color: #1e1e1e;
- border-color: #191919;
+ background-color: #191919;
+ border-color: #141414;
image: url('../Medium/imgs/white/minus.svg');
}
.button-show:checked:pressed,
@@ -27,15 +27,15 @@
#CleanupSettingsShowButton:checked:pressed,
#OutputSettingsShowButton:checked:pressed,
#FxSettingsPreviewShowButton:checked:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
+ background-color: #191919;
+ border-color: #141414;
}
.button-show:checked:hover,
#LoadLevelShowButton:checked:hover,
#CleanupSettingsShowButton:checked:hover,
#OutputSettingsShowButton:checked:hover,
#FxSettingsPreviewShowButton:checked:hover {
- background-color: #232323;
+ background-color: #1e1e1e;
}
.button-tool,
QToolButton,
@@ -47,7 +47,7 @@ QToolButton,
background-color: rgba(255, 255, 255, 0);
border: 1 solid rgba(255, 255, 255, 0);
border-radius: 2;
- color: #f6f6f6;
+ color: #f3f3f3;
margin: 1;
padding: 0;
}
@@ -60,9 +60,9 @@ QToolButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
#EditToolLockButton::indicator:hover,
#flipCustomize:hover {
- background-color: #636363;
- border-color: #636363;
- color: #f6f6f6;
+ background-color: #5e5e5e;
+ border-color: #5e5e5e;
+ color: #f3f3f3;
}
.button-tool:pressed,
QToolButton:pressed,
@@ -73,9 +73,9 @@ QToolButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
#EditToolLockButton::indicator:pressed,
#flipCustomize:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
.button-tool:checked,
QToolButton:checked,
@@ -105,7 +105,7 @@ QToolButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
#EditToolLockButton::indicator:disabled,
#flipCustomize:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
.button-flat,
PaletteViewer QToolBar QToolButton {
@@ -116,7 +116,7 @@ PaletteViewer QToolBar QToolButton {
}
.button-flat:hover,
PaletteViewer QToolBar QToolButton:hover {
- background-color: #636363;
+ background-color: #5e5e5e;
}
.button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed {
@@ -129,7 +129,8 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
-#CleanupSettingsFrame,
+#CleanupSettings #CleanupSettingsFrame,
+#CleanupSettings QScrollArea,
#OutputSettingsBox,
#OutputSettingsCameraBox,
#SolidLineFrame,
@@ -141,93 +142,15 @@ QGroupBox {
/* -----------------------------------------------------------------------------
Component: Icons
----------------------------------------------------------------------------- */
-/* -----------------------------------------------------------------------------
- Component: Tabs
------------------------------------------------------------------------------ */
-.tab-container,
-#TabBarContainer {
- background-color: transparent;
- qproperty-BottomAboveLineColor: #262626;
- qproperty-BottomBelowLineColor: #161616;
-}
-.tab-flat,
-#StopMotionTabBar::tab,
-#StyleEditorTabBar::tab,
-#PaletteTabBar::tab,
-#FxSettingsTabBar::tab {
- background-color: #262626;
- border-right: 1 solid #161616;
- border-bottom: 1 solid #161616;
- color: #9b9b9b;
- padding: 3 4 3 4;
-}
-.tab-flat:hover,
-#StopMotionTabBar::tab:hover,
-#StyleEditorTabBar::tab:hover,
-#PaletteTabBar::tab:hover,
-#FxSettingsTabBar::tab:hover {
- background-color: #303030;
- color: #9b9b9b;
-}
-.tab-flat:selected,
-#StopMotionTabBar::tab:selected,
-#StyleEditorTabBar::tab:selected,
-#PaletteTabBar::tab:selected,
-#FxSettingsTabBar::tab:selected {
- background-color: #303030;
- color: #ffffff;
- border-bottom-color: #303030;
-}
-.tab-flat:only-one,
-#StopMotionTabBar::tab:only-one,
-#StyleEditorTabBar::tab:only-one,
-#PaletteTabBar::tab:only-one,
-#FxSettingsTabBar::tab:only-one {
- margin: 0;
-}
-.tab-round {
- background-color: #262626;
- border-top: 1 solid #161616;
- border-right: 1 solid #161616;
- border-left: 1 solid #161616;
- border-bottom: 1 solid #161616;
- color: #9b9b9b;
- margin: 3 -1 0 0;
- padding: 2 7 1 7;
-}
-.tab-round:hover {
- background-color: #303030;
- color: #9b9b9b;
-}
-.tab-round:selected {
- background-color: #303030;
- border-top-right-radius: 2;
- border-top-left-radius: 2;
- border-bottom-color: #303030;
- color: #ffffff;
- margin: 1 -1 -1 0;
- padding: 2 7 2 7;
-}
-.tab-round:only-one {
- margin: 1 0 0 0;
- padding: 3 7 3 7;
-}
-.tab-round:last {
- margin-right: 0;
- border-top-right-radius: 2;
-}
-.tab-round:first {
- border-top-left-radius: 2;
-}
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
background-color: #303030;
- color: #e9e9e9;
+ color: #e6e6e6;
}
QWidget:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
QFrame {
border: 0;
@@ -244,15 +167,15 @@ QToolTip,
#DockSeparator,
QMainWindow::separator,
QSplitter::handle {
- background-color: #0c0c0c;
+ background-color: #020202;
height: 4;
width: 4;
}
#TDockPlaceholder {
- background-color: #F77272;
+ background-color: rgba(0, 0, 0, 0.5);
}
TPanel {
- background-color: #0c0c0c;
+ background-color: #020202;
}
/* -----------------------------------------------------------------------------
Topbar
@@ -292,11 +215,11 @@ QMenuBar::item {
background-color: #303030;
border-left: 1 solid #303030;
margin: 0;
- padding: 3 5;
+ padding: 3 5 3 5;
}
QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15);
- color: #e9e9e9;
+ color: #e6e6e6;
}
QMenuBar::item:pressed {
background-color: #5385a6;
@@ -305,31 +228,26 @@ QMenuBar::item:pressed {
/* -----------------------------------------------------------------------------
Workspaces
----------------------------------------------------------------------------- */
-#TopBarTab {
- margin: 0;
- padding: 0;
-}
#TopBarTab::tab {
- background-color: #262626;
- border-top: 1 solid #161616;
- border-right: 1 solid #161616;
- color: #9b9b9b;
- margin: 0 0 0 0;
- padding: 2 8 3 8;
+ margin: 0;
+ padding: 2 7 3 8;
+ border-bottom: 0;
}
-#TopBarTab::tab:hover {
- background-color: #303030;
- color: #9b9b9b;
+#TopBarTab::tab:hover,
+#TopBarTab::tab:selected {
+ border-bottom: 0;
}
#TopBarTab::tab:selected {
- background-color: #303030;
color: #ffffff;
+ background-color: #5385a6;
}
-#TopBarTab::tab:first {
- border-left: 1 solid #161616;
-}
-#TopBarTab::tab:last {
+#TopBarTab QToolButton {
+ border-left: 2 solid #161616;
+ border-top: 1 solid #161616;
border-right: 1 solid #161616;
+ border-bottom: 0;
+ margin-left: -1;
+ margin-top: 0;
}
/* -----------------------------------------------------------------------------
Menu
@@ -337,7 +255,7 @@ QMenuBar::item:pressed {
QMenu {
background-color: #262626;
border: 1 solid #4c4c4c;
- color: #e9e9e9;
+ color: #e6e6e6;
padding: 2 0;
}
QMenu::item {
@@ -348,7 +266,7 @@ QMenu::item:selected {
color: #ffffff;
}
QMenu::item:checked {
- color: #e9e9e9;
+ color: #e6e6e6;
}
QMenu::item:checked:selected {
background-color: #5385a6;
@@ -356,12 +274,12 @@ QMenu::item:checked:selected {
}
QMenu::item:disabled {
background: none;
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
QMenu::item:disabled:selected {
background-color: #3a3a3a;
border-color: transparent;
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
/* fix for disabled indicator */
}
QMenu::separator {
@@ -372,7 +290,7 @@ QMenu::separator {
QMenu::icon {
border-radius: 2;
margin: 0 0 0 3;
- padding: 1;
+ padding: 0;
}
QMenu::icon:checked {
background-color: #5385a6;
@@ -384,7 +302,7 @@ QMenu::indicator {
Titlebars
----------------------------------------------------------------------------- */
TPanelTitleBar {
- background-color: #262626;
+ background-color: #212121;
border-color: #161616;
border-style: solid;
border-width: 0 0 1 0;
@@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none');
}
+TPanelTitleBarButton {
+ qproperty-RolloverColor: #5e5e5e;
+ qproperty-PressedColor: #5385a6;
+ qproperty-FreezeColor: #C34040;
+ qproperty-PreviewColor: #00ff9d;
+}
/* -----------------------------------------------------------------------------
Scrollbars
----------------------------------------------------------------------------- */
QAbstractScrollArea::corner {
- background-color: #262626;
+ background-color: #161616;
}
QScrollBar {
- background-color: #262626;
+ background-color: #161616;
border: 0;
}
QScrollBar:horizontal {
@@ -445,13 +369,13 @@ QScrollBar::add-line {
}
QScrollBar::add-line:horizontal {
subcontrol-position: right;
- background-color: #262626;
+ background-color: #161616;
margin: 0;
width: 16;
}
QScrollBar::add-line:vertical {
subcontrol-position: bottom;
- background-color: #262626;
+ background-color: #161616;
margin: 0;
height: 16;
}
@@ -461,13 +385,13 @@ QScrollBar::sub-line {
}
QScrollBar::sub-line:horizontal {
subcontrol-position: left;
- background-color: #262626;
+ background-color: #161616;
margin: 0;
width: 16;
}
QScrollBar::sub-line:vertical {
subcontrol-position: top;
- background-color: #262626;
+ background-color: #161616;
margin: 0;
height: 16;
}
@@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton,
#ScrollUpButton QPushButton,
#ScrollDownButton QPushButton {
- background-color: #565656;
- border: 0 solid red;
+ background-color: #303030;
+ border: 0 solid #161616;
border-radius: 0;
padding: 0;
max-width: 16;
@@ -554,7 +478,7 @@ DvScrollWidget QPushButton:hover,
#ScrollRightButton QPushButton:hover,
#ScrollUpButton QPushButton:hover,
#ScrollDownButton QPushButton:hover {
- background-color: #636363;
+ background-color: #5e5e5e;
}
.DvScrollWidget QPushButton:pressed,
DvScrollWidget QPushButton:pressed,
@@ -562,7 +486,7 @@ DvScrollWidget QPushButton:pressed,
#ScrollRightButton QPushButton:pressed,
#ScrollUpButton QPushButton:pressed,
#ScrollDownButton QPushButton:pressed {
- background-color: #1e1e1e;
+ background-color: #191919;
}
#ScrollLeftButton,
#ScrollRightButton,
@@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('../Medium/imgs/white/nextkey_disabled.svg');
}
/* -----------------------------------------------------------------------------
- Trees
+ Item Tree
----------------------------------------------------------------------------- */
.treeview,
QTreeWidget,
QTreeView,
#FunctionEditorTree {
- background-color: #262626;
- alternate-background-color: #2b2b2b;
+ background-color: #212121;
+ alternate-background-color: #282828;
border: 0;
margin: 0;
outline: 0;
@@ -688,51 +612,95 @@ QTreeView::branch:has-children:has-siblings:open,
}
QListView {
outline: 0;
- background: #262626;
- alternate-background-color: #2b2b2b;
+ background: #212121;
+ alternate-background-color: #282828;
}
/* -----------------------------------------------------------------------------
- Tab Systems
+ Tabs
----------------------------------------------------------------------------- */
#TabBarContainer {
- background-color: #262626;
+ background-color: #212121;
+ qproperty-BottomAboveLineColor: #212121;
+ qproperty-BottomBelowLineColor: #161616;
+}
+QTabBar {
+ background-color: #212121;
+ margin-bottom: 1;
+}
+QTabBar QToolButton {
+ background-color: #303030;
+ border-radius: 0;
+ margin-right: 0;
+ margin-top: -1;
+ margin-bottom: 0;
+ border-bottom: 1 solid #161616;
+ border-left: 1 solid #161616;
+ padding: 3 2 2 2;
+}
+QTabBar QToolButton:hover {
+ border-bottom: 1 solid #161616;
+ border-left: 1 solid #161616;
+}
+QTabBar QToolButton:disabled {
+ color: rgba(230, 230, 230, 0.4);
+}
+QTabBar::tab {
+ margin-top: -1;
+ background-color: #212121;
+ border: 1 solid #161616;
+ border-right: 0;
+ color: #979797;
+ min-width: 8ex;
+ padding: 3 4 4 4;
+}
+QTabBar::tab:selected {
+ background-color: #303030;
+ border-bottom-color: #303030;
+ color: #e6e6e6;
+}
+QTabBar::tab:hover {
+ background-color: #303030;
+}
+QTabBar::tab:last,
+QTabBar::tab:only-one {
+ border-right: 1 solid #161616;
}
/* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget
----------------------------------------------------------------------------- */
#toolOptionsPanel QPushButton {
- background-color: #565656;
+ background-color: #515151;
border: 1 solid #303030;
border-radius: 2;
- color: #f6f6f6;
+ color: #f3f3f3;
margin: 0;
padding: 0;
}
#toolOptionsPanel QPushButton:hover {
- background-color: #636363;
+ background-color: #5e5e5e;
border-color: #303030;
- color: #f6f6f6;
+ color: #f3f3f3;
}
#toolOptionsPanel QPushButton:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
#toolOptionsPanel QPushButton:checked {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
#toolOptionsPanel QPushButton:checked:hover {
- background-color: #232323;
+ background-color: #1e1e1e;
}
#toolOptionsPanel QPushButton:checked:hover:pressed {
- background: #1e1e1e;
+ background: #191919;
}
#toolOptionsPanel QPushButton:disabled {
background-color: #3d3d3d;
border-color: #303030;
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
/* -----------------------------------------------------------------------------
Push Button
@@ -743,10 +711,10 @@ QPushButton,
.ComboBox:checked,
QComboBox,
QComboBox:checked {
- background-color: #565656;
+ background-color: #515151;
border: 1 solid #303030;
border-radius: 2;
- color: #f6f6f6;
+ color: #f3f3f3;
margin: 0;
padding: 3 15;
}
@@ -754,31 +722,31 @@ QComboBox:checked {
QPushButton:hover,
#ViewerFpsSlider::sub-line:horizontal:hover,
#ViewerFpsSlider::add-line:horizontal:hover {
- background-color: #636363;
+ background-color: #5e5e5e;
border-color: #303030;
- color: #f6f6f6;
+ color: #f3f3f3;
}
.Button:pressed,
QPushButton:pressed,
#ViewerFpsSlider::sub-line:horizontal:pressed,
#ViewerFpsSlider::add-line:horizontal:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
.Button:checked,
QPushButton:checked {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
.Button:checked:hover,
QPushButton:checked:hover {
- background-color: #232323;
+ background-color: #1e1e1e;
}
.Button:checked:hover:pressed,
QPushButton:checked:hover:pressed {
- background: #1e1e1e;
+ background: #191919;
}
.Button:disabled,
QPushButton:disabled,
@@ -788,7 +756,7 @@ QPushButton:disabled,
QComboBox:disabled {
background-color: #3d3d3d;
border-color: #303030;
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
#PushButton_NoPadding {
padding: 3;
@@ -806,14 +774,14 @@ QComboBox:checked {
.ComboBox:editable,
QComboBox:editable {
/* for editable ComboBox */
- color: #e9e9e9;
+ color: #e6e6e6;
background-color: #1c1c1c;
border-color: #4a4a4a;
padding: 1 0 1 3;
}
.ComboBox:hover,
QComboBox:hover {
- background-color: #636363;
+ background-color: #5e5e5e;
}
.ComboBox:hover:editable,
QComboBox:hover:editable {
@@ -836,18 +804,18 @@ QComboBox::drop-down {
}
.ComboBox::drop-down:editable,
QComboBox::drop-down:editable {
- background-color: #565656;
+ background-color: #515151;
border-left: 0 solid #303030;
border-top-right-radius: 1;
border-bottom-right-radius: 1;
}
.ComboBox::drop-down:hover,
QComboBox::drop-down:hover {
- border-color: #636363;
+ border-color: #5e5e5e;
}
.ComboBox::drop-down:hover:editable,
QComboBox::drop-down:hover:editable {
- background-color: #636363;
+ background-color: #5e5e5e;
border-color: #303030;
}
.ComboBox::drop-down:disabled,
@@ -877,7 +845,7 @@ QLineEdit,
background-color: #1c1c1c;
border: 1 solid #4a4a4a;
border-radius: 2;
- color: #e9e9e9;
+ color: #e6e6e6;
selection-background-color: #5385a6;
selection-color: #ffffff;
padding: 0 0 0 1;
@@ -890,7 +858,7 @@ QLineEdit:focus,
#tasksAddBox:focus {
background-color: #1c1c1c;
border-color: #5385a6;
- color: #e9e9e9;
+ color: #e6e6e6;
}
.LineEdit:disabled,
QPlainTextEdit:disabled,
@@ -900,14 +868,14 @@ QLineEdit:disabled,
#tasksAddBox:disabled {
background-color: #262626;
border-color: #3d3d3d;
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
/* -----------------------------------------------------------------------------
CheckBox
----------------------------------------------------------------------------- */
.CheckBox,
QCheckBox {
- color: #e9e9e9;
+ color: #e6e6e6;
}
.CheckBox:hover,
QCheckBox:hover {
@@ -915,7 +883,7 @@ QCheckBox:hover {
}
.CheckBox:disabled,
QCheckBox:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
.CheckBox::indicator,
QMenu::indicator:non-exclusive,
@@ -924,7 +892,7 @@ QCheckBox::indicator,
.GroupBox::indicator,
QGroupBox::indicator {
background-color: #1c1c1c;
- border: 1 solid #636363;
+ border: 1 solid #4a4a4a;
border-radius: 2;
height: 9;
/* fix for QGroupBox */
@@ -1016,7 +984,7 @@ QGroupBox::indicator:disabled {
----------------------------------------------------------------------------- */
.RadioButton,
QRadioButton {
- color: #e9e9e9;
+ color: #e6e6e6;
padding: 0;
margin: 0;
}
@@ -1026,11 +994,11 @@ QRadioButton:hover {
}
.RadioButton:checked,
QRadioButton:checked {
- color: #e9e9e9;
+ color: #e6e6e6;
}
.RadioButton:disabled,
QRadioButton:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
.RadioButton::indicator,
QMenu::indicator:exclusive,
@@ -1100,7 +1068,7 @@ QGroupBox::title:hover {
}
.GroupBox::title:disabled,
QGroupBox::title:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
.GroupBox::indicator,
QGroupBox::indicator {
@@ -1109,7 +1077,7 @@ QGroupBox::indicator {
}
.GroupBox:disabled,
QGroupBox:disabled {
- color: rgba(233, 233, 233, 0.4);
+ color: rgba(230, 230, 230, 0.4);
}
/* -----------------------------------------------------------------------------
Slider
@@ -1176,23 +1144,30 @@ QProgressBar::chunk {
/* Left Pane
----------------------------------------------------------------------------- */
#DirTreeView {
- background-color: #262626;
- alternate-background-color: #262626;
+ background-color: #212121;
+ alternate-background-color: #212121;
border: 1 solid #161616;
border-right: 0;
}
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-AlternateBackground: #282828;
qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6;
}
+DvItemViewerTitleBar {
+ qproperty-ColColor: #303030;
+ qproperty-ColSortedColor: #303030;
+ qproperty-ColTextColor: #e6e6e6;
+ qproperty-ColBorderColor: #161616;
+ qproperty-ColReliefColor: #303030;
+}
#FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel {
- background-color: #303030;
+ background-color: #212121;
}
#FileBrowser #castFrame,
#SceneCast #castFrame {
@@ -1206,13 +1181,13 @@ DvItemViewerPanel {
padding: 1;
}
StyledTreeView {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-SelectedTextColor: #ffffff;
qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff;
- alternate-background-color: #2b2b2b;
- background-color: #262626;
+ alternate-background-color: #282828;
+ background-color: #212121;
border: 1 solid #161616;
}
#FileDoesNotExistLabel {
@@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0;
margin: 0;
}
+#CastBrowser QSplitter::handle {
+ height: 4;
+}
+#CastBrowserFolderName {
+ border-bottom: 1px solid #161616;
+}
/* -----------------------------------------------------------------------------
Level Strip
----------------------------------------------------------------------------- */
@@ -1253,7 +1234,7 @@ StyledTreeView {
margin-bottom: 3;
}
ParamsPage {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
}
/* -----------------------------------------------------------------------------
Camera Settings
@@ -1385,7 +1366,7 @@ QStatusBar #StatusBarLabel {
Style Editor
----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer {
- margin-left: -5;
+ margin-left: -5px;
}
#StyleEditor #bottomWidget {
border-top: 1 solid #161616;
@@ -1394,12 +1375,9 @@ QStatusBar #StatusBarLabel {
#StyleEditor #bottomWidget QPushButton {
padding: 3 5;
}
-#StyleEditorTabBar {
- padding: 0;
- margin: 0;
-}
-#StyleEditorTabBar::tab:first {
- border-left: 1 solid #161616;
+#StyleEditorTabBar::tab:first,
+#StyleEditorTabBar::tab:only-one {
+ border-left: 0;
}
#HexagonalColorWheel {
qproperty-BGColor: #303030;
@@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center;
min-height: 16;
padding: 0;
- min-width: 18;
+ min-width: 10;
}
#colorSliderAddButton {
image: url('../Medium/imgs/white/scroll-right.svg');
@@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0;
padding: 2 0 2 0;
}
-#PaletteTabBar::tab {
- padding-bottom: 4;
+#PaletteTabBar::tab:first,
+#PaletteTabBar::tab:only-one {
+ border-left: 0;
+}
+#PaletteTabBar::tab:only-one {
+ border-right: 1 solid #161616;
}
#PageViewer {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
+ qproperty-ListLineColor: #161616;
}
#PaletteLockButton {
border-radius: 0;
@@ -1495,25 +1478,25 @@ QDialog {
background-color: #303030;
}
QDialog #dialogButtonFrame {
- background-color: #282828;
+ background-color: #262626;
border-top: 1 solid #161616;
}
QDialog #dialogButtonFrame QPushButton {
- border-color: #282828;
+ border-color: #262626;
outline: 0;
}
QDialog #dialogButtonFrame QPushButton:focus {
background-color: #5385a6;
- border-color: #282828;
+ border-color: #262626;
color: #ffffff;
}
QDialog #dialogButtonFrame QPushButton:focus:hover {
background-color: #6c98b6;
}
QDialog #dialogButtonFrame QPushButton:focus:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
- color: #f6f6f6;
+ background-color: #191919;
+ border-color: #141414;
+ color: #f3f3f3;
}
/* -----------------------------------------------------------------------------
Scene Settings
@@ -1525,8 +1508,8 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences
----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget {
- background-color: #262626;
- alternate-background-color: #262626;
+ background-color: #212121;
+ alternate-background-color: #212121;
border: 1 solid #161616;
font-size: 13px;
}
@@ -1535,7 +1518,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
padding: 3;
}
#PreferencesPopup QListWidget::item:hover {
- color: #e9e9e9;
+ color: #e6e6e6;
background-color: rgba(255, 255, 255, 0.15);
}
#PreferencesPopup QListWidget::item:selected {
@@ -1590,7 +1573,7 @@ ProjectPopup QLabel {
Schematic Viewer
----------------------------------------------------------------------------- */
SchematicViewer {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.6);
qproperty-LevelColumnColor: #4C6E4C;
qproperty-VectorColumnColor: #7B7B4C;
@@ -1647,17 +1630,8 @@ SchematicViewer {
/* -----------------------------------------------------------------------------
FX Settings
----------------------------------------------------------------------------- */
-#FxSettingsTabBar::tab {
- border-top: 1 solid #161616;
-}
-#FxSettingsTabBar::tab::first,
-#FxSettingsTabBar::tab::only-one {
- border-left: 1 solid #161616;
-}
FxSettings QToolBar {
- border-top: 1 solid #161616;
- border-right: 1 solid #161616;
- border-left: 1 solid #161616;
+ border: 1 1 0 1 solid #161616;
min-height: 23;
padding: 3 0;
}
@@ -1677,7 +1651,7 @@ FxSettings QToolBar QToolBar {
background-color: #a8bee7;
}
ChannelBar {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
}
/* -----------------------------------------------------------------------------
Script Console
@@ -1692,13 +1666,13 @@ ChannelBar {
background-color: #dcdcdc;
}
#ScriptConsole TPanelTitleBar {
- background-color: #262626;
+ background-color: #212121;
}
/* -----------------------------------------------------------------------------
Task Viewer
----------------------------------------------------------------------------- */
#TaskSheetItemLabel {
- color: #e9e9e9;
+ color: #e6e6e6;
}
#Tasks QToolBar {
border-bottom: 1 solid #161616;
@@ -1801,15 +1775,15 @@ QToolBar#WidePaddingToolBar QToolButton {
#expandButton:checked {
background-color: transparent;
border-color: transparent;
- color: #e9e9e9;
+ color: #e6e6e6;
}
#expandButton:checked:hover {
- background-color: #636363;
- border-color: #636363;
+ background-color: #5e5e5e;
+ border-color: #5e5e5e;
}
#expandButton:checked:pressed {
- background-color: #1e1e1e;
- border-color: #191919;
+ background-color: #191919;
+ border-color: #141414;
}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
@@ -1867,7 +1841,7 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
}
#ViewerFpsSlider::sub-line:horizontal {
subcontrol-origin: absolute;
- background-color: #565656;
+ background-color: #515151;
border: 1 solid #303030;
border-top-left-radius: 2;
border-bottom-left-radius: 2;
@@ -1877,7 +1851,7 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
}
#ViewerFpsSlider::add-line:horizontal {
subcontrol-position: left;
- background-color: #565656;
+ background-color: #515151;
border: 1 solid #303030;
border-top-right-radius: 2;
border-bottom-right-radius: 2;
@@ -1907,12 +1881,12 @@ FlipSlider {
qproperty-PBMarkerMarginRight: 3;
qproperty-notStartedColor: rgba(205, 101, 101, 0.78);
qproperty-startedColor: #1abc3f;
- qproperty-baseColor: #1c1c1c;
- qproperty-finishedColor: #1c1c1c;
+ qproperty-baseColor: #161616;
+ qproperty-finishedColor: #161616;
}
Ruler {
qproperty-ParentBGColor: #303030;
- qproperty-ScaleColor: #e9e9e9;
+ qproperty-ScaleColor: #e6e6e6;
}
#RulerToolOptionValues {
color: #000000;
@@ -1955,7 +1929,7 @@ Ruler {
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
XsheetViewer {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-BGColor: #2b2b2b;
qproperty-LightLineColor: rgba(0, 0, 0, 0.25);
qproperty-MarkerLineColor: #1E96C4;
@@ -2084,7 +2058,7 @@ XsheetViewer {
border-top: 1 solid #161616;
}
FunctionTreeView {
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
}
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
@@ -2094,7 +2068,7 @@ FunctionPanel {
qproperty-FrameLineColor: #161616;
qproperty-OtherCurvesColor: #707070;
qproperty-RulerBackground: #1b1b1b;
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-SubColor: #000;
qproperty-SelectedColor: #FFA500;
}
@@ -2113,7 +2087,7 @@ SpreadsheetViewer {
qproperty-SelectedInBetweenColor: #7d7a6c;
qproperty-SelectedEmptyColor: #545454;
qproperty-SelectedSceneRangeEmptyColor: #5d5d5d;
- qproperty-TextColor: #e9e9e9;
+ qproperty-TextColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #686868;
}
#ExpressionField {
diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qss
index 545c94b5..dbc5973c 100644
--- a/stuff/config/qss/Light/Light.qss
+++ b/stuff/config/qss/Light/Light.qss
@@ -18,8 +18,8 @@
#CleanupSettingsShowButton:checked,
#OutputSettingsShowButton:checked,
#FxSettingsPreviewShowButton:checked {
- background-color: #5a5a5a;
- border-color: #454545;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
image: url('../Medium/imgs/black/minus.svg');
}
.button-show:checked:pressed,
@@ -27,15 +27,15 @@
#CleanupSettingsShowButton:checked:pressed,
#OutputSettingsShowButton:checked:pressed,
#FxSettingsPreviewShowButton:checked:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
}
.button-show:checked:hover,
#LoadLevelShowButton:checked:hover,
#CleanupSettingsShowButton:checked:hover,
#OutputSettingsShowButton:checked:hover,
#FxSettingsPreviewShowButton:checked:hover {
- background-color: #5f5f5f;
+ background-color: #bababa;
}
.button-tool,
QToolButton,
@@ -60,8 +60,8 @@ QToolButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
#EditToolLockButton::indicator:hover,
#flipCustomize:hover {
- background-color: #bbbbbb;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
.button-tool:pressed,
@@ -73,8 +73,8 @@ QToolButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
#EditToolLockButton::indicator:pressed,
#flipCustomize:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
.button-tool:checked,
@@ -84,9 +84,9 @@ QToolButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
#EditToolLockButton::indicator:checked,
#flipCustomize:checked {
- background-color: #5a5a5a;
- border-color: #454545;
- color: #c0c0c0;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
+ color: #ffffff;
}
.button-tool:checked:hover,
QToolButton:checked:hover,
@@ -95,8 +95,8 @@ QToolButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
#EditToolLockButton::indicator:checked:hover,
#flipCustomize:checked:hover {
- background-color: #6e6e6e;
- border-color: #454545;
+ background-color: #c9c9c9;
+ border-color: #a0a0a0;
}
.button-tool:disabled,
QToolButton:disabled,
@@ -105,7 +105,7 @@ QToolButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
#EditToolLockButton::indicator:disabled,
#flipCustomize:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
.button-flat,
PaletteViewer QToolBar QToolButton {
@@ -116,11 +116,11 @@ PaletteViewer QToolBar QToolButton {
}
.button-flat:hover,
PaletteViewer QToolBar QToolButton:hover {
- background-color: #bbbbbb;
+ background-color: #ffffff;
}
.button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed {
- background-color: #404040;
+ background-color: #9b9b9b;
}
/* -----------------------------------------------------------------------------
Component: Frames
@@ -129,105 +129,28 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
-#CleanupSettingsFrame,
+#CleanupSettings #CleanupSettingsFrame,
+#CleanupSettings QScrollArea,
#OutputSettingsBox,
#OutputSettingsCameraBox,
#SolidLineFrame,
#FunctionParametersPanel,
QGroupBox {
- border: 1 solid #404040;
+ border: 1 solid #9b9b9b;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
Component: Icons
----------------------------------------------------------------------------- */
-/* -----------------------------------------------------------------------------
- Component: Tabs
------------------------------------------------------------------------------ */
-.tab-container,
-#TabBarContainer {
- background-color: transparent;
- qproperty-BottomAboveLineColor: #5a5a5a;
- qproperty-BottomBelowLineColor: #404040;
-}
-.tab-flat,
-#StopMotionTabBar::tab,
-#StyleEditorTabBar::tab,
-#PaletteTabBar::tab,
-#FxSettingsTabBar::tab {
- background-color: #5a5a5a;
- border-right: 1 solid #404040;
- border-bottom: 1 solid #404040;
- color: #c0c0c0;
- padding: 3 4 3 4;
-}
-.tab-flat:hover,
-#StopMotionTabBar::tab:hover,
-#StyleEditorTabBar::tab:hover,
-#PaletteTabBar::tab:hover,
-#FxSettingsTabBar::tab:hover {
- background-color: #6e6e6e;
- color: #fff;
-}
-.tab-flat:selected,
-#StopMotionTabBar::tab:selected,
-#StyleEditorTabBar::tab:selected,
-#PaletteTabBar::tab:selected,
-#FxSettingsTabBar::tab:selected {
- background-color: #808080;
- color: #000;
- border-bottom-color: #808080;
-}
-.tab-flat:only-one,
-#StopMotionTabBar::tab:only-one,
-#StyleEditorTabBar::tab:only-one,
-#PaletteTabBar::tab:only-one,
-#FxSettingsTabBar::tab:only-one {
- margin: 0;
-}
-.tab-round {
- background-color: #5a5a5a;
- border-top: 1 solid #404040;
- border-right: 1 solid #404040;
- border-left: 1 solid #404040;
- border-bottom: 1 solid #404040;
- color: #c0c0c0;
- margin: 3 -1 0 0;
- padding: 2 7 1 7;
-}
-.tab-round:hover {
- background-color: #6e6e6e;
- color: #fff;
-}
-.tab-round:selected {
- background-color: #808080;
- border-top-right-radius: 2;
- border-top-left-radius: 2;
- border-bottom-color: #808080;
- color: #000;
- margin: 1 -1 -1 0;
- padding: 2 7 2 7;
-}
-.tab-round:only-one {
- margin: 1 0 0 0;
- padding: 3 7 3 7;
-}
-.tab-round:last {
- margin-right: 0;
- border-top-right-radius: 2;
-}
-.tab-round:first {
- border-top-left-radius: 2;
-}
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
QWidget {
- background-color: #808080;
+ background-color: #DBDBDB;
color: #000;
}
QWidget:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
QFrame {
border: 0;
@@ -244,27 +167,27 @@ QToolTip,
#DockSeparator,
QMainWindow::separator,
QSplitter::handle {
- background-color: #272727;
+ background-color: #828282;
height: 4;
width: 4;
}
#TDockPlaceholder {
- background-color: #F77272;
+ background-color: rgba(0, 0, 0, 0.5);
}
TPanel {
- background-color: #272727;
+ background-color: #828282;
}
/* -----------------------------------------------------------------------------
Topbar
----------------------------------------------------------------------------- */
#TopBar {
- background: #808080;
+ background: #DBDBDB;
border: 0;
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
height: 21;
}
#TopBar #EditToolLockButton {
- background: #808080;
+ background: #DBDBDB;
spacing: 0;
}
#TopBar #EditToolLockButton::indicator {
@@ -276,7 +199,7 @@ TPanel {
padding-right: 0;
}
#TopBarTabContainer {
- background-color: #808080;
+ background-color: #DBDBDB;
margin-bottom: 1;
}
#StackedMenuBar {
@@ -285,58 +208,53 @@ TPanel {
padding: 0;
}
QMenuBar {
- background-color: #808080;
+ background-color: #DBDBDB;
border: 0;
}
QMenuBar::item {
- background-color: #808080;
- border-left: 1 solid #808080;
+ background-color: #DBDBDB;
+ border-left: 1 solid #DBDBDB;
margin: 0;
- padding: 3 5;
+ padding: 3 5 3 5;
}
QMenuBar::item:selected {
- background-color: #9f9f9f;
+ background-color: #fafafa;
color: #000;
}
QMenuBar::item:pressed {
- background-color: #225baf;
- color: #FFFFFF;
+ background-color: #F19A86;
+ color: #000000;
}
/* -----------------------------------------------------------------------------
Workspaces
----------------------------------------------------------------------------- */
-#TopBarTab {
- margin: 0;
- padding: 0;
-}
#TopBarTab::tab {
- background-color: #5a5a5a;
- border-top: 1 solid #404040;
- border-right: 1 solid #404040;
- color: #afafaf;
- margin: 0 0 0 0;
- padding: 2 8 3 8;
+ margin: 0;
+ padding: 2 7 3 8;
+ border-bottom: 0;
}
-#TopBarTab::tab:hover {
- background-color: #6e6e6e;
- color: #fff;
+#TopBarTab::tab:hover,
+#TopBarTab::tab:selected {
+ border-bottom: 0;
}
#TopBarTab::tab:selected {
- background-color: #808080;
- color: #000;
+ color: #000000;
+ background-color: #F19A86;
}
-#TopBarTab::tab:first {
- border-left: 1 solid #404040;
-}
-#TopBarTab::tab:last {
- border-right: 1 solid #404040;
+#TopBarTab QToolButton {
+ border-left: 2 solid #9b9b9b;
+ border-top: 1 solid #9b9b9b;
+ border-right: 1 solid #9b9b9b;
+ border-bottom: 0;
+ margin-left: -1;
+ margin-top: 0;
}
/* -----------------------------------------------------------------------------
Menu
----------------------------------------------------------------------------- */
QMenu {
- background-color: #9a9a9a;
- border: 1 solid #404040;
+ background-color: #f4f4f4;
+ border: 1 solid #9b9b9b;
color: #000;
padding: 2 0;
}
@@ -344,38 +262,38 @@ QMenu::item {
padding: 3 28;
}
QMenu::item:selected {
- background-color: #225baf;
- color: #FFFFFF;
+ background-color: #F19A86;
+ color: #000000;
}
QMenu::item:checked {
color: #000;
}
QMenu::item:checked:selected {
- background-color: #225baf;
- color: #FFFFFF;
+ background-color: #F19A86;
+ color: #000000;
}
QMenu::item:disabled {
background: none;
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
QMenu::item:disabled:selected {
- background-color: #858585;
+ background-color: #e0e0e0;
border-color: transparent;
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
/* fix for disabled indicator */
}
QMenu::separator {
- border-top: 1 solid #737373;
+ border-top: 1 solid #cecece;
height: 0;
margin: 2 0;
}
QMenu::icon {
border-radius: 2;
margin: 0 0 0 3;
- padding: 1;
+ padding: 0;
}
QMenu::icon:checked {
- background-color: #225baf;
+ background-color: #F19A86;
}
QMenu::indicator {
margin-left: 7;
@@ -384,27 +302,33 @@ QMenu::indicator {
Titlebars
----------------------------------------------------------------------------- */
TPanelTitleBar {
- background-color: #5a5a5a;
- border-color: #404040;
+ background-color: #b5b5b5;
+ border-color: #9b9b9b;
border-style: solid;
border-width: 0 0 1 0;
height: 20;
min-height: 20;
- qproperty-TitleColor: #c0c0c0;
+ qproperty-TitleColor: #ffffff;
qproperty-ActiveTitleColor: #fff;
qproperty-BorderPixmap: url('none');
qproperty-ActiveBorderPixmap: url('../Medium/imgs/black/none');
qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/black/none');
}
+TPanelTitleBarButton {
+ qproperty-RolloverColor: #ffffff;
+ qproperty-PressedColor: #F19A86;
+ qproperty-FreezeColor: #C34040;
+ qproperty-PreviewColor: #00ff9d;
+}
/* -----------------------------------------------------------------------------
Scrollbars
----------------------------------------------------------------------------- */
QAbstractScrollArea::corner {
- background-color: #737373;
+ background-color: #cecece;
}
QScrollBar {
- background-color: #737373;
+ background-color: #cecece;
border: 0;
}
QScrollBar:horizontal {
@@ -416,26 +340,26 @@ QScrollBar:vertical {
width: 16;
}
QScrollBar::handle {
- border: 1 solid #5a5a5a;
+ border: 1 solid #b5b5b5;
border-radius: 5;
}
QScrollBar::handle:horizontal:hover,
QScrollBar::handle:vertical:hover {
- background-color: #aeaeae;
- border-color: #5a5a5a;
+ background-color: #ffffff;
+ border-color: #b5b5b5;
}
QScrollBar::handle:horizontal:pressed,
QScrollBar::handle:vertical:pressed {
- background-color: #c2c2c2;
- border-color: #5a5a5a;
+ background-color: #ffffff;
+ border-color: #b5b5b5;
}
QScrollBar::handle:horizontal {
- background-color: #9a9a9a;
+ background-color: #f4f4f4;
margin: 2 16;
min-width: 20;
}
QScrollBar::handle:vertical {
- background-color: #9a9a9a;
+ background-color: #f4f4f4;
margin: 16 2;
min-height: 20;
}
@@ -445,13 +369,13 @@ QScrollBar::add-line {
}
QScrollBar::add-line:horizontal {
subcontrol-position: right;
- background-color: #737373;
+ background-color: #cecece;
margin: 0;
width: 16;
}
QScrollBar::add-line:vertical {
subcontrol-position: bottom;
- background-color: #737373;
+ background-color: #cecece;
margin: 0;
height: 16;
}
@@ -461,13 +385,13 @@ QScrollBar::sub-line {
}
QScrollBar::sub-line:horizontal {
subcontrol-position: left;
- background-color: #737373;
+ background-color: #cecece;
margin: 0;
width: 16;
}
QScrollBar::sub-line:vertical {
subcontrol-position: top;
- background-color: #737373;
+ background-color: #cecece;
margin: 0;
height: 16;
}
@@ -512,12 +436,12 @@ QToolBar {
padding: 0;
}
QToolBar::separator:horizontal {
- border-left: 1 solid #404040;
+ border-left: 1 solid #9b9b9b;
margin: 0 1;
width: 0;
}
QToolBar::separator:vertical {
- border-top: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
height: 0;
margin: 1 0;
}
@@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton,
#ScrollUpButton QPushButton,
#ScrollDownButton QPushButton {
- background-color: #a6a6a6;
- border: 0 solid red;
+ background-color: #DBDBDB;
+ border: 0 solid #9b9b9b;
border-radius: 0;
padding: 0;
max-width: 16;
@@ -554,7 +478,7 @@ DvScrollWidget QPushButton:hover,
#ScrollRightButton QPushButton:hover,
#ScrollUpButton QPushButton:hover,
#ScrollDownButton QPushButton:hover {
- background-color: #bbbbbb;
+ background-color: #ffffff;
}
.DvScrollWidget QPushButton:pressed,
DvScrollWidget QPushButton:pressed,
@@ -562,7 +486,7 @@ DvScrollWidget QPushButton:pressed,
#ScrollRightButton QPushButton:pressed,
#ScrollUpButton QPushButton:pressed,
#ScrollDownButton QPushButton:pressed {
- background-color: #e1e1e1;
+ background-color: #ffffff;
}
#ScrollLeftButton,
#ScrollRightButton,
@@ -572,11 +496,11 @@ DvScrollWidget QPushButton:pressed,
min-width: 16;
}
#ScrollLeftButton {
- border-right: 1 solid #404040;
+ border-right: 1 solid #9b9b9b;
image: url('../Medium/imgs/black/scroll-left.svg');
}
#ScrollRightButton {
- border-left: 1 solid #404040;
+ border-left: 1 solid #9b9b9b;
margin-left: 3;
image: url('../Medium/imgs/black/scroll-right.svg');
}
@@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('../Medium/imgs/black/nextkey_disabled.svg');
}
/* -----------------------------------------------------------------------------
- Trees
+ Item Tree
----------------------------------------------------------------------------- */
.treeview,
QTreeWidget,
QTreeView,
#FunctionEditorTree {
- background-color: #737373;
- alternate-background-color: #7b7b7b;
+ background-color: #dbdbdb;
+ alternate-background-color: #e3e3e3;
border: 0;
margin: 0;
outline: 0;
@@ -630,8 +554,8 @@ QTreeView,
QTreeWidget::item:selected,
QTreeView::item:selected,
#FunctionEditorTree::item:selected {
- background-color: #225baf;
- color: #FFFFFF;
+ background-color: #F19A86;
+ color: #000000;
}
.treeview::branch:adjoins-item,
QTreeWidget::branch:adjoins-item,
@@ -688,51 +612,95 @@ QTreeView::branch:has-children:has-siblings:open,
}
QListView {
outline: 0;
- background: #737373;
- alternate-background-color: #7b7b7b;
+ background: #dbdbdb;
+ alternate-background-color: #e3e3e3;
}
/* -----------------------------------------------------------------------------
- Tab Systems
+ Tabs
----------------------------------------------------------------------------- */
#TabBarContainer {
- background-color: #5a5a5a;
+ background-color: #b5b5b5;
+ qproperty-BottomAboveLineColor: #b5b5b5;
+ qproperty-BottomBelowLineColor: #9b9b9b;
+}
+QTabBar {
+ background-color: #b5b5b5;
+ margin-bottom: 1;
+}
+QTabBar QToolButton {
+ background-color: #DBDBDB;
+ border-radius: 0;
+ margin-right: 0;
+ margin-top: -1;
+ margin-bottom: 0;
+ border-bottom: 1 solid #9b9b9b;
+ border-left: 1 solid #9b9b9b;
+ padding: 3 2 2 2;
+}
+QTabBar QToolButton:hover {
+ border-bottom: 1 solid #9b9b9b;
+ border-left: 1 solid #9b9b9b;
+}
+QTabBar QToolButton:disabled {
+ color: rgba(43, 20, 20, 0.466);
+}
+QTabBar::tab {
+ margin-top: -1;
+ background-color: #b5b5b5;
+ border: 1 solid #9b9b9b;
+ border-right: 0;
+ color: #ffffff;
+ min-width: 8ex;
+ padding: 3 4 4 4;
+}
+QTabBar::tab:selected {
+ background-color: #DBDBDB;
+ border-bottom-color: #DBDBDB;
+ color: #000;
+}
+QTabBar::tab:hover {
+ background-color: #c9c9c9;
+}
+QTabBar::tab:last,
+QTabBar::tab:only-one {
+ border-right: 1 solid #9b9b9b;
}
/* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget
----------------------------------------------------------------------------- */
#toolOptionsPanel QPushButton {
- background-color: #a6a6a6;
- border: 1 solid #525252;
+ background-color: #ffffff;
+ border: 1 solid #adadad;
border-radius: 2;
color: #000000;
margin: 0;
padding: 0;
}
#toolOptionsPanel QPushButton:hover {
- background-color: #bbbbbb;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
#toolOptionsPanel QPushButton:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
#toolOptionsPanel QPushButton:checked {
- background-color: #5a5a5a;
- border-color: #454545;
- color: #c0c0c0;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
+ color: #ffffff;
}
#toolOptionsPanel QPushButton:checked:hover {
- background-color: #5f5f5f;
+ background-color: #bababa;
}
#toolOptionsPanel QPushButton:checked:hover:pressed {
- background: #5a5a5a;
+ background: #b5b5b5;
}
#toolOptionsPanel QPushButton:disabled {
- background-color: #8d8d8d;
- border-color: #737373;
- color: rgba(0, 0, 0, 0.466);
+ background-color: #e8e8e8;
+ border-color: #cecece;
+ color: rgba(43, 20, 20, 0.466);
}
/* -----------------------------------------------------------------------------
Push Button
@@ -743,8 +711,8 @@ QPushButton,
.ComboBox:checked,
QComboBox,
QComboBox:checked {
- background-color: #a6a6a6;
- border: 1 solid #525252;
+ background-color: #ffffff;
+ border: 1 solid #adadad;
border-radius: 2;
color: #000000;
margin: 0;
@@ -754,31 +722,31 @@ QComboBox:checked {
QPushButton:hover,
#ViewerFpsSlider::sub-line:horizontal:hover,
#ViewerFpsSlider::add-line:horizontal:hover {
- background-color: #bbbbbb;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
.Button:pressed,
QPushButton:pressed,
#ViewerFpsSlider::sub-line:horizontal:pressed,
#ViewerFpsSlider::add-line:horizontal:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
.Button:checked,
QPushButton:checked {
- background-color: #5a5a5a;
- border-color: #454545;
- color: #c0c0c0;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
+ color: #ffffff;
}
.Button:checked:hover,
QPushButton:checked:hover {
- background-color: #5f5f5f;
+ background-color: #bababa;
}
.Button:checked:hover:pressed,
QPushButton:checked:hover:pressed {
- background: #5a5a5a;
+ background: #b5b5b5;
}
.Button:disabled,
QPushButton:disabled,
@@ -786,9 +754,9 @@ QPushButton:disabled,
#ViewerFpsSlider::sub-line:horizontal:disabled,
#ViewerFpsSlider::add-line:horizontal:disabled,
QComboBox:disabled {
- background-color: #8d8d8d;
- border-color: #737373;
- color: rgba(0, 0, 0, 0.466);
+ background-color: #e8e8e8;
+ border-color: #cecece;
+ color: rgba(43, 20, 20, 0.466);
}
#PushButton_NoPadding {
padding: 3;
@@ -806,18 +774,18 @@ QComboBox:checked {
.ComboBox:editable,
QComboBox:editable {
/* for editable ComboBox */
- color: #000;
- background-color: #e6e6e6;
- border-color: #525252;
+ color: #ffffff;
+ background-color: #8f8f8f;
+ border-color: #828282;
padding: 1 0 1 3;
}
.ComboBox:hover,
QComboBox:hover {
- background-color: #bbbbbb;
+ background-color: #ffffff;
}
.ComboBox:hover:editable,
QComboBox:hover:editable {
- background-color: #e6e6e6;
+ background-color: #8f8f8f;
}
.ComboBox:focus,
QComboBox:focus {
@@ -836,19 +804,19 @@ QComboBox::drop-down {
}
.ComboBox::drop-down:editable,
QComboBox::drop-down:editable {
- background-color: #a6a6a6;
- border-left: 1 solid #525252;
+ background-color: #ffffff;
+ border-left: 1 solid #adadad;
border-top-right-radius: 1;
border-bottom-right-radius: 1;
}
.ComboBox::drop-down:hover,
QComboBox::drop-down:hover {
- border-color: #bbbbbb;
+ border-color: #ffffff;
}
.ComboBox::drop-down:hover:editable,
QComboBox::drop-down:hover:editable {
- background-color: #bbbbbb;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
}
.ComboBox::drop-down:disabled,
QComboBox::drop-down:disabled {
@@ -856,14 +824,14 @@ QComboBox::drop-down:disabled {
}
.ComboBox::drop-down:disabled:editable,
QComboBox::drop-down:disabled:editable {
- background-color: #8d8d8d;
+ background-color: #e8e8e8;
}
.ComboBox QAbstractItemView,
QComboBox QAbstractItemView {
- background-color: #9a9a9a;
- border: 1 solid #404040;
- selection-background-color: #225baf;
- selection-color: #FFFFFF;
+ background-color: #f4f4f4;
+ border: 1 solid #9b9b9b;
+ selection-background-color: #F19A86;
+ selection-color: #000000;
}
/* -----------------------------------------------------------------------------
Textfield
@@ -874,12 +842,12 @@ QLineEdit,
#TaskSheetItem,
#tasksRemoveBox,
#tasksAddBox {
- background-color: #e6e6e6;
- border: 1 solid #525252;
+ background-color: #8f8f8f;
+ border: 1 solid #828282;
border-radius: 2;
- color: #000;
- selection-background-color: #225baf;
- selection-color: #FFFFFF;
+ color: #ffffff;
+ selection-background-color: #F19A86;
+ selection-color: #000000;
padding: 0 0 0 1;
}
.LineEdit:focus,
@@ -888,9 +856,9 @@ QLineEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
- background-color: #e6e6e6;
+ background-color: #8f8f8f;
border-color: #0159fd;
- color: #000;
+ color: #ffffff;
}
.LineEdit:disabled,
QPlainTextEdit:disabled,
@@ -898,9 +866,9 @@ QLineEdit:disabled,
#TaskSheetItem:disabled,
#tasksRemoveBox:disabled,
#tasksAddBox:disabled {
- background-color: #9a9a9a;
- border-color: #696969;
- color: rgba(0, 0, 0, 0.466);
+ background-color: #f4f4f4;
+ border-color: #aeaeae;
+ color: rgba(43, 20, 20, 0.466);
}
/* -----------------------------------------------------------------------------
CheckBox
@@ -915,7 +883,7 @@ QCheckBox:hover {
}
.CheckBox:disabled,
QCheckBox:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
.CheckBox::indicator,
QMenu::indicator:non-exclusive,
@@ -923,8 +891,8 @@ QMenu::indicator:non-exclusive,
QCheckBox::indicator,
.GroupBox::indicator,
QGroupBox::indicator {
- background-color: #a6a6a6;
- border: 1 solid #525252;
+ background-color: #ffffff;
+ border: 1 solid #adadad;
border-radius: 2;
height: 9;
/* fix for QGroupBox */
@@ -950,7 +918,7 @@ QCheckBox::indicator:indeterminate:hover,
QGroupBox::indicator:hover,
QGroupBox::indicator:checked:hover,
QGroupBox::indicator:indeterminate:hover {
- background-color: #a6a6a6;
+ background-color: #ffffff;
border-color: #ffffff;
}
.CheckBox::indicator:checked,
@@ -959,8 +927,8 @@ QMenu::indicator:non-exclusive:checked,
QCheckBox::indicator:checked,
.GroupBox::indicator:checked,
QGroupBox::indicator:checked {
- background-color: #5a5a5a;
- border-color: #454545;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
image: url('../Medium/imgs/black/checkmark.svg');
}
.CheckBox::indicator:checked:hover,
@@ -969,7 +937,7 @@ QMenu::indicator:non-exclusive:checked:hover,
QCheckBox::indicator:checked:hover,
.GroupBox::indicator:checked:hover,
QGroupBox::indicator:checked:hover {
- background-color: #5a5a5a;
+ background-color: #b5b5b5;
border-color: #fff;
}
.CheckBox::indicator:checked:disabled,
@@ -978,8 +946,8 @@ QMenu::indicator:non-exclusive:checked:disabled,
QCheckBox::indicator:checked:disabled,
.GroupBox::indicator:checked:disabled,
QGroupBox::indicator:checked:disabled {
- background-color: #676767;
- border-color: #5a5a5a;
+ background-color: #c2c2c2;
+ border-color: #b5b5b5;
image: url('../Medium/imgs/black/checkmark_disabled.svg');
}
.CheckBox::indicator:indeterminate,
@@ -988,8 +956,8 @@ QMenu::indicator:non-exclusive:indeterminate,
QCheckBox::indicator:indeterminate,
.GroupBox::indicator:indeterminate,
QGroupBox::indicator:indeterminate {
- background-color: #5a5a5a;
- border-color: #454545;
+ background-color: #b5b5b5;
+ border-color: #a0a0a0;
image: url('../Medium/imgs/black/checkpartially.svg');
}
.CheckBox::indicator:indeterminate:disabled,
@@ -998,8 +966,8 @@ QMenu::indicator:non-exclusive:indeterminate:disabled,
QCheckBox::indicator:indeterminate:disabled,
.GroupBox::indicator:indeterminate:disabled,
QGroupBox::indicator:indeterminate:disabled {
- background-color: #676767;
- border-color: #5a5a5a;
+ background-color: #c2c2c2;
+ border-color: #b5b5b5;
image: url('../Medium/imgs/black/checkpartially_disabled.svg');
}
.CheckBox::indicator:disabled,
@@ -1030,7 +998,7 @@ QRadioButton:checked {
}
.RadioButton:disabled,
QRadioButton:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
.RadioButton::indicator,
QMenu::indicator:exclusive,
@@ -1100,7 +1068,7 @@ QGroupBox::title:hover {
}
.GroupBox::title:disabled,
QGroupBox::title:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
.GroupBox::indicator,
QGroupBox::indicator {
@@ -1109,7 +1077,7 @@ QGroupBox::indicator {
}
.GroupBox:disabled,
QGroupBox:disabled {
- color: rgba(0, 0, 0, 0.466);
+ color: rgba(43, 20, 20, 0.466);
}
/* -----------------------------------------------------------------------------
Slider
@@ -1143,10 +1111,10 @@ QSlider::handle:horizontal:disabled {
----------------------------------------------------------------------------- */
#IntPairField,
#DoublePairField {
- qproperty-LightLineColor: #484848;
- qproperty-LightLineEdgeColor: #484848;
- qproperty-DarkLineColor: #484848;
- qproperty-MiddleLineColor: #484848;
+ qproperty-LightLineColor: #a3a3a3;
+ qproperty-LightLineEdgeColor: #a3a3a3;
+ qproperty-DarkLineColor: #a3a3a3;
+ qproperty-MiddleLineColor: #a3a3a3;
qproperty-HandleLeftPixmap: url("../Medium/imgs/black/slider-handle.svg");
qproperty-HandleRightPixmap: url("../Medium/imgs/black/slider-handle.svg");
qproperty-HandleLeftGrayPixmap: url("../Medium/imgs/black/slider-handle_disabled.svg");
@@ -1157,8 +1125,8 @@ QSlider::handle:horizontal:disabled {
----------------------------------------------------------------------------- */
QProgressBar {
text-align: center;
- background-color: #676767;
- border: 1 solid #404040;
+ background-color: #c2c2c2;
+ border: 1 solid #9b9b9b;
border-radius: 3;
/* 2 fits inside 3 */
padding: 0;
@@ -1167,7 +1135,7 @@ QProgressBar::chunk {
margin: -1;
/* hide border of chunk except for right side */
background-color: #15a136;
- border: 1 solid #404040;
+ border: 1 solid #9b9b9b;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
@@ -1176,29 +1144,36 @@ QProgressBar::chunk {
/* Left Pane
----------------------------------------------------------------------------- */
#DirTreeView {
- background-color: #737373;
- alternate-background-color: #737373;
- border: 1 solid #404040;
+ background-color: #dbdbdb;
+ alternate-background-color: #dbdbdb;
+ border: 1 solid #9b9b9b;
border-right: 0;
}
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
qproperty-TextColor: #000;
- qproperty-AlternateBackground: #787878;
- qproperty-SelectedTextColor: #FFFFFF;
+ qproperty-AlternateBackground: #d3d3d3;
+ qproperty-SelectedTextColor: #000000;
qproperty-FolderTextColor: #001686;
- qproperty-SelectedItemBackground: #225baf;
+ qproperty-SelectedItemBackground: #F19A86;
+}
+DvItemViewerTitleBar {
+ qproperty-ColColor: #DBDBDB;
+ qproperty-ColSortedColor: #DBDBDB;
+ qproperty-ColTextColor: #000;
+ qproperty-ColBorderColor: #9b9b9b;
+ qproperty-ColReliefColor: #DBDBDB;
}
#FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel {
- background-color: #808080;
+ background-color: #dbdbdb;
}
#FileBrowser #castFrame,
#SceneCast #castFrame {
- border-top: 1 solid #404040;
- border-right: 1 solid #404040;
- border-bottom: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
+ border-right: 1 solid #9b9b9b;
+ border-bottom: 1 solid #9b9b9b;
margin: 0;
}
#FileBrowser QToolButton,
@@ -1207,13 +1182,13 @@ DvItemViewerPanel {
}
StyledTreeView {
qproperty-TextColor: #000;
- qproperty-SelectedTextColor: #FFFFFF;
- qproperty-SelectedItemBackground: #225baf;
+ qproperty-SelectedTextColor: #000000;
+ qproperty-SelectedItemBackground: #F19A86;
qproperty-FolderTextColor: #001686;
- qproperty-SelectedFolderTextColor: #FFFFFF;
- alternate-background-color: #7b7b7b;
- background-color: #737373;
- border: 1 solid #404040;
+ qproperty-SelectedFolderTextColor: #000000;
+ alternate-background-color: #e3e3e3;
+ background-color: #dbdbdb;
+ border: 1 solid #9b9b9b;
}
#FileDoesNotExistLabel {
color: #ff0000;
@@ -1222,7 +1197,7 @@ StyledTreeView {
Scene Cast
----------------------------------------------------------------------------- */
#SceneCast QToolBar {
- border-top: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
}
#SceneCast QToolButton {
margin: 3 1 2 1;
@@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0;
margin: 0;
}
+#CastBrowser QSplitter::handle {
+ height: 4;
+}
+#CastBrowserFolderName {
+ border-bottom: 1px solid #9b9b9b;
+}
/* -----------------------------------------------------------------------------
Level Strip
----------------------------------------------------------------------------- */
@@ -1240,7 +1221,7 @@ StyledTreeView {
border-width: 0;
}
#FilmStrip QComboBox QAbstractItemView {
- background-color: #9a9a9a;
+ background-color: #f4f4f4;
}
/* -----------------------------------------------------------------------------
Cleanup Settings
@@ -1323,11 +1304,11 @@ PencilTestPopup {
allows for filling half of a 1024 screen */
}
#MatchLineButton {
- background-color: #a6a6a6;
+ background-color: #ffffff;
}
#MatchLineButton:checked {
- background-color: #cdcdcd;
- border: 2 solid #225baf;
+ background-color: #ffffff;
+ border: 2 solid #F19A86;
border-radius: 2;
}
#LargeSizedText {
@@ -1347,14 +1328,14 @@ PencilTestPopup {
margin-left: -4;
}
#StopMotionController #bottomWidget {
- border-top: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
padding: 3 2 8 3;
}
#StopMotionController #bottomWidget QPushButton {
padding: 3 5;
}
#StopMotionTabBar::tab::first {
- border-left: 1 solid #404040;
+ border-left: 1 solid #9b9b9b;
}
/* -----------------------------------------------------------------------------
Unknowns + Legacy
@@ -1363,7 +1344,7 @@ PencilTestPopup {
padding: 3;
}
#StartupLabel:hover {
- background: #9a9a9a;
+ background: #f4f4f4;
}
QStatusBar {
background-color: #c0c0c0;
@@ -1385,24 +1366,21 @@ QStatusBar #StatusBarLabel {
Style Editor
----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer {
- margin-left: -5;
+ margin-left: -5px;
}
#StyleEditor #bottomWidget {
- border-top: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
padding: 3 2 8 3;
}
#StyleEditor #bottomWidget QPushButton {
padding: 3 5;
}
-#StyleEditorTabBar {
- padding: 0;
- margin: 0;
-}
-#StyleEditorTabBar::tab:first {
- border-left: 1 solid #404040;
+#StyleEditorTabBar::tab:first,
+#StyleEditorTabBar::tab:only-one {
+ border-left: 0;
}
#HexagonalColorWheel {
- qproperty-BGColor: #808080;
+ qproperty-BGColor: #DBDBDB;
}
/* -------------------------------------------------------------------------- */
/* Horizontal QSlider */
@@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center;
min-height: 16;
padding: 0;
- min-width: 18;
+ min-width: 10;
}
#colorSliderAddButton {
image: url('../Medium/imgs/black/scroll-right.svg');
@@ -1430,7 +1408,7 @@ QStatusBar #StatusBarLabel {
image: url('../Medium/imgs/black/scroll-left.svg');
}
#PlainColorPageParts {
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
}
#PlainColorPageParts QLineEdit {
max-width: 35;
@@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0;
padding: 2 0 2 0;
}
-#PaletteTabBar::tab {
- padding-bottom: 4;
+#PaletteTabBar::tab:first,
+#PaletteTabBar::tab:only-one {
+ border-left: 0;
+}
+#PaletteTabBar::tab:only-one {
+ border-right: 1 solid #9b9b9b;
}
#PageViewer {
qproperty-TextColor: #000;
+ qproperty-ListLineColor: #9b9b9b;
}
#PaletteLockButton {
border-radius: 0;
@@ -1492,14 +1475,14 @@ PaletteViewer QToolBar QToolButton {
Popup Windows
----------------------------------------------------------------------------- */
QDialog {
- background-color: #808080;
+ background-color: #DBDBDB;
}
QDialog #dialogButtonFrame {
- background-color: #767676;
- border-top: 1 solid #404040;
+ background-color: #d1d1d1;
+ border-top: 1 solid #9b9b9b;
}
QDialog #dialogButtonFrame QPushButton {
- border-color: #525252;
+ border-color: #adadad;
outline: 0;
}
QDialog #dialogButtonFrame QPushButton:focus {
@@ -1511,8 +1494,8 @@ QDialog #dialogButtonFrame QPushButton:focus:hover {
background-color: #ced5e0;
}
QDialog #dialogButtonFrame QPushButton:focus:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
color: #000000;
}
/* -----------------------------------------------------------------------------
@@ -1525,9 +1508,9 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences
----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget {
- background-color: #737373;
- alternate-background-color: #737373;
- border: 1 solid #404040;
+ background-color: #dbdbdb;
+ alternate-background-color: #dbdbdb;
+ border: 1 solid #9b9b9b;
font-size: 13px;
}
#PreferencesPopup QListWidget::item {
@@ -1535,19 +1518,19 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
padding: 3;
}
#PreferencesPopup QListWidget::item:hover {
- background-color: #9f9f9f;
+ background-color: #fafafa;
color: #000;
- background-color: #888888;
+ background-color: #efefef;
}
#PreferencesPopup QListWidget::item:selected {
- background-color: #225baf;
- color: #FFFFFF;
+ background-color: #F19A86;
+ color: #000000;
}
/* -----------------------------------------------------------------------------
Keyboard Shortcuts
----------------------------------------------------------------------------- */
#ShortcutTree {
- border: 1 solid #404040;
+ border: 1 solid #9b9b9b;
}
#ShortcutTree::item {
padding: 1 0;
@@ -1629,7 +1612,7 @@ SchematicViewer {
Schematic Node Viewer
----------------------------------------------------------------------------- */
#SchematicBottomFrame {
- background-color: #808080;
+ background-color: #DBDBDB;
border: 0;
margin: 0;
padding: 0;
@@ -1642,23 +1625,14 @@ SchematicViewer {
margin: 2;
}
#SchematicSceneViewer {
- background-color: #737373;
- border-bottom: 1 solid #404040;
+ background-color: #cecece;
+ border-bottom: 1 solid #9b9b9b;
}
/* -----------------------------------------------------------------------------
FX Settings
----------------------------------------------------------------------------- */
-#FxSettingsTabBar::tab {
- border-top: 1 solid #404040;
-}
-#FxSettingsTabBar::tab::first,
-#FxSettingsTabBar::tab::only-one {
- border-left: 1 solid #404040;
-}
FxSettings QToolBar {
- border-top: 1 solid #404040;
- border-right: 1 solid #404040;
- border-left: 1 solid #404040;
+ border: 1 1 0 1 solid #9b9b9b;
min-height: 23;
padding: 3 0;
}
@@ -1693,7 +1667,7 @@ ChannelBar {
background-color: #dcdcdc;
}
#ScriptConsole TPanelTitleBar {
- background-color: #5a5a5a;
+ background-color: #b5b5b5;
}
/* -----------------------------------------------------------------------------
Task Viewer
@@ -1702,7 +1676,7 @@ ChannelBar {
color: #000;
}
#Tasks QToolBar {
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
margin: 0;
padding: 0;
}
@@ -1719,11 +1693,11 @@ ChannelBar {
Tool Options
----------------------------------------------------------------------------- */
#ToolOptions TPanelTitleBar {
- border-right: 1 solid #404040;
+ border-right: 1 solid #9b9b9b;
border-bottom: 0;
}
#CommandBar TPanelTitleBar {
- border-right: 1 solid #404040;
+ border-right: 1 solid #9b9b9b;
border-bottom: 0;
}
IconViewField {
@@ -1805,18 +1779,18 @@ QToolBar#WidePaddingToolBar QToolButton {
color: #000;
}
#expandButton:checked:hover {
- background-color: #bbbbbb;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
}
#expandButton:checked:pressed {
- background-color: #e1e1e1;
- border-color: #525252;
+ background-color: #ffffff;
+ border-color: #adadad;
}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
#ComboViewerPanel Toolbar {
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
}
#ComboViewerPanel Toolbar::separator:horizontal {
margin: 0 0 0 2;
@@ -1825,14 +1799,14 @@ QToolBar#WidePaddingToolBar QToolButton {
margin: 2 0 3 2;
}
#ComboViewerToolOptions {
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
}
#ComboViewer #ToolBarContainer,
#ViewerPanel #ToolBarContainer,
FlipBook #ToolBarContainer {
background-color: transparent;
- border-top: 2 solid #404040;
- border-bottom: 1 solid #404040;
+ border-top: 2 solid #9b9b9b;
+ border-bottom: 1 solid #9b9b9b;
padding-right: -1;
}
#flipCustomize {
@@ -1868,8 +1842,8 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
}
#ViewerFpsSlider::sub-line:horizontal {
subcontrol-origin: absolute;
- background-color: #a6a6a6;
- border: 1 solid #525252;
+ background-color: #ffffff;
+ border: 1 solid #adadad;
border-top-left-radius: 2;
border-bottom-left-radius: 2;
height: 16;
@@ -1878,8 +1852,8 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
}
#ViewerFpsSlider::add-line:horizontal {
subcontrol-position: left;
- background-color: #a6a6a6;
- border: 1 solid #525252;
+ background-color: #ffffff;
+ border: 1 solid #adadad;
border-top-right-radius: 2;
border-bottom-right-radius: 2;
left: 18;
@@ -1888,8 +1862,8 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
width: 13;
}
#ViewerFpsSlider::handle::horizontal {
- background-color: #a6a6a6;
- border: 1 solid #404040;
+ background-color: #ffffff;
+ border: 1 solid #9b9b9b;
border-radius: 2;
margin: 2 0 3 0;
min-width: 9;
@@ -1908,15 +1882,15 @@ FlipSlider {
qproperty-PBMarkerMarginRight: 3;
qproperty-notStartedColor: #8b2525;
qproperty-startedColor: #00a808;
- qproperty-baseColor: #676767;
- qproperty-finishedColor: #676767;
+ qproperty-baseColor: #c2c2c2;
+ qproperty-finishedColor: #c2c2c2;
}
Ruler {
- qproperty-ParentBGColor: #a6a6a6;
+ qproperty-ParentBGColor: #ffffff;
qproperty-ScaleColor: #000;
}
#RulerToolOptionValues {
- color: #000000;
+ color: #5b5b5b;
}
/* -----------------------------------------------------------------------------
XSheet Viewer
@@ -1925,7 +1899,7 @@ Ruler {
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
- background-color: #6c6c6c;
+ background-color: #c7c7c7;
border: 0;
}
#xsheetScrollArea {
@@ -1957,18 +1931,18 @@ Ruler {
----------------------------------------------------------------------------- */
XsheetViewer {
qproperty-TextColor: #000;
- qproperty-BGColor: #8a8a8a;
+ qproperty-BGColor: #e5e5e5;
qproperty-LightLineColor: rgba(0, 0, 0, 0.205);
qproperty-MarkerLineColor: #000;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.404);
- qproperty-VerticalLineHeadColor: #000000;
+ qproperty-VerticalLineHeadColor: #2e2e2e;
qproperty-PreviewFrameTextColor: #000eb6;
qproperty-CurrentRowBgColor: #B5C0D0;
- qproperty-OnionSkinAreaBgColor: #808080;
- qproperty-EmptyColumnHeadColor: #676767;
- qproperty-EmptyCellColor: #7c7c7c;
- qproperty-NotEmptyColumnColor: #9a9a9a;
- qproperty-SelectedEmptyCellColor: #b3b3b3;
+ qproperty-OnionSkinAreaBgColor: #dbdbdb;
+ qproperty-EmptyColumnHeadColor: #c2c2c2;
+ qproperty-EmptyCellColor: #d7d7d7;
+ qproperty-NotEmptyColumnColor: #f4f4f4;
+ qproperty-SelectedEmptyCellColor: #ffffff;
qproperty-LevelColumnColor: #76b776;
qproperty-LevelColumnBorderColor: #496549;
qproperty-SelectedLevelColumnColor: #9bc59b;
@@ -2003,7 +1977,7 @@ XsheetViewer {
qproperty-SoundColumnTrackColor: #5a642d;
qproperty-ColumnHeadPastelizer: #ffffff;
qproperty-SelectedColumnHead: #bed2f0;
- qproperty-LightLightBGColor: #808080;
+ qproperty-LightLightBGColor: #DBDBDB;
qproperty-LightBGColor: #f0f0f0;
qproperty-DarkBGColor: #e1e1e1;
qproperty-DarkLineColor: #969696;
@@ -2070,7 +2044,7 @@ XsheetViewer {
Function Editor
----------------------------------------------------------------------------- */
#FunctionEditor QToolBar {
- border-bottom: 1 solid #404040;
+ border-bottom: 1 solid #9b9b9b;
}
#FunctionEditor QToolBar QToolBar {
border: 0;
@@ -2082,7 +2056,7 @@ XsheetViewer {
height: 18;
}
#FunctionEditorTree {
- border-top: 1 solid #404040;
+ border-top: 1 solid #9b9b9b;
}
FunctionTreeView {
qproperty-TextColor: #000;
@@ -2090,21 +2064,21 @@ FunctionTreeView {
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
FunctionPanel {
- qproperty-BGColor: #5a5a5a;
- qproperty-ValueLineColor: #4d4d4d;
- qproperty-FrameLineColor: #4d4d4d;
+ qproperty-BGColor: #b5b5b5;
+ qproperty-ValueLineColor: #a8a8a8;
+ qproperty-FrameLineColor: #a8a8a8;
qproperty-OtherCurvesColor: #c5c5c5;
- qproperty-RulerBackground: #676767;
+ qproperty-RulerBackground: #c2c2c2;
qproperty-TextColor: #000;
qproperty-SubColor: #ffffff;
qproperty-SelectedColor: #fcae06;
}
SpreadsheetViewer {
- qproperty-LightLightBGColor: #808080;
+ qproperty-LightLightBGColor: #DBDBDB;
qproperty-CurrentRowBgColor: #B5C0D0;
qproperty-LightLineColor: rgba(0, 0, 0, 0.205);
qproperty-MarkerLineColor: #000;
- qproperty-BGColor: #9a9a9a;
+ qproperty-BGColor: #f4f4f4;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.404);
qproperty-KeyFrameColor: #db8b36;
qproperty-KeyFrameBorderColor: #7b4a16;
@@ -2112,14 +2086,14 @@ SpreadsheetViewer {
qproperty-InBetweenColor: #c2c2b0;
qproperty-InBetweenBorderColor: #636356;
qproperty-SelectedInBetweenColor: #d6d6cf;
- qproperty-SelectedEmptyColor: #b3b3b3;
+ qproperty-SelectedEmptyColor: #ffffff;
qproperty-SelectedSceneRangeEmptyColor: #d2d2d2;
qproperty-TextColor: #000;
- qproperty-ColumnHeaderBorderColor: #000000;
+ qproperty-ColumnHeaderBorderColor: #2e2e2e;
}
#ExpressionField {
background-color: #ffffff;
- border: 1 solid #6b6b6b;
+ border: 1 solid #c6c6c6;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Medium/Medium.qss b/stuff/config/qss/Medium/Medium.qss
index e1ee750a..ee529e6b 100644
--- a/stuff/config/qss/Medium/Medium.qss
+++ b/stuff/config/qss/Medium/Medium.qss
@@ -120,7 +120,7 @@ PaletteViewer QToolBar QToolButton:hover {
}
.button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed {
- background-color: #272727;
+ background-color: #222222;
}
/* -----------------------------------------------------------------------------
Component: Frames
@@ -129,96 +129,19 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
-#CleanupSettingsFrame,
+#CleanupSettings #CleanupSettingsFrame,
+#CleanupSettings QScrollArea,
#OutputSettingsBox,
#OutputSettingsCameraBox,
#SolidLineFrame,
#FunctionParametersPanel,
QGroupBox {
- border: 1 solid #272727;
+ border: 1 solid #222222;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
Component: Icons
----------------------------------------------------------------------------- */
-/* -----------------------------------------------------------------------------
- Component: Tabs
------------------------------------------------------------------------------ */
-.tab-container,
-#TabBarContainer {
- background-color: transparent;
- qproperty-BottomAboveLineColor: #393939;
- qproperty-BottomBelowLineColor: #272727;
-}
-.tab-flat,
-#StopMotionTabBar::tab,
-#StyleEditorTabBar::tab,
-#PaletteTabBar::tab,
-#FxSettingsTabBar::tab {
- background-color: #393939;
- border-right: 1 solid #272727;
- border-bottom: 1 solid #272727;
- color: #a1a1a1;
- padding: 3 4 3 4;
-}
-.tab-flat:hover,
-#StopMotionTabBar::tab:hover,
-#StyleEditorTabBar::tab:hover,
-#PaletteTabBar::tab:hover,
-#FxSettingsTabBar::tab:hover {
- background-color: #484848;
- color: #a1a1a1;
-}
-.tab-flat:selected,
-#StopMotionTabBar::tab:selected,
-#StyleEditorTabBar::tab:selected,
-#PaletteTabBar::tab:selected,
-#FxSettingsTabBar::tab:selected {
- background-color: #484848;
- color: #ffffff;
- border-bottom-color: #484848;
-}
-.tab-flat:only-one,
-#StopMotionTabBar::tab:only-one,
-#StyleEditorTabBar::tab:only-one,
-#PaletteTabBar::tab:only-one,
-#FxSettingsTabBar::tab:only-one {
- margin: 0;
-}
-.tab-round {
- background-color: #393939;
- border-top: 1 solid #272727;
- border-right: 1 solid #272727;
- border-left: 1 solid #272727;
- border-bottom: 1 solid #272727;
- color: #a1a1a1;
- margin: 3 -1 0 0;
- padding: 2 7 1 7;
-}
-.tab-round:hover {
- background-color: #484848;
- color: #a1a1a1;
-}
-.tab-round:selected {
- background-color: #484848;
- border-top-right-radius: 2;
- border-top-left-radius: 2;
- border-bottom-color: #484848;
- color: #ffffff;
- margin: 1 -1 -1 0;
- padding: 2 7 2 7;
-}
-.tab-round:only-one {
- margin: 1 0 0 0;
- padding: 3 7 3 7;
-}
-.tab-round:last {
- margin-right: 0;
- border-top-right-radius: 2;
-}
-.tab-round:first {
- border-top-left-radius: 2;
-}
/* -----------------------------------------------------------------------------
Main
----------------------------------------------------------------------------- */
@@ -249,7 +172,7 @@ QSplitter::handle {
width: 4;
}
#TDockPlaceholder {
- background-color: #F77272;
+ background-color: rgba(0, 0, 0, 0.5);
}
TPanel {
background-color: #1a1a1a;
@@ -260,7 +183,7 @@ TPanel {
#TopBar {
background: #484848;
border: 0;
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
height: 21;
}
#TopBar #EditToolLockButton {
@@ -292,7 +215,7 @@ QMenuBar::item {
background-color: #484848;
border-left: 1 solid #484848;
margin: 0;
- padding: 3 5;
+ padding: 3 5 3 5;
}
QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15);
@@ -305,38 +228,33 @@ QMenuBar::item:pressed {
/* -----------------------------------------------------------------------------
Workspaces
----------------------------------------------------------------------------- */
-#TopBarTab {
- margin: 0;
- padding: 0;
-}
#TopBarTab::tab {
- background-color: #393939;
- border-top: 1 solid #272727;
- border-right: 1 solid #272727;
- color: #a1a1a1;
- margin: 0 0 0 0;
- padding: 2 8 3 8;
+ margin: 0;
+ padding: 2 7 3 8;
+ border-bottom: 0;
}
-#TopBarTab::tab:hover {
- background-color: #484848;
- color: #a1a1a1;
+#TopBarTab::tab:hover,
+#TopBarTab::tab:selected {
+ border-bottom: 0;
}
#TopBarTab::tab:selected {
- background-color: #484848;
color: #ffffff;
+ background-color: #5385a6;
}
-#TopBarTab::tab:first {
- border-left: 1 solid #272727;
-}
-#TopBarTab::tab:last {
- border-right: 1 solid #272727;
+#TopBarTab QToolButton {
+ border-left: 2 solid #222222;
+ border-top: 1 solid #222222;
+ border-right: 1 solid #222222;
+ border-bottom: 0;
+ margin-left: -1;
+ margin-top: 0;
}
/* -----------------------------------------------------------------------------
Menu
----------------------------------------------------------------------------- */
QMenu {
background-color: #484848;
- border: 1 solid #272727;
+ border: 1 solid #222222;
color: #e6e6e6;
padding: 2 0;
}
@@ -365,14 +283,14 @@ QMenu::item:disabled:selected {
/* fix for disabled indicator */
}
QMenu::separator {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
height: 0;
margin: 2 0;
}
QMenu::icon {
border-radius: 2;
margin: 0 0 0 3;
- padding: 1;
+ padding: 0;
}
QMenu::icon:checked {
background-color: #5385a6;
@@ -385,7 +303,7 @@ QMenu::indicator {
----------------------------------------------------------------------------- */
TPanelTitleBar {
background-color: #393939;
- border-color: #272727;
+ border-color: #222222;
border-style: solid;
border-width: 0 0 1 0;
height: 20;
@@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('imgs/white/none');
}
+TPanelTitleBarButton {
+ qproperty-RolloverColor: #767676;
+ qproperty-PressedColor: #5385a6;
+ qproperty-FreezeColor: #C34040;
+ qproperty-PreviewColor: #00ff9d;
+}
/* -----------------------------------------------------------------------------
Scrollbars
----------------------------------------------------------------------------- */
QAbstractScrollArea::corner {
- background-color: #343434;
+ background-color: #2f2f2f;
}
QScrollBar {
- background-color: #343434;
+ background-color: #2f2f2f;
border: 0;
}
QScrollBar:horizontal {
@@ -445,13 +369,13 @@ QScrollBar::add-line {
}
QScrollBar::add-line:horizontal {
subcontrol-position: right;
- background-color: #343434;
+ background-color: #2f2f2f;
margin: 0;
width: 16;
}
QScrollBar::add-line:vertical {
subcontrol-position: bottom;
- background-color: #343434;
+ background-color: #2f2f2f;
margin: 0;
height: 16;
}
@@ -461,13 +385,13 @@ QScrollBar::sub-line {
}
QScrollBar::sub-line:horizontal {
subcontrol-position: left;
- background-color: #343434;
+ background-color: #2f2f2f;
margin: 0;
width: 16;
}
QScrollBar::sub-line:vertical {
subcontrol-position: top;
- background-color: #343434;
+ background-color: #2f2f2f;
margin: 0;
height: 16;
}
@@ -512,12 +436,12 @@ QToolBar {
padding: 0;
}
QToolBar::separator:horizontal {
- border-left: 1 solid #272727;
+ border-left: 1 solid #222222;
margin: 0 1;
width: 0;
}
QToolBar::separator:vertical {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
height: 0;
margin: 1 0;
}
@@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton,
#ScrollUpButton QPushButton,
#ScrollDownButton QPushButton {
- background-color: #696969;
- border: 0 solid red;
+ background-color: #484848;
+ border: 0 solid #222222;
border-radius: 0;
padding: 0;
max-width: 16;
@@ -572,11 +496,11 @@ DvScrollWidget QPushButton:pressed,
min-width: 16;
}
#ScrollLeftButton {
- border-right: 1 solid #272727;
+ border-right: 1 solid #222222;
image: url('imgs/white/scroll-left.svg');
}
#ScrollRightButton {
- border-left: 1 solid #272727;
+ border-left: 1 solid #222222;
margin-left: 3;
image: url('imgs/white/scroll-right.svg');
}
@@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('imgs/white/nextkey_disabled.svg');
}
/* -----------------------------------------------------------------------------
- Trees
+ Item Tree
----------------------------------------------------------------------------- */
.treeview,
QTreeWidget,
QTreeView,
#FunctionEditorTree {
- background-color: #343434;
- alternate-background-color: #393939;
+ background-color: #2f2f2f;
+ alternate-background-color: #363636;
border: 0;
margin: 0;
outline: 0;
@@ -688,14 +612,58 @@ QTreeView::branch:has-children:has-siblings:open,
}
QListView {
outline: 0;
- background: #343434;
- alternate-background-color: #393939;
+ background: #2f2f2f;
+ alternate-background-color: #363636;
}
/* -----------------------------------------------------------------------------
- Tab Systems
+ Tabs
----------------------------------------------------------------------------- */
#TabBarContainer {
background-color: #393939;
+ qproperty-BottomAboveLineColor: #393939;
+ qproperty-BottomBelowLineColor: #222222;
+}
+QTabBar {
+ background-color: #393939;
+ margin-bottom: 1;
+}
+QTabBar QToolButton {
+ background-color: #484848;
+ border-radius: 0;
+ margin-right: 0;
+ margin-top: -1;
+ margin-bottom: 0;
+ border-bottom: 1 solid #222222;
+ border-left: 1 solid #222222;
+ padding: 3 2 2 2;
+}
+QTabBar QToolButton:hover {
+ border-bottom: 1 solid #222222;
+ border-left: 1 solid #222222;
+}
+QTabBar QToolButton:disabled {
+ color: rgba(230, 230, 230, 0.4);
+}
+QTabBar::tab {
+ margin-top: -1;
+ background-color: #393939;
+ border: 1 solid #222222;
+ border-right: 0;
+ color: #a1a1a1;
+ min-width: 8ex;
+ padding: 3 4 4 4;
+}
+QTabBar::tab:selected {
+ background-color: #484848;
+ border-bottom-color: #484848;
+ color: #e6e6e6;
+}
+QTabBar::tab:hover {
+ background-color: #484848;
+}
+QTabBar::tab:last,
+QTabBar::tab:only-one {
+ border-right: 1 solid #222222;
}
/* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget
@@ -861,7 +829,7 @@ QComboBox::drop-down:disabled:editable {
.ComboBox QAbstractItemView,
QComboBox QAbstractItemView {
background-color: #484848;
- border: 1 solid #272727;
+ border: 1 solid #222222;
selection-background-color: #5385a6;
selection-color: #ffffff;
}
@@ -1158,7 +1126,7 @@ QSlider::handle:horizontal:disabled {
QProgressBar {
text-align: center;
background-color: #2f2f2f;
- border: 1 solid #272727;
+ border: 1 solid #222222;
border-radius: 3;
/* 2 fits inside 3 */
padding: 0;
@@ -1167,7 +1135,7 @@ QProgressBar::chunk {
margin: -1;
/* hide border of chunk except for right side */
background-color: #15a136;
- border: 1 solid #272727;
+ border: 1 solid #222222;
border-radius: 2;
}
/* -----------------------------------------------------------------------------
@@ -1176,29 +1144,36 @@ QProgressBar::chunk {
/* Left Pane
----------------------------------------------------------------------------- */
#DirTreeView {
- background-color: #343434;
- alternate-background-color: #343434;
- border: 1 solid #272727;
+ background-color: #2f2f2f;
+ alternate-background-color: #2f2f2f;
+ border: 1 solid #222222;
border-right: 0;
}
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
qproperty-TextColor: #e6e6e6;
- qproperty-AlternateBackground: #404040;
+ qproperty-AlternateBackground: #363636;
qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6;
}
+DvItemViewerTitleBar {
+ qproperty-ColColor: #484848;
+ qproperty-ColSortedColor: #484848;
+ qproperty-ColTextColor: #e6e6e6;
+ qproperty-ColBorderColor: #222222;
+ qproperty-ColReliefColor: #484848;
+}
#FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel {
- background-color: #484848;
+ background-color: #2f2f2f;
}
#FileBrowser #castFrame,
#SceneCast #castFrame {
- border-top: 1 solid #272727;
- border-right: 1 solid #272727;
- border-bottom: 1 solid #272727;
+ border-top: 1 solid #222222;
+ border-right: 1 solid #222222;
+ border-bottom: 1 solid #222222;
margin: 0;
}
#FileBrowser QToolButton,
@@ -1211,9 +1186,9 @@ StyledTreeView {
qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff;
- alternate-background-color: #393939;
- background-color: #343434;
- border: 1 solid #272727;
+ alternate-background-color: #363636;
+ background-color: #2f2f2f;
+ border: 1 solid #222222;
}
#FileDoesNotExistLabel {
color: #ff0000;
@@ -1222,7 +1197,7 @@ StyledTreeView {
Scene Cast
----------------------------------------------------------------------------- */
#SceneCast QToolBar {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
}
#SceneCast QToolButton {
margin: 3 1 2 1;
@@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0;
margin: 0;
}
+#CastBrowser QSplitter::handle {
+ height: 4;
+}
+#CastBrowserFolderName {
+ border-bottom: 1px solid #222222;
+}
/* -----------------------------------------------------------------------------
Level Strip
----------------------------------------------------------------------------- */
@@ -1347,14 +1328,14 @@ PencilTestPopup {
margin-left: -4;
}
#StopMotionController #bottomWidget {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
padding: 3 2 8 3;
}
#StopMotionController #bottomWidget QPushButton {
padding: 3 5;
}
#StopMotionTabBar::tab::first {
- border-left: 1 solid #272727;
+ border-left: 1 solid #222222;
}
/* -----------------------------------------------------------------------------
Unknowns + Legacy
@@ -1385,21 +1366,18 @@ QStatusBar #StatusBarLabel {
Style Editor
----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer {
- margin-left: -5;
+ margin-left: -5px;
}
#StyleEditor #bottomWidget {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
padding: 3 2 8 3;
}
#StyleEditor #bottomWidget QPushButton {
padding: 3 5;
}
-#StyleEditorTabBar {
- padding: 0;
- margin: 0;
-}
-#StyleEditorTabBar::tab:first {
- border-left: 1 solid #272727;
+#StyleEditorTabBar::tab:first,
+#StyleEditorTabBar::tab:only-one {
+ border-left: 0;
}
#HexagonalColorWheel {
qproperty-BGColor: #484848;
@@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center;
min-height: 16;
padding: 0;
- min-width: 18;
+ min-width: 10;
}
#colorSliderAddButton {
image: url('imgs/white/scroll-right.svg');
@@ -1430,7 +1408,7 @@ QStatusBar #StatusBarLabel {
image: url('imgs/white/scroll-left.svg');
}
#PlainColorPageParts {
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
}
#PlainColorPageParts QLineEdit {
max-width: 35;
@@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0;
padding: 2 0 2 0;
}
-#PaletteTabBar::tab {
- padding-bottom: 4;
+#PaletteTabBar::tab:first,
+#PaletteTabBar::tab:only-one {
+ border-left: 0;
+}
+#PaletteTabBar::tab:only-one {
+ border-right: 1 solid #222222;
}
#PageViewer {
qproperty-TextColor: #e6e6e6;
+ qproperty-ListLineColor: #222222;
}
#PaletteLockButton {
border-radius: 0;
@@ -1496,7 +1479,7 @@ QDialog {
}
QDialog #dialogButtonFrame {
background-color: #3e3e3e;
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
}
QDialog #dialogButtonFrame QPushButton {
border-color: #3e3e3e;
@@ -1525,9 +1508,9 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences
----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget {
- background-color: #343434;
- alternate-background-color: #343434;
- border: 1 solid #272727;
+ background-color: #2f2f2f;
+ alternate-background-color: #2f2f2f;
+ border: 1 solid #222222;
font-size: 13px;
}
#PreferencesPopup QListWidget::item {
@@ -1546,7 +1529,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Keyboard Shortcuts
----------------------------------------------------------------------------- */
#ShortcutTree {
- border: 1 solid #272727;
+ border: 1 solid #222222;
}
#ShortcutTree::item {
padding: 1 0;
@@ -1642,22 +1625,13 @@ SchematicViewer {
}
#SchematicSceneViewer {
background-color: #3b3b3b;
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
}
/* -----------------------------------------------------------------------------
FX Settings
----------------------------------------------------------------------------- */
-#FxSettingsTabBar::tab {
- border-top: 1 solid #272727;
-}
-#FxSettingsTabBar::tab::first,
-#FxSettingsTabBar::tab::only-one {
- border-left: 1 solid #272727;
-}
FxSettings QToolBar {
- border-top: 1 solid #272727;
- border-right: 1 solid #272727;
- border-left: 1 solid #272727;
+ border: 1 1 0 1 solid #222222;
min-height: 23;
padding: 3 0;
}
@@ -1701,7 +1675,7 @@ ChannelBar {
color: #e6e6e6;
}
#Tasks QToolBar {
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
margin: 0;
padding: 0;
}
@@ -1718,11 +1692,11 @@ ChannelBar {
Tool Options
----------------------------------------------------------------------------- */
#ToolOptions TPanelTitleBar {
- border-right: 1 solid #272727;
+ border-right: 1 solid #222222;
border-bottom: 0;
}
#CommandBar TPanelTitleBar {
- border-right: 1 solid #272727;
+ border-right: 1 solid #222222;
border-bottom: 0;
}
IconViewField {
@@ -1815,7 +1789,7 @@ QToolBar#WidePaddingToolBar QToolButton {
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
#ComboViewerPanel Toolbar {
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
}
#ComboViewerPanel Toolbar::separator:horizontal {
margin: 0 0 0 2;
@@ -1824,14 +1798,14 @@ QToolBar#WidePaddingToolBar QToolButton {
margin: 2 0 3 2;
}
#ComboViewerToolOptions {
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
}
#ComboViewer #ToolBarContainer,
#ViewerPanel #ToolBarContainer,
FlipBook #ToolBarContainer {
background-color: transparent;
- border-top: 2 solid #272727;
- border-bottom: 1 solid #272727;
+ border-top: 2 solid #222222;
+ border-bottom: 1 solid #222222;
padding-right: -1;
}
#flipCustomize {
@@ -2069,7 +2043,7 @@ XsheetViewer {
Function Editor
----------------------------------------------------------------------------- */
#FunctionEditor QToolBar {
- border-bottom: 1 solid #272727;
+ border-bottom: 1 solid #222222;
}
#FunctionEditor QToolBar QToolBar {
border: 0;
@@ -2081,7 +2055,7 @@ XsheetViewer {
height: 18;
}
#FunctionEditorTree {
- border-top: 1 solid #272727;
+ border-top: 1 solid #222222;
}
FunctionTreeView {
qproperty-TextColor: #e6e6e6;
diff --git a/stuff/config/qss/Medium/less/.vscode/settings.json b/stuff/config/qss/Medium/less/.vscode/settings.json
index b0c3c82d..2d0261eb 100644
--- a/stuff/config/qss/Medium/less/.vscode/settings.json
+++ b/stuff/config/qss/Medium/less/.vscode/settings.json
@@ -4,7 +4,7 @@
// [EasyLess Extension] Compile Config
"less.compile": {
- "compress": true,
+ "compress": false,
"sourceMap": false,
"out": false
},
diff --git a/stuff/config/qss/Medium/less/Medium.less b/stuff/config/qss/Medium/less/Medium.less
index 9595d0fd..6e5a6e05 100644
--- a/stuff/config/qss/Medium/less/Medium.less
+++ b/stuff/config/qss/Medium/less/Medium.less
@@ -5,15 +5,15 @@
// -----------------------------------------------------------------------------
// This is the default theme. All other themes derive from this.
// -----------------------------------------------------------------------------
-
// Include All
@import 'main';
// Resource Location
@img-url: 'imgs/white';
-@bg: #484848;
-@accent: darken(@bg, 13);
+@bg: #484848; // normal
+@bg-dark: darken(@bg, 10); // dark
+@accent: darken(@bg, 15); // darkest
@text-color: rgb(230, 230, 230);
@text-color-disabled: rgba(230, 230, 230, 0.4);
@@ -25,7 +25,7 @@
@hl-text-color-secondary: @text-color;
@dock-bg-color: darken(@bg, 18);
-@dock-placeholder-color: #F77272;
+@dock-placeholder-color: rgba(0, 0, 0, 0.5);
@dialogButtonFrame-bg-color: darken(@bg, 4);
@dialogButtonFrame-border-color: @accent;
@@ -41,18 +41,18 @@
// Tabs
// -----------------------------------------------------------------------------
-// Container
@tabbar-bg-color: darken(@bg, 6);
// Tabs
@tab-bg-color: @tabbar-bg-color;
@tab-text-color: mix(@tab-bg-color, @text-color, 40);
+@tab-border-color: @accent;
@tab-bg-color-hover: @tab-bg-color-selected;
@tab-text-color-hover: @tab-text-color;
@tab-bg-color-selected: @bg;
-@tab-text-color-selected: lighten(@text-color, 15);
+@tab-text-color-selected: @text-color;
// -----------------------------------------------------------------------------
// Topbar & Workspaces
@@ -68,8 +68,8 @@
@rooms-tab-bg-color-hover: @tab-bg-color-hover;
@rooms-text-color-hover: @rooms-tab-text-color;
-@rooms-tab-bg-color-selected: @bg;
-@rooms-tab-text-color-selected: @tab-text-color-selected;
+@rooms-tab-bg-color-selected: @hl-bg-color;
+@rooms-tab-text-color-selected: @hl-text-color;
// -----------------------------------------------------------------------------
// Menu
@@ -82,22 +82,12 @@
@menu-checkbox-text-color-selected: @text-color;
@menu-item-bg-color-disabled-hover: lighten(@menu-bg-color, 8);
-// -----------------------------------------------------------------------------
-// Titlebars
-// -----------------------------------------------------------------------------
-
-@title-bg-color: darken(@bg, 6);
-@title-text-color: lighten(@bg, 30);
-@title-text-color-active: #fff;
-
-@title-active-border-pixmap: 'none';
-
// -----------------------------------------------------------------------------
// Scrollbars
// -----------------------------------------------------------------------------
// Container
-@scrollbar-bg-color: darken(@bg, 8);
+@scrollbar-bg-color: @bg-dark;
// Handle
@scrollbar-handle-border-size: 1;
@@ -153,8 +143,7 @@
@scrollable-button-bg-color: @button-bg-color;
@scrollable-button-bg-color-hover: @button-bg-color-hover;
@scrollable-button-bg-color-pressed: @button-bg-color-pressed;
-
-@scrollable-button-border-color: red;
+@scrollable-button-border-color: @button-border-color;
// -----------------------------------------------------------------------------
// Tool Buttons
@@ -208,6 +197,7 @@
@input-bg-color: darken(@bg, 10);
@input-border-color: darken(@input-bg-color, 1);
+@input-border-radius: 2;
@input-text-color: @text-color;
@input-bg-color-focus: @input-bg-color;
@@ -277,13 +267,28 @@
@slider-left-handle-disabled: @slider-handle-img-disabled;
@slider-right-handle-disabled: @slider-handle-img-disabled;
+// -----------------------------------------------------------------------------
+// Titlebars
+// -----------------------------------------------------------------------------
+
+@title-bg-color: darken(@bg, 6);
+@title-text-color: lighten(@bg, 30);
+@title-text-color-active: #fff;
+
+@title-active-border-pixmap: 'none';
+
+@title-button-rollover-color: @button-bg-color-hover;
+@title-button-pressed-color: @hl-bg-color;
+@title-button-freeze-color: @toolbutton-lock-bg-color-checked;
+@title-button-preview-color: rgb(0, 255, 157);
+
// -----------------------------------------------------------------------------
// File Browser / Trees
// -----------------------------------------------------------------------------
// Trees
-@tree-bg-color: darken(@bg, 8);
-@tree-bg-color-alt: lighten(@tree-bg-color, 2);
+@tree-bg-color: darken(@bg, 10);
+@tree-bg-color-alt: lighten(@tree-bg-color, 3);
@prefs-tree-bg-color: @tree-bg-color;
@prefs-tree-hl-color: @hl-bg-color-secondary;
@@ -295,9 +300,16 @@
@browser-listview-bg-color: @tree-bg-color;
@browser-listview-bg-color-alt: @browser-listview-bg-color;
-// Right Pane
-@browser-itemview-bg-color: @bg;
-@browser-itemview-bg-color-alt: darken(@browser-itemview-bg-color, 3);
+// Right Pane: Order Column
+@browser-itemview-col-color: @bg;
+@browser-itemview-col-color-sorted: @browser-itemview-col-color;
+@browser-itemview-col-text-color: @text-color;
+@browser-itemview-col-border-color: @accent;
+@browser-itemview-col-relief-color: @browser-itemview-col-color;
+
+// Right Pane: BG
+@browser-itemview-bg-color: @tree-bg-color;
+@browser-itemview-bg-color-alt: @tree-bg-color-alt;
// -----------------------------------------------------------------------------
// Viewer Window
@@ -493,15 +505,6 @@
@schematic-text-color: @xsheet-text-color;
@schematic-VerticalLine-color: @xsheet-VerticalLine-color;
-@schematic-LevelColumn-color: @xsheet-LevelColumn-color;
-@schematic-VectorColumn-color: @xsheet-VectorColumn-color;
-@schematic-ChildColumn-color: @xsheet-ChildColumn-color;
-@schematic-FullColorColumn-color: @xsheet-FullColorColumn-color;
-@schematic-FxColumn-color: @xsheet-FxColumn-color;
-@schematic-PaletteColumn-color: @xsheet-PaletteColumn-color;
-@schematic-MeshColumn-color: @xsheet-MeshColumn-color;
-@schematic-ReferenceColumn-color: @xsheet-ReferenceColumn-color;
-
@schematic-PreviewButtonBgOn-color: @xsheet-PreviewButtonBgOn-color;
@schematic-PreviewButtonOnImage: @xsheet-PreviewButtonOnImage;
@schematic-PreviewButtonBgOff-color: @xsheet-ReferenceColumn-color;
diff --git a/stuff/config/qss/Medium/less/components/all.less b/stuff/config/qss/Medium/less/components/all.less
index d17b4d90..fa70ded0 100644
--- a/stuff/config/qss/Medium/less/components/all.less
+++ b/stuff/config/qss/Medium/less/components/all.less
@@ -5,4 +5,3 @@
@import 'buttons';
@import 'frames';
@import 'icons';
-@import 'tabs';
diff --git a/stuff/config/qss/Medium/less/layouts/controls.less b/stuff/config/qss/Medium/less/layouts/controls.less
index 5643336d..ffd771b6 100644
--- a/stuff/config/qss/Medium/less/layouts/controls.less
+++ b/stuff/config/qss/Medium/less/layouts/controls.less
@@ -123,7 +123,7 @@ QComboBox {
.LineEdit {
background-color: @input-bg-color;
border: 1 solid @input-border-color;
- border-radius: 2;
+ border-radius: @input-border-radius;
color: @input-text-color;
selection-background-color: @input-selection-bg-color;
selection-color: @input-selection-text-color;
diff --git a/stuff/config/qss/Medium/less/layouts/filebrowser.less b/stuff/config/qss/Medium/less/layouts/filebrowser.less
index 89fa031a..b52f2f59 100644
--- a/stuff/config/qss/Medium/less/layouts/filebrowser.less
+++ b/stuff/config/qss/Medium/less/layouts/filebrowser.less
@@ -7,7 +7,7 @@
#DirTreeView {
background-color: @browser-listview-bg-color;
- alternate-background-color: @browser-listview-bg-color-alt;
+ alternate-background-color: @browser-listview-bg-color;
border: 1 solid @accent;
border-right: 0;
}
@@ -22,7 +22,13 @@ DvItemViewerPanel {
qproperty-FolderTextColor: @browser-folder-text-color;
qproperty-SelectedItemBackground: @hl-bg-color;
}
-
+DvItemViewerTitleBar {
+ qproperty-ColColor: @browser-itemview-col-color;
+ qproperty-ColSortedColor: @browser-itemview-col-color-sorted;
+ qproperty-ColTextColor: @browser-itemview-col-text-color;
+ qproperty-ColBorderColor: @browser-itemview-col-border-color;
+ qproperty-ColReliefColor: @browser-itemview-col-relief-color;
+}
#FileBrowser {
& DvItemViewerPanel {
background-color: @browser-itemview-bg-color;
@@ -84,8 +90,13 @@ StyledTreeView {
}
}
-// PR #1104
#CastBrowser {
border: 0;
margin: 0;
+ & QSplitter::handle {
+ height: 4;
+ }
+}
+#CastBrowserFolderName {
+ border-bottom: 1px solid @accent;
}
diff --git a/stuff/config/qss/Medium/less/layouts/format.less b/stuff/config/qss/Medium/less/layouts/format.less
index d6cfd437..e8fc3e91 100644
--- a/stuff/config/qss/Medium/less/layouts/format.less
+++ b/stuff/config/qss/Medium/less/layouts/format.less
@@ -7,16 +7,16 @@
& #CleanupSettingsFrame {
// space out the boxes vertically
// needs margin for good placement
+ &:extend(.frame all);
margin-top: 2;
margin-bottom: 4;
}
& QGroupBox {
margin-bottom: 3;
}
-}
-
-#CleanupSettingsFrame {
- &:extend(.frame all);
+ & QScrollArea {
+ &:extend(.frame all);
+ }
}
#CleanupSettingsShowButton {
diff --git a/stuff/config/qss/Medium/less/layouts/mainwindow.less b/stuff/config/qss/Medium/less/layouts/mainwindow.less
index 9e35bb8f..edf42f3d 100644
--- a/stuff/config/qss/Medium/less/layouts/mainwindow.less
+++ b/stuff/config/qss/Medium/less/layouts/mainwindow.less
@@ -10,15 +10,7 @@ QWidget {
}
}
-TPanel {
- // Placeholder
-}
-
-QFrame {
- border: 0;
- margin: 0;
- padding: 0;
-}
+QFrame { border: 0; margin: 0; padding: 0; }
QToolTip,
#helpToolTip {
@@ -42,7 +34,7 @@ QSplitter::handle {
TPanel {
background-color: @dock-bg-color;
-}
+}
/* -----------------------------------------------------------------------------
Topbar
@@ -86,7 +78,7 @@ QMenuBar {
background-color: @topbar-bg-color;
border-left: 1 solid @topbar-bg-color; // Helps to align with QMenu
margin: 0;
- padding: 3 5;
+ padding: 3 5 3 5;
&:selected {
.hl-color-secondary;
}
@@ -101,29 +93,25 @@ QMenuBar {
----------------------------------------------------------------------------- */
#TopBarTab {
- margin: 0;
- padding: 0;
&::tab {
- background-color: @rooms-tab-bg-color;
- border-top: 1 solid @accent;
- border-right: 1 solid @accent;
- color: @rooms-tab-text-color;
- margin: 0 0 0 0;
- padding: 2 8 3 8;
- &:hover {
- background-color: @rooms-tab-bg-color-hover;
- color: @rooms-text-color-hover;
+ margin: 0;
+ padding: 2 7 3 8;
+ border-bottom: 0;
+ &:hover, &:selected {
+ border-bottom: 0;
}
&:selected {
- background-color: @rooms-tab-bg-color-selected;
color: @rooms-tab-text-color-selected;
+ background-color: @rooms-tab-bg-color-selected;
}
- &:first {
- border-left: 1 solid @accent;
- }
- &:last {
- border-right: 1 solid @accent;
- }
+ }
+ & QToolButton {
+ border-left: 2 solid @accent;
+ border-top: 1 solid @accent;
+ border-right: 1 solid @accent;
+ border-bottom: 0;
+ margin-left: -1;
+ margin-top: 0;
}
}
@@ -165,7 +153,7 @@ QMenu {
&::icon {
border-radius: 2;
margin: 0 0 0 3;
- padding: 1;
+ padding: 0;
&:checked {
background-color: @hl-bg-color;
}
@@ -207,6 +195,13 @@ TPanelTitleBar {
qproperty-FloatActiveBorderPixmap: url('@{img-url}/@{title-active-border-pixmap}');
}
+TPanelTitleBarButton {
+ qproperty-RolloverColor: @title-button-rollover-color;
+ qproperty-PressedColor: @title-button-pressed-color;
+ qproperty-FreezeColor: @title-button-freeze-color;
+ qproperty-PreviewColor: @title-button-preview-color;
+}
+
/* -----------------------------------------------------------------------------
Scrollbars
----------------------------------------------------------------------------- */
@@ -377,16 +372,16 @@ QToolButton {
.DvScrollWidget {
& QPushButton {
- background-color: @scrollable-button-bg-color;
- border: 0 solid @scrollable-button-border-color;
+ background-color: @bg;
+ border: 0 solid @accent;
border-radius: 0;
padding: 0;
max-width: 16;
&:hover {
- background-color: @scrollable-button-bg-color-hover;
+ background-color: @button-bg-color-hover;
}
&:pressed {
- background-color: @scrollable-button-bg-color-pressed;
+ background-color: @button-bg-color-pressed;
}
}
}
@@ -452,7 +447,7 @@ DvScrollWidget {
}
/* -----------------------------------------------------------------------------
- Trees
+ Item Tree
----------------------------------------------------------------------------- */
.treeview {
@@ -522,14 +517,56 @@ QListView {
}
/* -----------------------------------------------------------------------------
- Tab Systems
+ Tabs
----------------------------------------------------------------------------- */
#TabBarContainer {
- &:extend(.tab-container);
background-color: @tabbar-bg-color;
+ qproperty-BottomAboveLineColor: @tabbar-bg-color;
+ qproperty-BottomBelowLineColor: @accent;
+}
+QTabBar {
+ background-color: @tabbar-bg-color;
+ margin-bottom: 1;
+ &::tear {}
+ & QToolButton {
+ background-color: @bg;
+ border-radius: 0;
+ margin-right: 0;
+ margin-top: -1;
+ margin-bottom: 0;
+ border-bottom: 1 solid @accent;
+ border-left: 1 solid @accent;
+ padding: 3 2 2 2;
+ &:hover {
+ border-bottom: 1 solid @accent;
+ border-left: 1 solid @accent;
+ }
+ &:disabled {
+ color: @text-color-disabled;
+ }
+ }
+ &::tab {
+ margin-top: -1; // hide top border
+ background-color: @tabbar-bg-color;
+ border: 1 solid @tab-border-color;
+ border-right: 0;
+ color: @tab-text-color;
+ min-width: 8ex;
+ padding: 3 4 4 4; // y = helps borders to show for the TabBar
+ &:selected {
+ background-color: @tab-bg-color-selected;
+ border-bottom-color: @bg;
+ color: @tab-text-color-selected;
+ }
+ &:hover {
+ background-color: @tab-bg-color-hover;
+ }
+ &:last, &:only-one {
+ border-right: 1 solid @tab-border-color;
+ }
+ }
}
-
/* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget
@@ -538,36 +575,36 @@ QListView {
#toolOptionsPanel {
QPushButton {
background-color: @button-bg-color;
- border: 1 solid @button-border-color;
- border-radius: 2;
- color: @button-text-color;
- margin: 0;
- padding: 0;
- &:hover {
- background-color: @button-bg-color-hover;
- border-color: @button-border-color-hover;
- color: @button-text-color-hover;
- }
- &:pressed {
- background-color: @button-bg-color-pressed;
- border-color: @button-border-color-pressed;
- color: @button-text-color-pressed;
- }
- &:checked {
- background-color: @button-bg-color-checked;
- border-color: @button-border-color-checked;
- color: @button-text-color-checked;
+ border: 1 solid @button-border-color;
+ border-radius: 2;
+ color: @button-text-color;
+ margin: 0;
+ padding: 0;
&:hover {
- background-color: @button-bg-color-checked-hover;
- &:pressed {
- background: @button-bg-color-checked-hover-pressed;
+ background-color: @button-bg-color-hover;
+ border-color: @button-border-color-hover;
+ color: @button-text-color-hover;
+ }
+ &:pressed {
+ background-color: @button-bg-color-pressed;
+ border-color: @button-border-color-pressed;
+ color: @button-text-color-pressed;
+ }
+ &:checked {
+ background-color: @button-bg-color-checked;
+ border-color: @button-border-color-checked;
+ color: @button-text-color-checked;
+ &:hover {
+ background-color: @button-bg-color-checked-hover;
+ &:pressed {
+ background: @button-bg-color-checked-hover-pressed;
+ }
}
}
+ &:disabled {
+ background-color: @button-bg-color-disabled;
+ border-color: @button-border-color-disabled;
+ color: @button-text-color-disabled;
+ }
}
- &:disabled {
- background-color: @button-bg-color-disabled;
- border-color: @button-border-color-disabled;
- color: @button-text-color-disabled;
- }
- }
-}
\ No newline at end of file
+}
diff --git a/stuff/config/qss/Medium/less/layouts/palette.less b/stuff/config/qss/Medium/less/layouts/palette.less
index 59aed6dc..478af5bd 100644
--- a/stuff/config/qss/Medium/less/layouts/palette.less
+++ b/stuff/config/qss/Medium/less/layouts/palette.less
@@ -4,25 +4,21 @@
#StyleEditor {
& #TabBarContainer {
- margin-left: -5; // reset left edge margin
+ margin-left: -5px;
}
& #bottomWidget {
border-top: 1 solid @accent;
padding: 3 2 8 3;
& QPushButton {
- // override above margin reset
padding: 3 5;
}
}
}
#StyleEditorTabBar {
- padding: 0;
- margin: 0;
&::tab {
- &:extend(.tab-flat all);
- &:first {
- border-left: 1 solid @accent;
+ &:first, &:only-one {
+ border-left: 0;
}
}
}
@@ -34,7 +30,6 @@
/* -------------------------------------------------------------------------- */
/* Horizontal QSlider */
-
#colorSlider {
&::groove:horizontal {
height: 1;
@@ -53,7 +48,7 @@
image-position: center center;
min-height: 16;
padding: 0;
- min-width: 18;
+ min-width: 10;
&:hover {
&:extend(.button-tool:hover);
}
@@ -78,9 +73,7 @@
}
#colorSliderLabel,
-#colorSliderField {
- // Placeholder
-}
+#colorSliderField {}
/* -----------------------------------------------------------------------------
Palette Viewer / Studio Palette
@@ -113,29 +106,29 @@ PaletteViewer {
margin: 0; // very compact space so we remove margin
}
& QToolButton {
- &:extend(.button-flat all);
+ &:extend(.button-flat all); // use flat style for button
margin: 0;
padding: 2 0 2 0;
-
}
}
}
-#StudioPalette {
- // placeholder
-}
-
+#StudioPalette {}
#PaletteTabBar {
&::tab {
- &:extend(.tab-flat all);
- padding-bottom: 4; // allow QToolBar's bottom border to show
- // since default tab padding is 3 (vert)
- // this adds 1 extra (3+1)
+ &:first, &:only-one {
+ border-left: 0;
+ }
+ &:only-one {
+ border-right: 1 solid @tab-border-color;
+ }
}
}
#PageViewer {
qproperty-TextColor: @text-color;
+ qproperty-ListLineColor: @accent;
+
}
#PaletteLockButton {
diff --git a/stuff/config/qss/Medium/less/layouts/schematic.less b/stuff/config/qss/Medium/less/layouts/schematic.less
index ca3f9591..640d0f52 100644
--- a/stuff/config/qss/Medium/less/layouts/schematic.less
+++ b/stuff/config/qss/Medium/less/layouts/schematic.less
@@ -6,14 +6,14 @@ SchematicViewer {
qproperty-TextColor: @schematic-text-color;
qproperty-VerticalLineColor: @schematic-VerticalLine-color;
- qproperty-LevelColumnColor: @schematic-LevelColumn-color;
- qproperty-VectorColumnColor: @schematic-VectorColumn-color;
- qproperty-ChildColumnColor: @schematic-ChildColumn-color;
- qproperty-FullcolorColumnColor: @schematic-FullColorColumn-color;
- qproperty-FxColumnColor: @schematic-FxColumn-color;
- qproperty-PaletteColumnColor: @schematic-PaletteColumn-color;
- qproperty-MeshColumnColor: @schematic-MeshColumn-color;
- qproperty-ReferenceColumnColor: @schematic-ReferenceColumn-color;
+ qproperty-LevelColumnColor: @xsheet-LevelColumn-color;
+ qproperty-VectorColumnColor: @xsheet-VectorColumn-color;
+ qproperty-ChildColumnColor: @xsheet-ChildColumn-color;
+ qproperty-FullcolorColumnColor: @xsheet-FullColorColumn-color;
+ qproperty-FxColumnColor: @xsheet-FxColumn-color;
+ qproperty-PaletteColumnColor: @xsheet-PaletteColumn-color;
+ qproperty-MeshColumnColor: @xsheet-MeshColumn-color;
+ qproperty-ReferenceColumnColor: @xsheet-ReferenceColumn-color;
qproperty-TableColor: @schematic-TableColor;
qproperty-ActiveCameraColor: @schematic-ActiveCameraColor;
@@ -72,22 +72,11 @@ SchematicViewer {
FX Settings
----------------------------------------------------------------------------- */
-#FxSettingsTabBar {
- &::tab {
- &:extend(.tab-flat all);
- border-top: 1 solid @accent;
- &::first,
- &::only-one {
- border-left: 1 solid @accent;
- }
- }
-}
+#FxSettingsTabBar {}
FxSettings {
& QToolBar {
- border-top: 1 solid @accent;
- border-right: 1 solid @accent;
- border-left: 1 solid @accent;
+ border: 1 1 0 1 solid @accent;
min-height: 23; // prevent shrinking
padding: 3 0;
& QToolBar {
@@ -118,4 +107,4 @@ FxSettings {
ChannelBar {
qproperty-TextColor: @text-color;
-}
\ No newline at end of file
+}
diff --git a/stuff/config/qss/Medium/less/themes/Dark.less b/stuff/config/qss/Medium/less/themes/Dark.less
index 819fe47e..cc498956 100644
--- a/stuff/config/qss/Medium/less/themes/Dark.less
+++ b/stuff/config/qss/Medium/less/themes/Dark.less
@@ -12,51 +12,20 @@
@bg: #303030;
@accent: darken(@bg, 10);
-@text-color: rgb(233, 233, 233);
-@text-color-disabled: rgba(233, 233, 233, 0.4);
-@dock-bg-color: darken(@bg, 14);
-@dialogButtonFrame-bg-color: darken(@bg, 3);
// -----------------------------------------------------------------------------
// Menu
// -----------------------------------------------------------------------------
-@menu-text-color: @text-color;
@menu-bg-color: darken(@bg, 4);
@menu-border-color: lighten(@menu-bg-color, 15);
-@menu-separator-color: lighten(@menu-bg-color, 15);
+@menu-separator-color: @menu-border-color;
// -----------------------------------------------------------------------------
// Trees
// -----------------------------------------------------------------------------
-@tree-bg-color: darken(@bg, 4);
-
-// -----------------------------------------------------------------------------
-// Tabs
-// -----------------------------------------------------------------------------
-
-// Container
-@tabbar-bg-color: darken(@bg, 4);
-
-// -----------------------------------------------------------------------------
-// Titlebars
-// -----------------------------------------------------------------------------
-
-@title-bg-color: darken(@bg, 4);
-
-// -----------------------------------------------------------------------------
-// Scroll Bars
-// -----------------------------------------------------------------------------
-
-// Frame
-@scrollbar-bg-color: darken(@bg, 4);
-
-// -----------------------------------------------------------------------------
-// Button
-// -----------------------------------------------------------------------------
-
-@button-bg-color: lighten(@bg, 15);
+@tree-bg-color: darken(@bg, 6);
// -----------------------------------------------------------------------------
// Textfield
@@ -69,12 +38,10 @@
// CheckBox
// -----------------------------------------------------------------------------
-@checkbox-border-color: lighten(@input-border-color, 10);
+@checkbox-border-color: @input-border-color;
@checkbox-border-color-disabled: @input-border-color-disabled;
-
@checkbox-border-color-hover: lighten(@bg, 70);
-
-@checkbox-border-color-checked: darken(@checkbox-bg-color-checked, 0);
+@checkbox-border-color-checked: @checkbox-bg-color-checked;
// For RadioButton
@radiobutton-img-unchecked: 'radiobutton-dark_unchecked.svg';
@@ -99,7 +66,6 @@
// Flip Slider
@flipmarker-img: 'flipmarker_dark.svg';
@flipslider-img: 'flipslider_dark.svg';
-@flipslider-base-color: darken(@bg, 8);
// -----------------------------------------------------------------------------
// Progress Bar
@@ -112,14 +78,10 @@
// -----------------------------------------------------------------------------
@xsheet-bg-color: darken(@bg, 2);
-
@xsheet-OnionSkinAreaBG-color: darken(@bg, 4);
-
@xsheet-EmptyColumnHead-color: lighten(@bg, 8);
-
@xsheet-EmptyCell-color: @bg;
@xsheet-NotEmptyColumn-color: lighten(@bg, 3);
-
@xsheet-LightLightBG-color: @xsheet-EmptyCell-color;
// -----------------------------------------------------------------------------
diff --git a/stuff/config/qss/Medium/less/themes/Light.less b/stuff/config/qss/Medium/less/themes/Light.less
index 4a5284ee..11bc8262 100644
--- a/stuff/config/qss/Medium/less/themes/Light.less
+++ b/stuff/config/qss/Medium/less/themes/Light.less
@@ -10,15 +10,15 @@
// Resource Location
@img-url: '../Medium/imgs/black';
-@bg: #808080;
+@bg: #DBDBDB;
@accent: darken(@bg, 25);
@text-color: #000;
-@text-color-disabled: rgba(0, 0, 0, 0.466);
+@text-color-disabled: rgba(43, 20, 20, 0.466);
@dock-bg-color: darken(@bg, 35);
-@hl-bg-color: rgb(34, 91, 175);
-@hl-text-color: #FFFFFF;
+@hl-bg-color: #F19A86;
+@hl-text-color: rgb(0, 0, 0);
@hl-bg-color-secondary: lighten(@bg, 12);
@label-title: rgb(0, 0, 0);
@@ -90,7 +90,7 @@
// -----------------------------------------------------------------------------
// Trees
-@tree-bg-color: darken(@bg, 5);
+@tree-bg-color: lighten(@bg, 0);
@tree-bg-color-alt: lighten(@tree-bg-color, 3);
@prefs-tree-bg-color: @tree-bg-color;
@prefs-tree-hl-color: lighten(@prefs-tree-bg-color, 8);
@@ -104,7 +104,7 @@
@browser-listview-bg-color-alt: @browser-listview-bg-color;
// Right Pane
-@browser-itemview-bg-color: @bg;
+@browser-itemview-bg-color: @tree-bg-color;
@browser-itemview-bg-color-alt: darken(@browser-itemview-bg-color, 3);
// -----------------------------------------------------------------------------
@@ -161,9 +161,10 @@
// Textfield
// -----------------------------------------------------------------------------
-@input-bg-color: lighten(@bg, 40);
-@input-text-color: @text-color;
-@input-border-color: darken(@bg, 18);
+@input-bg-color: darken(@bg, 30);
+@input-text-color: rgb(255, 255, 255);
+@input-border-color: darken(@input-bg-color, 5);
+@input-border-radius: 2;
@input-border-color-focus: rgb(1, 89, 253);
diff --git a/toonz/sources/toonz/Resources/pane_3d_off.svg b/toonz/sources/toonz/Resources/pane_3d.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_3d_off.svg
rename to toonz/sources/toonz/Resources/pane_3d.svg
diff --git a/toonz/sources/toonz/Resources/pane_3d_on.svg b/toonz/sources/toonz/Resources/pane_3d_on.svg
deleted file mode 100644
index a4fdb9ea..00000000
--- a/toonz/sources/toonz/Resources/pane_3d_on.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_3d_over.svg b/toonz/sources/toonz/Resources/pane_3d_over.svg
deleted file mode 100644
index 174d1b2a..00000000
--- a/toonz/sources/toonz/Resources/pane_3d_over.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_cam_off.svg b/toonz/sources/toonz/Resources/pane_cam.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_cam_off.svg
rename to toonz/sources/toonz/Resources/pane_cam.svg
diff --git a/toonz/sources/toonz/Resources/pane_cam_on.svg b/toonz/sources/toonz/Resources/pane_cam_on.svg
deleted file mode 100644
index 49e943aa..00000000
--- a/toonz/sources/toonz/Resources/pane_cam_on.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_cam_over.svg b/toonz/sources/toonz/Resources/pane_cam_over.svg
deleted file mode 100644
index 102a2278..00000000
--- a/toonz/sources/toonz/Resources/pane_cam_over.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_freeze_off.svg b/toonz/sources/toonz/Resources/pane_freeze.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_freeze_off.svg
rename to toonz/sources/toonz/Resources/pane_freeze.svg
diff --git a/toonz/sources/toonz/Resources/pane_freeze_on.svg b/toonz/sources/toonz/Resources/pane_freeze_on.svg
deleted file mode 100644
index 02282f45..00000000
--- a/toonz/sources/toonz/Resources/pane_freeze_on.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_freeze_over.svg b/toonz/sources/toonz/Resources/pane_freeze_over.svg
deleted file mode 100644
index a651bfb1..00000000
--- a/toonz/sources/toonz/Resources/pane_freeze_over.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_grid_off.svg b/toonz/sources/toonz/Resources/pane_grid.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_grid_off.svg
rename to toonz/sources/toonz/Resources/pane_grid.svg
diff --git a/toonz/sources/toonz/Resources/pane_grid_on.svg b/toonz/sources/toonz/Resources/pane_grid_on.svg
deleted file mode 100644
index 02ba9a45..00000000
--- a/toonz/sources/toonz/Resources/pane_grid_on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_grid_over.svg b/toonz/sources/toonz/Resources/pane_grid_over.svg
deleted file mode 100644
index 9d51471e..00000000
--- a/toonz/sources/toonz/Resources/pane_grid_over.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_minimize_on.svg b/toonz/sources/toonz/Resources/pane_minimize_on.svg
deleted file mode 100644
index 5b4c5434..00000000
--- a/toonz/sources/toonz/Resources/pane_minimize_on.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_minimize_over.svg b/toonz/sources/toonz/Resources/pane_minimize_over.svg
deleted file mode 100644
index a5b74d73..00000000
--- a/toonz/sources/toonz/Resources/pane_minimize_over.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_preview_off.svg b/toonz/sources/toonz/Resources/pane_preview.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_preview_off.svg
rename to toonz/sources/toonz/Resources/pane_preview.svg
diff --git a/toonz/sources/toonz/Resources/pane_preview_on.svg b/toonz/sources/toonz/Resources/pane_preview_on.svg
deleted file mode 100644
index 134da8cb..00000000
--- a/toonz/sources/toonz/Resources/pane_preview_on.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_preview_over.svg b/toonz/sources/toonz/Resources/pane_preview_over.svg
deleted file mode 100644
index 834269cd..00000000
--- a/toonz/sources/toonz/Resources/pane_preview_over.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_safe_off.svg b/toonz/sources/toonz/Resources/pane_safe.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_safe_off.svg
rename to toonz/sources/toonz/Resources/pane_safe.svg
diff --git a/toonz/sources/toonz/Resources/pane_safe_on.svg b/toonz/sources/toonz/Resources/pane_safe_on.svg
deleted file mode 100644
index aab31107..00000000
--- a/toonz/sources/toonz/Resources/pane_safe_on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_safe_over.svg b/toonz/sources/toonz/Resources/pane_safe_over.svg
deleted file mode 100644
index 35082a81..00000000
--- a/toonz/sources/toonz/Resources/pane_safe_over.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_off.svg b/toonz/sources/toonz/Resources/pane_subpreview.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_subpreview_off.svg
rename to toonz/sources/toonz/Resources/pane_subpreview.svg
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_on.svg b/toonz/sources/toonz/Resources/pane_subpreview_on.svg
deleted file mode 100644
index 78988765..00000000
--- a/toonz/sources/toonz/Resources/pane_subpreview_on.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_over.svg b/toonz/sources/toonz/Resources/pane_subpreview_over.svg
deleted file mode 100644
index 5c99a7b1..00000000
--- a/toonz/sources/toonz/Resources/pane_subpreview_over.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_table_off.svg b/toonz/sources/toonz/Resources/pane_table.svg
similarity index 100%
rename from toonz/sources/toonz/Resources/pane_table_off.svg
rename to toonz/sources/toonz/Resources/pane_table.svg
diff --git a/toonz/sources/toonz/Resources/pane_table_on.svg b/toonz/sources/toonz/Resources/pane_table_on.svg
deleted file mode 100644
index bb931b47..00000000
--- a/toonz/sources/toonz/Resources/pane_table_on.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_table_over.svg b/toonz/sources/toonz/Resources/pane_table_over.svg
deleted file mode 100644
index 0bfc0530..00000000
--- a/toonz/sources/toonz/Resources/pane_table_over.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/switch.svg b/toonz/sources/toonz/Resources/switch.svg
index 850f494e..99c5c8d9 100644
--- a/toonz/sources/toonz/Resources/switch.svg
+++ b/toonz/sources/toonz/Resources/switch.svg
@@ -1,25 +1,10 @@
-
-
-