diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss
index 7616ec2..b4dcb10 100644
--- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss
+++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #303030;
border: 1px solid #303030;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: #636363;
border-color: #232323;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: #161616;
border-color: #000000;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: #000000;
border-color: #565656;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: #303030;
border-color: #565656;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #808080;
}
.button-flat,
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,7 +1636,7 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #232323;
}
@@ -1645,21 +1663,21 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
@@ -1667,50 +1685,50 @@ XsheetViewer {
qproperty-TextColor: #cccccc;
qproperty-BGColor: #484848;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-VerticalLineColor: #222222;
qproperty-VerticalLineHeadColor: #808080;
- qproperty-PreviewFrameTextColor: #96e6e6;
+ qproperty-PreviewFrameTextColor: #96E6E6;
qproperty-CurrentRowBgColor: #506082;
qproperty-EmptyColumnHeadColor: #606060;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
qproperty-EmptyCellColor: #404040;
qproperty-NotEmptyColumnColor: #484848;
- qproperty-SelectedEmptyCellColor: #6c6c6c;
- qproperty-LevelColumnColor: #4c6e4c;
- qproperty-LevelColumnBorderColor: #8fb38f;
- qproperty-SelectedLevelColumnColor: #6b8c6b;
- qproperty-VectorColumnColor: #7b7b4c;
- qproperty-VectorColumnBorderColor: #bbbb9a;
- qproperty-SelectedVectorColumnColor: #8c8c60;
- qproperty-ChildColumnColor: #6a526b;
- qproperty-ChildColumnBorderColor: #b1a3b3;
- qproperty-SelectedChildColumnColor: #7a617a;
- qproperty-FullcolorColumnColor: #657a96;
- qproperty-FullcolorColumnBorderColor: #9eb8bb;
- qproperty-SelectedFullcolorColumnColor: #8896a7;
- qproperty-FxColumnColor: #56553c;
- qproperty-FxColumnBorderColor: #95958a;
- qproperty-SelectedFxColumnColor: #6a6d5a;
+ qproperty-SelectedEmptyCellColor: #6C6C6C;
+ qproperty-LevelColumnColor: #4C6E4C;
+ qproperty-LevelColumnBorderColor: #8FB38F;
+ qproperty-SelectedLevelColumnColor: #6B8C6B;
+ qproperty-VectorColumnColor: #7B7B4C;
+ qproperty-VectorColumnBorderColor: #BBBB9A;
+ qproperty-SelectedVectorColumnColor: #8C8C60;
+ qproperty-ChildColumnColor: #6A526B;
+ qproperty-ChildColumnBorderColor: #B1A3B3;
+ qproperty-SelectedChildColumnColor: #7A617A;
+ qproperty-FullcolorColumnColor: #657A96;
+ qproperty-FullcolorColumnBorderColor: #9EB8BB;
+ qproperty-SelectedFullcolorColumnColor: #8896A7;
+ qproperty-FxColumnColor: #56553C;
+ qproperty-FxColumnBorderColor: #95958A;
+ qproperty-SelectedFxColumnColor: #6A6D5A;
qproperty-ReferenceColumnColor: #616161;
- qproperty-ReferenceColumnBorderColor: #a2a2a2;
+ qproperty-ReferenceColumnBorderColor: #A2A2A2;
qproperty-SelectedReferenceColumnColor: #828282;
- qproperty-PaletteColumnColor: #3a655f;
- qproperty-PaletteColumnBorderColor: #86aca7;
- qproperty-SelectedPaletteColumnColor: #5f8581;
- qproperty-MeshColumnColor: #684d86;
- qproperty-MeshColumnBorderColor: #ba92ef;
- qproperty-SelectedMeshColumnColor: #8a75a2;
+ qproperty-PaletteColumnColor: #3A655F;
+ qproperty-PaletteColumnBorderColor: #86ACA7;
+ qproperty-SelectedPaletteColumnColor: #5F8581;
+ qproperty-MeshColumnColor: #684D86;
+ qproperty-MeshColumnBorderColor: #BA92EF;
+ qproperty-SelectedMeshColumnColor: #8A75A2;
qproperty-SoundColumnColor: #657456;
- qproperty-SoundColumnBorderColor: #a0af7d;
- qproperty-SelectedSoundColumnColor: #7f956a;
- qproperty-SoundColumnHlColor: #34fe5e;
- qproperty-SoundColumnTrackColor: #b6c29d;
- qproperty-ColumnHeadPastelizer: #000000;
+ qproperty-SoundColumnBorderColor: #A0AF7D;
+ qproperty-SelectedSoundColumnColor: #7F956A;
+ qproperty-SoundColumnHlColor: #34FE5E;
+ qproperty-SoundColumnTrackColor: #B6C29D;
+ qproperty-ColumnHeadPastelizer: #000;
qproperty-SelectedColumnHead: #506082;
qproperty-LightLightBGColor: #404040;
- qproperty-LightBGColor: #f0f0f0;
- qproperty-DarkBGColor: #e1e1e1;
+ qproperty-LightBGColor: #F0F0F0;
+ qproperty-DarkBGColor: #E1E1E1;
qproperty-DarkLineColor: #969696;
}
/* -----------------------------------------------------------------------------
@@ -1737,7 +1755,7 @@ XsheetViewer {
----------------------------------------------------------------------------- */
FunctionTreeView {
qproperty-TextColor: #cccccc;
- qproperty-CurrentTextColor: #e66464;
+ qproperty-CurrentTextColor: #E66464;
}
FunctionPanel {
qproperty-BGColor: #3b3b3b;
@@ -1746,14 +1764,14 @@ FunctionPanel {
qproperty-OtherCurvesColor: #888888;
qproperty-RulerBackground: #333333;
qproperty-TextColor: #cccccc;
- qproperty-SubColor: #000000;
- qproperty-SelectedColor: #ffa500;
+ qproperty-SubColor: #000;
+ qproperty-SelectedColor: #FFA500;
}
SpreadsheetViewer {
qproperty-LightLightBGColor: #404040;
qproperty-CurrentRowBgColor: #506082;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #484848;
qproperty-VerticalLineColor: #222222;
qproperty-KeyFrameColor: #995d1d;
@@ -1762,15 +1780,15 @@ SpreadsheetViewer {
qproperty-InBetweenColor: #666250;
qproperty-InBetweenBorderColor: #cdcec8;
qproperty-SelectedInBetweenColor: #7e8079;
- qproperty-SelectedEmptyColor: #6c6c6c;
+ qproperty-SelectedEmptyColor: #6C6C6C;
qproperty-SelectedSceneRangeEmptyColor: #757575;
qproperty-TextColor: #cccccc;
qproperty-ColumnHeaderBorderColor: #808080;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss
index 7616ec2..b4dcb10 100644
--- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss
+++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #303030;
border: 1px solid #303030;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: #636363;
border-color: #232323;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: #161616;
border-color: #000000;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: #000000;
border-color: #565656;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: #303030;
border-color: #565656;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #808080;
}
.button-flat,
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,7 +1636,7 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #232323;
}
@@ -1645,21 +1663,21 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
@@ -1667,50 +1685,50 @@ XsheetViewer {
qproperty-TextColor: #cccccc;
qproperty-BGColor: #484848;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-VerticalLineColor: #222222;
qproperty-VerticalLineHeadColor: #808080;
- qproperty-PreviewFrameTextColor: #96e6e6;
+ qproperty-PreviewFrameTextColor: #96E6E6;
qproperty-CurrentRowBgColor: #506082;
qproperty-EmptyColumnHeadColor: #606060;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
qproperty-EmptyCellColor: #404040;
qproperty-NotEmptyColumnColor: #484848;
- qproperty-SelectedEmptyCellColor: #6c6c6c;
- qproperty-LevelColumnColor: #4c6e4c;
- qproperty-LevelColumnBorderColor: #8fb38f;
- qproperty-SelectedLevelColumnColor: #6b8c6b;
- qproperty-VectorColumnColor: #7b7b4c;
- qproperty-VectorColumnBorderColor: #bbbb9a;
- qproperty-SelectedVectorColumnColor: #8c8c60;
- qproperty-ChildColumnColor: #6a526b;
- qproperty-ChildColumnBorderColor: #b1a3b3;
- qproperty-SelectedChildColumnColor: #7a617a;
- qproperty-FullcolorColumnColor: #657a96;
- qproperty-FullcolorColumnBorderColor: #9eb8bb;
- qproperty-SelectedFullcolorColumnColor: #8896a7;
- qproperty-FxColumnColor: #56553c;
- qproperty-FxColumnBorderColor: #95958a;
- qproperty-SelectedFxColumnColor: #6a6d5a;
+ qproperty-SelectedEmptyCellColor: #6C6C6C;
+ qproperty-LevelColumnColor: #4C6E4C;
+ qproperty-LevelColumnBorderColor: #8FB38F;
+ qproperty-SelectedLevelColumnColor: #6B8C6B;
+ qproperty-VectorColumnColor: #7B7B4C;
+ qproperty-VectorColumnBorderColor: #BBBB9A;
+ qproperty-SelectedVectorColumnColor: #8C8C60;
+ qproperty-ChildColumnColor: #6A526B;
+ qproperty-ChildColumnBorderColor: #B1A3B3;
+ qproperty-SelectedChildColumnColor: #7A617A;
+ qproperty-FullcolorColumnColor: #657A96;
+ qproperty-FullcolorColumnBorderColor: #9EB8BB;
+ qproperty-SelectedFullcolorColumnColor: #8896A7;
+ qproperty-FxColumnColor: #56553C;
+ qproperty-FxColumnBorderColor: #95958A;
+ qproperty-SelectedFxColumnColor: #6A6D5A;
qproperty-ReferenceColumnColor: #616161;
- qproperty-ReferenceColumnBorderColor: #a2a2a2;
+ qproperty-ReferenceColumnBorderColor: #A2A2A2;
qproperty-SelectedReferenceColumnColor: #828282;
- qproperty-PaletteColumnColor: #3a655f;
- qproperty-PaletteColumnBorderColor: #86aca7;
- qproperty-SelectedPaletteColumnColor: #5f8581;
- qproperty-MeshColumnColor: #684d86;
- qproperty-MeshColumnBorderColor: #ba92ef;
- qproperty-SelectedMeshColumnColor: #8a75a2;
+ qproperty-PaletteColumnColor: #3A655F;
+ qproperty-PaletteColumnBorderColor: #86ACA7;
+ qproperty-SelectedPaletteColumnColor: #5F8581;
+ qproperty-MeshColumnColor: #684D86;
+ qproperty-MeshColumnBorderColor: #BA92EF;
+ qproperty-SelectedMeshColumnColor: #8A75A2;
qproperty-SoundColumnColor: #657456;
- qproperty-SoundColumnBorderColor: #a0af7d;
- qproperty-SelectedSoundColumnColor: #7f956a;
- qproperty-SoundColumnHlColor: #34fe5e;
- qproperty-SoundColumnTrackColor: #b6c29d;
- qproperty-ColumnHeadPastelizer: #000000;
+ qproperty-SoundColumnBorderColor: #A0AF7D;
+ qproperty-SelectedSoundColumnColor: #7F956A;
+ qproperty-SoundColumnHlColor: #34FE5E;
+ qproperty-SoundColumnTrackColor: #B6C29D;
+ qproperty-ColumnHeadPastelizer: #000;
qproperty-SelectedColumnHead: #506082;
qproperty-LightLightBGColor: #404040;
- qproperty-LightBGColor: #f0f0f0;
- qproperty-DarkBGColor: #e1e1e1;
+ qproperty-LightBGColor: #F0F0F0;
+ qproperty-DarkBGColor: #E1E1E1;
qproperty-DarkLineColor: #969696;
}
/* -----------------------------------------------------------------------------
@@ -1737,7 +1755,7 @@ XsheetViewer {
----------------------------------------------------------------------------- */
FunctionTreeView {
qproperty-TextColor: #cccccc;
- qproperty-CurrentTextColor: #e66464;
+ qproperty-CurrentTextColor: #E66464;
}
FunctionPanel {
qproperty-BGColor: #3b3b3b;
@@ -1746,14 +1764,14 @@ FunctionPanel {
qproperty-OtherCurvesColor: #888888;
qproperty-RulerBackground: #333333;
qproperty-TextColor: #cccccc;
- qproperty-SubColor: #000000;
- qproperty-SelectedColor: #ffa500;
+ qproperty-SubColor: #000;
+ qproperty-SelectedColor: #FFA500;
}
SpreadsheetViewer {
qproperty-LightLightBGColor: #404040;
qproperty-CurrentRowBgColor: #506082;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #484848;
qproperty-VerticalLineColor: #222222;
qproperty-KeyFrameColor: #995d1d;
@@ -1762,15 +1780,15 @@ SpreadsheetViewer {
qproperty-InBetweenColor: #666250;
qproperty-InBetweenBorderColor: #cdcec8;
qproperty-SelectedInBetweenColor: #7e8079;
- qproperty-SelectedEmptyColor: #6c6c6c;
+ qproperty-SelectedEmptyColor: #6C6C6C;
qproperty-SelectedSceneRangeEmptyColor: #757575;
qproperty-TextColor: #cccccc;
qproperty-ColumnHeaderBorderColor: #808080;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss
index 79e33f2..e6fc1cc 100644
--- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss
+++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #484848;
border: 1px solid #484848;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: #6e6e6e;
border-color: #343434;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: #2f2f2f;
border-color: #151515;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: #2f2f2f;
border-color: #222222;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: #404040;
border-color: #222222;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #808080;
}
.button-flat,
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,7 +1636,7 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #404040;
}
@@ -1645,21 +1663,21 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
@@ -1667,50 +1685,50 @@ XsheetViewer {
qproperty-TextColor: #cccccc;
qproperty-BGColor: #484848;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-VerticalLineColor: #222222;
qproperty-VerticalLineHeadColor: #808080;
- qproperty-PreviewFrameTextColor: #96e6e6;
+ qproperty-PreviewFrameTextColor: #96E6E6;
qproperty-CurrentRowBgColor: #506082;
qproperty-EmptyColumnHeadColor: #606060;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
qproperty-EmptyCellColor: #404040;
qproperty-NotEmptyColumnColor: #484848;
- qproperty-SelectedEmptyCellColor: #6c6c6c;
- qproperty-LevelColumnColor: #4c6e4c;
- qproperty-LevelColumnBorderColor: #8fb38f;
- qproperty-SelectedLevelColumnColor: #6b8c6b;
- qproperty-VectorColumnColor: #7b7b4c;
- qproperty-VectorColumnBorderColor: #bbbb9a;
- qproperty-SelectedVectorColumnColor: #8c8c60;
- qproperty-ChildColumnColor: #6a526b;
- qproperty-ChildColumnBorderColor: #b1a3b3;
- qproperty-SelectedChildColumnColor: #7a617a;
- qproperty-FullcolorColumnColor: #657a96;
- qproperty-FullcolorColumnBorderColor: #9eb8bb;
- qproperty-SelectedFullcolorColumnColor: #8896a7;
- qproperty-FxColumnColor: #56553c;
- qproperty-FxColumnBorderColor: #95958a;
- qproperty-SelectedFxColumnColor: #6a6d5a;
+ qproperty-SelectedEmptyCellColor: #6C6C6C;
+ qproperty-LevelColumnColor: #4C6E4C;
+ qproperty-LevelColumnBorderColor: #8FB38F;
+ qproperty-SelectedLevelColumnColor: #6B8C6B;
+ qproperty-VectorColumnColor: #7B7B4C;
+ qproperty-VectorColumnBorderColor: #BBBB9A;
+ qproperty-SelectedVectorColumnColor: #8C8C60;
+ qproperty-ChildColumnColor: #6A526B;
+ qproperty-ChildColumnBorderColor: #B1A3B3;
+ qproperty-SelectedChildColumnColor: #7A617A;
+ qproperty-FullcolorColumnColor: #657A96;
+ qproperty-FullcolorColumnBorderColor: #9EB8BB;
+ qproperty-SelectedFullcolorColumnColor: #8896A7;
+ qproperty-FxColumnColor: #56553C;
+ qproperty-FxColumnBorderColor: #95958A;
+ qproperty-SelectedFxColumnColor: #6A6D5A;
qproperty-ReferenceColumnColor: #616161;
- qproperty-ReferenceColumnBorderColor: #a2a2a2;
+ qproperty-ReferenceColumnBorderColor: #A2A2A2;
qproperty-SelectedReferenceColumnColor: #828282;
- qproperty-PaletteColumnColor: #3a655f;
- qproperty-PaletteColumnBorderColor: #86aca7;
- qproperty-SelectedPaletteColumnColor: #5f8581;
- qproperty-MeshColumnColor: #684d86;
- qproperty-MeshColumnBorderColor: #ba92ef;
- qproperty-SelectedMeshColumnColor: #8a75a2;
+ qproperty-PaletteColumnColor: #3A655F;
+ qproperty-PaletteColumnBorderColor: #86ACA7;
+ qproperty-SelectedPaletteColumnColor: #5F8581;
+ qproperty-MeshColumnColor: #684D86;
+ qproperty-MeshColumnBorderColor: #BA92EF;
+ qproperty-SelectedMeshColumnColor: #8A75A2;
qproperty-SoundColumnColor: #657456;
- qproperty-SoundColumnBorderColor: #a0af7d;
- qproperty-SelectedSoundColumnColor: #7f956a;
- qproperty-SoundColumnHlColor: #34fe5e;
- qproperty-SoundColumnTrackColor: #b6c29d;
- qproperty-ColumnHeadPastelizer: #000000;
+ qproperty-SoundColumnBorderColor: #A0AF7D;
+ qproperty-SelectedSoundColumnColor: #7F956A;
+ qproperty-SoundColumnHlColor: #34FE5E;
+ qproperty-SoundColumnTrackColor: #B6C29D;
+ qproperty-ColumnHeadPastelizer: #000;
qproperty-SelectedColumnHead: #506082;
qproperty-LightLightBGColor: #404040;
- qproperty-LightBGColor: #f0f0f0;
- qproperty-DarkBGColor: #e1e1e1;
+ qproperty-LightBGColor: #F0F0F0;
+ qproperty-DarkBGColor: #E1E1E1;
qproperty-DarkLineColor: #969696;
}
/* -----------------------------------------------------------------------------
@@ -1737,7 +1755,7 @@ XsheetViewer {
----------------------------------------------------------------------------- */
FunctionTreeView {
qproperty-TextColor: #cccccc;
- qproperty-CurrentTextColor: #e66464;
+ qproperty-CurrentTextColor: #E66464;
}
FunctionPanel {
qproperty-BGColor: #3b3b3b;
@@ -1746,14 +1764,14 @@ FunctionPanel {
qproperty-OtherCurvesColor: #888888;
qproperty-RulerBackground: #333333;
qproperty-TextColor: #cccccc;
- qproperty-SubColor: #000000;
- qproperty-SelectedColor: #ffa500;
+ qproperty-SubColor: #000;
+ qproperty-SelectedColor: #FFA500;
}
SpreadsheetViewer {
qproperty-LightLightBGColor: #404040;
qproperty-CurrentRowBgColor: #506082;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #484848;
qproperty-VerticalLineColor: #222222;
qproperty-KeyFrameColor: #995d1d;
@@ -1762,15 +1780,15 @@ SpreadsheetViewer {
qproperty-InBetweenColor: #666250;
qproperty-InBetweenBorderColor: #cdcec8;
qproperty-SelectedInBetweenColor: #7e8079;
- qproperty-SelectedEmptyColor: #6c6c6c;
+ qproperty-SelectedEmptyColor: #6C6C6C;
qproperty-SelectedSceneRangeEmptyColor: #757575;
qproperty-TextColor: #cccccc;
qproperty-ColumnHeaderBorderColor: #808080;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss
index 79e33f2..e6fc1cc 100644
--- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss
+++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #484848;
border: 1px solid #484848;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: #6e6e6e;
border-color: #343434;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: #2f2f2f;
border-color: #151515;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: #2f2f2f;
border-color: #222222;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: #404040;
border-color: #222222;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #808080;
}
.button-flat,
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,7 +1636,7 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #404040;
}
@@ -1645,21 +1663,21 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
@@ -1667,50 +1685,50 @@ XsheetViewer {
qproperty-TextColor: #cccccc;
qproperty-BGColor: #484848;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-VerticalLineColor: #222222;
qproperty-VerticalLineHeadColor: #808080;
- qproperty-PreviewFrameTextColor: #96e6e6;
+ qproperty-PreviewFrameTextColor: #96E6E6;
qproperty-CurrentRowBgColor: #506082;
qproperty-EmptyColumnHeadColor: #606060;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
qproperty-EmptyCellColor: #404040;
qproperty-NotEmptyColumnColor: #484848;
- qproperty-SelectedEmptyCellColor: #6c6c6c;
- qproperty-LevelColumnColor: #4c6e4c;
- qproperty-LevelColumnBorderColor: #8fb38f;
- qproperty-SelectedLevelColumnColor: #6b8c6b;
- qproperty-VectorColumnColor: #7b7b4c;
- qproperty-VectorColumnBorderColor: #bbbb9a;
- qproperty-SelectedVectorColumnColor: #8c8c60;
- qproperty-ChildColumnColor: #6a526b;
- qproperty-ChildColumnBorderColor: #b1a3b3;
- qproperty-SelectedChildColumnColor: #7a617a;
- qproperty-FullcolorColumnColor: #657a96;
- qproperty-FullcolorColumnBorderColor: #9eb8bb;
- qproperty-SelectedFullcolorColumnColor: #8896a7;
- qproperty-FxColumnColor: #56553c;
- qproperty-FxColumnBorderColor: #95958a;
- qproperty-SelectedFxColumnColor: #6a6d5a;
+ qproperty-SelectedEmptyCellColor: #6C6C6C;
+ qproperty-LevelColumnColor: #4C6E4C;
+ qproperty-LevelColumnBorderColor: #8FB38F;
+ qproperty-SelectedLevelColumnColor: #6B8C6B;
+ qproperty-VectorColumnColor: #7B7B4C;
+ qproperty-VectorColumnBorderColor: #BBBB9A;
+ qproperty-SelectedVectorColumnColor: #8C8C60;
+ qproperty-ChildColumnColor: #6A526B;
+ qproperty-ChildColumnBorderColor: #B1A3B3;
+ qproperty-SelectedChildColumnColor: #7A617A;
+ qproperty-FullcolorColumnColor: #657A96;
+ qproperty-FullcolorColumnBorderColor: #9EB8BB;
+ qproperty-SelectedFullcolorColumnColor: #8896A7;
+ qproperty-FxColumnColor: #56553C;
+ qproperty-FxColumnBorderColor: #95958A;
+ qproperty-SelectedFxColumnColor: #6A6D5A;
qproperty-ReferenceColumnColor: #616161;
- qproperty-ReferenceColumnBorderColor: #a2a2a2;
+ qproperty-ReferenceColumnBorderColor: #A2A2A2;
qproperty-SelectedReferenceColumnColor: #828282;
- qproperty-PaletteColumnColor: #3a655f;
- qproperty-PaletteColumnBorderColor: #86aca7;
- qproperty-SelectedPaletteColumnColor: #5f8581;
- qproperty-MeshColumnColor: #684d86;
- qproperty-MeshColumnBorderColor: #ba92ef;
- qproperty-SelectedMeshColumnColor: #8a75a2;
+ qproperty-PaletteColumnColor: #3A655F;
+ qproperty-PaletteColumnBorderColor: #86ACA7;
+ qproperty-SelectedPaletteColumnColor: #5F8581;
+ qproperty-MeshColumnColor: #684D86;
+ qproperty-MeshColumnBorderColor: #BA92EF;
+ qproperty-SelectedMeshColumnColor: #8A75A2;
qproperty-SoundColumnColor: #657456;
- qproperty-SoundColumnBorderColor: #a0af7d;
- qproperty-SelectedSoundColumnColor: #7f956a;
- qproperty-SoundColumnHlColor: #34fe5e;
- qproperty-SoundColumnTrackColor: #b6c29d;
- qproperty-ColumnHeadPastelizer: #000000;
+ qproperty-SoundColumnBorderColor: #A0AF7D;
+ qproperty-SelectedSoundColumnColor: #7F956A;
+ qproperty-SoundColumnHlColor: #34FE5E;
+ qproperty-SoundColumnTrackColor: #B6C29D;
+ qproperty-ColumnHeadPastelizer: #000;
qproperty-SelectedColumnHead: #506082;
qproperty-LightLightBGColor: #404040;
- qproperty-LightBGColor: #f0f0f0;
- qproperty-DarkBGColor: #e1e1e1;
+ qproperty-LightBGColor: #F0F0F0;
+ qproperty-DarkBGColor: #E1E1E1;
qproperty-DarkLineColor: #969696;
}
/* -----------------------------------------------------------------------------
@@ -1737,7 +1755,7 @@ XsheetViewer {
----------------------------------------------------------------------------- */
FunctionTreeView {
qproperty-TextColor: #cccccc;
- qproperty-CurrentTextColor: #e66464;
+ qproperty-CurrentTextColor: #E66464;
}
FunctionPanel {
qproperty-BGColor: #3b3b3b;
@@ -1746,14 +1764,14 @@ FunctionPanel {
qproperty-OtherCurvesColor: #888888;
qproperty-RulerBackground: #333333;
qproperty-TextColor: #cccccc;
- qproperty-SubColor: #000000;
- qproperty-SelectedColor: #ffa500;
+ qproperty-SubColor: #000;
+ qproperty-SelectedColor: #FFA500;
}
SpreadsheetViewer {
qproperty-LightLightBGColor: #404040;
qproperty-CurrentRowBgColor: #506082;
qproperty-LightLineColor: #2c2c2c;
- qproperty-MarkerLineColor: #1e96c4;
+ qproperty-MarkerLineColor: #1E96C4;
qproperty-BGColor: #484848;
qproperty-VerticalLineColor: #222222;
qproperty-KeyFrameColor: #995d1d;
@@ -1762,15 +1780,15 @@ SpreadsheetViewer {
qproperty-InBetweenColor: #666250;
qproperty-InBetweenBorderColor: #cdcec8;
qproperty-SelectedInBetweenColor: #7e8079;
- qproperty-SelectedEmptyColor: #6c6c6c;
+ qproperty-SelectedEmptyColor: #6C6C6C;
qproperty-SelectedSceneRangeEmptyColor: #757575;
qproperty-TextColor: #cccccc;
qproperty-ColumnHeaderBorderColor: #808080;
- qproperty-SelectedColumnTextColor: #e66464;
+ qproperty-SelectedColumnTextColor: #E66464;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less b/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less
index 55f792c..79f7b82 100644
--- a/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less
+++ b/stuff/config/qss/Astral_072_Dark/less/layouts/toolbar.less
@@ -98,3 +98,17 @@ PopupButton {
}
}
}
+
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ &::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+ }
+ #XSheetToolbarLevelButton {
+ &:extend(.button-tool all);
+ padding: 2;
+ }
+}
diff --git a/stuff/config/qss/Astral_072_Dark/less/main.less b/stuff/config/qss/Astral_072_Dark/less/main.less
index aaed20d..aee273a 100644
--- a/stuff/config/qss/Astral_072_Dark/less/main.less
+++ b/stuff/config/qss/Astral_072_Dark/less/main.less
@@ -1,3 +1,4 @@
+// out: ../Astral_072_Dark.qss
// -----------------------------------------------------------------------------
// Main file - outputs the default theme
// -----------------------------------------------------------------------------
diff --git a/stuff/config/qss/Astral_072_Dark/less/themes/Astral_048_VeryDark.less b/stuff/config/qss/Astral_072_Dark/less/themes/Astral_048_VeryDark.less
index 203ebb5..52ef6e9 100644
--- a/stuff/config/qss/Astral_072_Dark/less/themes/Astral_048_VeryDark.less
+++ b/stuff/config/qss/Astral_072_Dark/less/themes/Astral_048_VeryDark.less
@@ -1,3 +1,4 @@
+// out: ../../../Astral_048_VeryDark/Astral_048_VeryDark.qss
// -----------------------------------------------------------------------------
// 048 Theme Variables (Dark Gray)
// -----------------------------------------------------------------------------
diff --git a/stuff/config/qss/Astral_072_Dark/less/themes/Astral_128_Neutral.less b/stuff/config/qss/Astral_072_Dark/less/themes/Astral_128_Neutral.less
index ba50e0e..4acd766 100644
--- a/stuff/config/qss/Astral_072_Dark/less/themes/Astral_128_Neutral.less
+++ b/stuff/config/qss/Astral_072_Dark/less/themes/Astral_128_Neutral.less
@@ -1,3 +1,4 @@
+// out: ../../../Astral_128_Neutral/Astral_128_Neutral.qss
// -----------------------------------------------------------------------------
// 128 Theme Variables (Neutral)
// -----------------------------------------------------------------------------
diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss
index cdc0c8e..4db9d08 100644
--- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss
+++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #808080;
border: 1px solid #808080;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c7c7c7, stop: 1 #adadad);
border-color: #5a5a5a;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #636363, stop: 1 #7d7d7d);
border-color: #5a5a5a;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #595959;
}
.button-flat,
@@ -182,7 +188,7 @@ QGroupBox {
#PaletteTabBar::tab {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a1a1a1, stop: 1 #878787);
border-right: 1px solid #393939;
- color: #000000;
+ color: #000;
margin: 0 0 1px 0;
padding: 3px 4px 3px 4px;
}
@@ -195,7 +201,7 @@ QGroupBox {
#StyleEditorTabBar::tab:selected,
#PaletteTabBar::tab:selected {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc);
- color: #000000;
+ color: #000;
margin: 0;
padding: 1px 4px 2px 4px;
}
@@ -211,7 +217,7 @@ QGroupBox {
border-top: 1px solid #393939;
border-right: 1px solid #393939;
border-left: 1px solid #393939;
- color: #000000;
+ color: #000;
margin: 3px -1px 1px 0;
padding: 2px 7px 1px 7px;
}
@@ -220,7 +226,7 @@ QGroupBox {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc);
border-top-right-radius: 2px;
border-top-left-radius: 2px;
- color: #000000;
+ color: #000;
margin: 1px -1px 0 0;
padding: 2px 7px 2px 7px;
}
@@ -264,7 +270,7 @@ QTreeWidget::item,
#ShortcutTree::item,
ProjectPopup QTreeView::item,
#Tasks QTreeView::item {
- color: #000000;
+ color: #000;
}
.tree-list::item:selected,
QTreeWidget::item:selected,
@@ -275,7 +281,7 @@ QTreeWidget::item:selected,
ProjectPopup QTreeView::item:selected,
#Tasks QTreeView::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
.tree-list::item:focus,
QTreeWidget::item:focus,
@@ -400,7 +406,7 @@ ProjectPopup QTreeView::branch:has-children:has-siblings:open {
----------------------------------------------------------------------------- */
QWidget {
background-color: #808080;
- color: #000000;
+ color: #000;
}
QWidget:disabled {
color: #595959;
@@ -473,11 +479,11 @@ QMenuBar::item {
}
QMenuBar::item:selected {
background-color: #b3b3b3;
- color: #000000;
+ color: #000;
}
QMenuBar::item:pressed {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
/* -----------------------------------------------------------------------------
Room Tabs
@@ -490,7 +496,7 @@ QMenuBar::item:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494);
border-top: 1px solid #525252;
border-right: 1px solid #525252;
- color: #000000;
+ color: #000;
margin: 0 0 0 0;
padding: 2px 10px 3px 10px;
}
@@ -499,7 +505,7 @@ QMenuBar::item:pressed {
}
#TopBarTab::tab:selected {
background-color: #cddcc0;
- color: #000000;
+ color: #000;
}
#TopBarTab::tab:first {
border-left: 1px solid #525252;
@@ -520,14 +526,14 @@ QMenu::item {
}
QMenu::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
QMenu::item:checked {
- color: #000000;
+ color: #000;
}
QMenu::item:checked:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
QMenu::item:disabled {
background: none;
@@ -564,7 +570,7 @@ TPanelTitleBar {
height: 20px;
min-height: 20px;
qproperty-TitleColor: #bfbfbf;
- qproperty-ActiveTitleColor: #ffffff;
+ qproperty-ActiveTitleColor: #fff;
qproperty-BorderPixmap: url('../Astral_072_Dark/imgs/black/none');
qproperty-ActiveBorderPixmap: url('../Astral_072_Dark/imgs/black/none');
qproperty-FloatBorderPixmap: url('../Astral_072_Dark/imgs/black/none');
@@ -788,7 +794,7 @@ QComboBox {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494);
border: 1px solid #5a5a5a;
border-radius: 2px;
- color: #000000;
+ color: #000;
padding: 3px 15px;
}
.QPushButton:hover,
@@ -807,7 +813,7 @@ QPushButton:pressed,
#FunctionSegmentViewerLinkButton:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
- color: #000000;
+ color: #000;
}
.QPushButton:checked,
QPushButton:checked,
@@ -865,7 +871,7 @@ QComboBox QAbstractItemView {
background-color: #c0c0c0;
border: 1px solid #404040;
selection-background-color: #000080;
- selection-color: #ffffff;
+ selection-color: #fff;
}
/* -------------------------------------------------------------------------- */
.QLineEdit,
@@ -876,9 +882,9 @@ QLineEdit,
background-color: #d9d9d9;
border: 1px solid #5a5a5a;
border-radius: 2px;
- color: #000000;
+ color: #000;
selection-background-color: #000080;
- selection-color: #ffffff;
+ selection-color: #fff;
padding: 0 0 0 1px;
}
.QLineEdit:focus,
@@ -886,7 +892,7 @@ QLineEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
- background-color: #ffffff;
+ background-color: #fff;
border-color: #5a5a5a;
}
.QLineEdit:disabled,
@@ -901,11 +907,11 @@ QLineEdit:disabled,
/* -------------------------------------------------------------------------- */
.QCheckBox,
QCheckBox {
- color: #000000;
+ color: #000;
}
.QCheckBox:hover,
QCheckBox:hover {
- color: #000000;
+ color: #000;
}
.QCheckBox:disabled,
QCheckBox:disabled {
@@ -1047,9 +1053,9 @@ QSlider::handle:horizontal {
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-AlternateBackground: #a6a6a6;
- qproperty-SelectedTextColor: #ffffff;
+ qproperty-SelectedTextColor: #fff;
qproperty-FolderTextColor: #000eb6;
qproperty-SelectedItemBackground: #000080;
}
@@ -1074,11 +1080,11 @@ DvItemViewerPanel {
padding: 1px;
}
DvDirTreeView {
- qproperty-TextColor: #000000;
- qproperty-SelectedTextColor: #ffffff;
+ qproperty-TextColor: #000;
+ qproperty-SelectedTextColor: #fff;
qproperty-SelectedItemBackground: #000080;
qproperty-FolderTextColor: #000eb6;
- qproperty-SelectedFolderTextColor: #ffffff;
+ qproperty-SelectedFolderTextColor: #fff;
alternate-background-color: #9a9a9a;
background-color: #9a9a9a;
border: 1px solid #404040;
@@ -1121,7 +1127,7 @@ DvDirTreeView {
margin-bottom: 3px;
}
ParamsPage {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
}
/* -----------------------------------------------------------------------------
Camera Settings
@@ -1285,7 +1291,7 @@ PaletteViewer QToolBar QToolButton {
padding: 1px 1px 2px 1px;
}
#PageViewer {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
}
#PaletteLockButton {
border-radius: 0;
@@ -1344,11 +1350,11 @@ QDialog #dialogButtonFrame QPushButton {
}
#PreferencesPopup QListWidget::item:hover {
background-color: #b3b3b3;
- color: #000000;
+ color: #000;
}
#PreferencesPopup QListWidget::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
/* -----------------------------------------------------------------------------
Keyboard Shortcuts
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1435,7 +1441,7 @@ FxSettings QToolBar QToolBar {
Task Viewer
----------------------------------------------------------------------------- */
#TaskSheetItemLabel {
- color: #000000;
+ color: #000;
}
#Tasks QToolBar {
border-bottom: 1px solid #404040;
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,13 +1636,13 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #787878;
}
Ruler {
qproperty-ParentBGColor: #b3b3b3;
- qproperty-ScaleColor: #000000;
+ qproperty-ScaleColor: #000;
}
#RulerToolOptionValues {
color: #000000;
@@ -1645,26 +1663,26 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
XsheetViewer {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-BGColor: #a4a4a4;
qproperty-LightLineColor: #676767;
qproperty-MarkerLineColor: #00fff6;
@@ -1736,7 +1754,7 @@ XsheetViewer {
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
FunctionTreeView {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-CurrentTextColor: #b30000;
}
FunctionPanel {
@@ -1745,8 +1763,8 @@ FunctionPanel {
qproperty-FrameLineColor: #d2d2d2;
qproperty-OtherCurvesColor: #969696;
qproperty-RulerBackground: #ffffff;
- qproperty-TextColor: #000000;
- qproperty-SubColor: #ffffff;
+ qproperty-TextColor: #000;
+ qproperty-SubColor: #fff;
qproperty-SelectedColor: #0000ff;
}
SpreadsheetViewer {
@@ -1764,13 +1782,13 @@ SpreadsheetViewer {
qproperty-SelectedInBetweenColor: #e1e1d8;
qproperty-SelectedEmptyColor: #d2d2d2;
qproperty-SelectedSceneRangeEmptyColor: #d2d2d2;
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-ColumnHeaderBorderColor: #343434;
qproperty-SelectedColumnTextColor: #b30000;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss
index cdc0c8e..4db9d08 100644
--- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss
+++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss
@@ -43,7 +43,8 @@ QToolBar QToolButton,
#CameraSettingsRadioButton::indicator,
#ForceSquaredPixelButton,
#SchematicBottomFrame QToolBar QToolButton,
-#EditToolLockButton::indicator {
+#EditToolLockButton::indicator,
+#XSheetToolbar #XSheetToolbarLevelButton {
background-color: #808080;
border: 1px solid #808080;
border-radius: 2px;
@@ -58,7 +59,8 @@ QToolBar QToolButton:hover,
#colorSliderAddButton:hover,
#colorSliderSubButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover,
-#EditToolLockButton::indicator:hover {
+#EditToolLockButton::indicator:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:hover {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c7c7c7, stop: 1 #adadad);
border-color: #5a5a5a;
}
@@ -70,7 +72,8 @@ QToolBar QToolButton:pressed,
#colorSliderAddButton:pressed,
#colorSliderSubButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed,
-#EditToolLockButton::indicator:pressed {
+#EditToolLockButton::indicator:pressed,
+#XSheetToolbar #XSheetToolbarLevelButton:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
}
@@ -80,7 +83,8 @@ QToolBar QToolButton:checked,
#CameraSettingsRadioButton::indicator:checked,
#ForceSquaredPixelButton:checked,
#SchematicBottomFrame QToolBar QToolButton:checked,
-#EditToolLockButton::indicator:checked {
+#EditToolLockButton::indicator:checked,
+#XSheetToolbar #XSheetToolbarLevelButton:checked {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
}
@@ -90,7 +94,8 @@ QToolBar QToolButton:checked:hover,
#CameraSettingsRadioButton::indicator:checked:hover,
#ForceSquaredPixelButton:checked:hover,
#SchematicBottomFrame QToolBar QToolButton:checked:hover,
-#EditToolLockButton::indicator:checked:hover {
+#EditToolLockButton::indicator:checked:hover,
+#XSheetToolbar #XSheetToolbarLevelButton:checked:hover {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #636363, stop: 1 #7d7d7d);
border-color: #5a5a5a;
}
@@ -100,7 +105,8 @@ QToolBar QToolButton:disabled,
#CameraSettingsRadioButton::indicator:disabled,
#ForceSquaredPixelButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled,
-#EditToolLockButton::indicator:disabled {
+#EditToolLockButton::indicator:disabled,
+#XSheetToolbar #XSheetToolbarLevelButton:disabled {
color: #595959;
}
.button-flat,
@@ -182,7 +188,7 @@ QGroupBox {
#PaletteTabBar::tab {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a1a1a1, stop: 1 #878787);
border-right: 1px solid #393939;
- color: #000000;
+ color: #000;
margin: 0 0 1px 0;
padding: 3px 4px 3px 4px;
}
@@ -195,7 +201,7 @@ QGroupBox {
#StyleEditorTabBar::tab:selected,
#PaletteTabBar::tab:selected {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc);
- color: #000000;
+ color: #000;
margin: 0;
padding: 1px 4px 2px 4px;
}
@@ -211,7 +217,7 @@ QGroupBox {
border-top: 1px solid #393939;
border-right: 1px solid #393939;
border-left: 1px solid #393939;
- color: #000000;
+ color: #000;
margin: 3px -1px 1px 0;
padding: 2px 7px 1px 7px;
}
@@ -220,7 +226,7 @@ QGroupBox {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc);
border-top-right-radius: 2px;
border-top-left-radius: 2px;
- color: #000000;
+ color: #000;
margin: 1px -1px 0 0;
padding: 2px 7px 2px 7px;
}
@@ -264,7 +270,7 @@ QTreeWidget::item,
#ShortcutTree::item,
ProjectPopup QTreeView::item,
#Tasks QTreeView::item {
- color: #000000;
+ color: #000;
}
.tree-list::item:selected,
QTreeWidget::item:selected,
@@ -275,7 +281,7 @@ QTreeWidget::item:selected,
ProjectPopup QTreeView::item:selected,
#Tasks QTreeView::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
.tree-list::item:focus,
QTreeWidget::item:focus,
@@ -400,7 +406,7 @@ ProjectPopup QTreeView::branch:has-children:has-siblings:open {
----------------------------------------------------------------------------- */
QWidget {
background-color: #808080;
- color: #000000;
+ color: #000;
}
QWidget:disabled {
color: #595959;
@@ -473,11 +479,11 @@ QMenuBar::item {
}
QMenuBar::item:selected {
background-color: #b3b3b3;
- color: #000000;
+ color: #000;
}
QMenuBar::item:pressed {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
/* -----------------------------------------------------------------------------
Room Tabs
@@ -490,7 +496,7 @@ QMenuBar::item:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494);
border-top: 1px solid #525252;
border-right: 1px solid #525252;
- color: #000000;
+ color: #000;
margin: 0 0 0 0;
padding: 2px 10px 3px 10px;
}
@@ -499,7 +505,7 @@ QMenuBar::item:pressed {
}
#TopBarTab::tab:selected {
background-color: #cddcc0;
- color: #000000;
+ color: #000;
}
#TopBarTab::tab:first {
border-left: 1px solid #525252;
@@ -520,14 +526,14 @@ QMenu::item {
}
QMenu::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
QMenu::item:checked {
- color: #000000;
+ color: #000;
}
QMenu::item:checked:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
QMenu::item:disabled {
background: none;
@@ -564,7 +570,7 @@ TPanelTitleBar {
height: 20px;
min-height: 20px;
qproperty-TitleColor: #bfbfbf;
- qproperty-ActiveTitleColor: #ffffff;
+ qproperty-ActiveTitleColor: #fff;
qproperty-BorderPixmap: url('../Astral_072_Dark/imgs/black/none');
qproperty-ActiveBorderPixmap: url('../Astral_072_Dark/imgs/black/none');
qproperty-FloatBorderPixmap: url('../Astral_072_Dark/imgs/black/none');
@@ -788,7 +794,7 @@ QComboBox {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494);
border: 1px solid #5a5a5a;
border-radius: 2px;
- color: #000000;
+ color: #000;
padding: 3px 15px;
}
.QPushButton:hover,
@@ -807,7 +813,7 @@ QPushButton:pressed,
#FunctionSegmentViewerLinkButton:pressed {
background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666);
border-color: #404040;
- color: #000000;
+ color: #000;
}
.QPushButton:checked,
QPushButton:checked,
@@ -865,7 +871,7 @@ QComboBox QAbstractItemView {
background-color: #c0c0c0;
border: 1px solid #404040;
selection-background-color: #000080;
- selection-color: #ffffff;
+ selection-color: #fff;
}
/* -------------------------------------------------------------------------- */
.QLineEdit,
@@ -876,9 +882,9 @@ QLineEdit,
background-color: #d9d9d9;
border: 1px solid #5a5a5a;
border-radius: 2px;
- color: #000000;
+ color: #000;
selection-background-color: #000080;
- selection-color: #ffffff;
+ selection-color: #fff;
padding: 0 0 0 1px;
}
.QLineEdit:focus,
@@ -886,7 +892,7 @@ QLineEdit:focus,
#TaskSheetItem:focus,
#tasksRemoveBox:focus,
#tasksAddBox:focus {
- background-color: #ffffff;
+ background-color: #fff;
border-color: #5a5a5a;
}
.QLineEdit:disabled,
@@ -901,11 +907,11 @@ QLineEdit:disabled,
/* -------------------------------------------------------------------------- */
.QCheckBox,
QCheckBox {
- color: #000000;
+ color: #000;
}
.QCheckBox:hover,
QCheckBox:hover {
- color: #000000;
+ color: #000;
}
.QCheckBox:disabled,
QCheckBox:disabled {
@@ -1047,9 +1053,9 @@ QSlider::handle:horizontal {
/* Right Pane
----------------------------------------------------------------------------- */
DvItemViewerPanel {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-AlternateBackground: #a6a6a6;
- qproperty-SelectedTextColor: #ffffff;
+ qproperty-SelectedTextColor: #fff;
qproperty-FolderTextColor: #000eb6;
qproperty-SelectedItemBackground: #000080;
}
@@ -1074,11 +1080,11 @@ DvItemViewerPanel {
padding: 1px;
}
DvDirTreeView {
- qproperty-TextColor: #000000;
- qproperty-SelectedTextColor: #ffffff;
+ qproperty-TextColor: #000;
+ qproperty-SelectedTextColor: #fff;
qproperty-SelectedItemBackground: #000080;
qproperty-FolderTextColor: #000eb6;
- qproperty-SelectedFolderTextColor: #ffffff;
+ qproperty-SelectedFolderTextColor: #fff;
alternate-background-color: #9a9a9a;
background-color: #9a9a9a;
border: 1px solid #404040;
@@ -1121,7 +1127,7 @@ DvDirTreeView {
margin-bottom: 3px;
}
ParamsPage {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
}
/* -----------------------------------------------------------------------------
Camera Settings
@@ -1285,7 +1291,7 @@ PaletteViewer QToolBar QToolButton {
padding: 1px 1px 2px 1px;
}
#PageViewer {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
}
#PaletteLockButton {
border-radius: 0;
@@ -1344,11 +1350,11 @@ QDialog #dialogButtonFrame QPushButton {
}
#PreferencesPopup QListWidget::item:hover {
background-color: #b3b3b3;
- color: #000000;
+ color: #000;
}
#PreferencesPopup QListWidget::item:selected {
background-color: #000080;
- color: #ffffff;
+ color: #fff;
}
/* -----------------------------------------------------------------------------
Keyboard Shortcuts
@@ -1422,7 +1428,7 @@ FxSettings QToolBar QToolBar {
#ScriptConsole {
font-family: 'Courier New', monospace;
border: 0;
- color: #000000;
+ color: #000;
padding: 3px;
}
#ScriptConsole QFrame {
@@ -1435,7 +1441,7 @@ FxSettings QToolBar QToolBar {
Task Viewer
----------------------------------------------------------------------------- */
#TaskSheetItemLabel {
- color: #000000;
+ color: #000;
}
#Tasks QToolBar {
border-bottom: 1px solid #404040;
@@ -1521,6 +1527,18 @@ PopupButton::menu-indicator:disabled {
min-width: 28px;
padding: 0;
}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 3;
+ margin-left: 3;
+}
+#XSheetToolbar #XSheetToolbarLevelButton {
+ padding: 2;
+}
/* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */
@@ -1618,13 +1636,13 @@ FlipSlider {
qproperty-PBColorMarginBottom: 2;
qproperty-PBMarkerMarginLeft: 3;
qproperty-PBMarkerMarginRight: 3;
- qproperty-notStartedColor: #cc2222;
+ qproperty-notStartedColor: #CC2222;
qproperty-startedColor: #00ff00;
qproperty-baseColor: #787878;
}
Ruler {
qproperty-ParentBGColor: #b3b3b3;
- qproperty-ScaleColor: #000000;
+ qproperty-ScaleColor: #000;
}
#RulerToolOptionValues {
color: #000000;
@@ -1645,26 +1663,26 @@ Ruler {
/* xsheetColumnHeader (Context Menus)
----------------------------------------------------------------------------- */
#xsheetColumnAreaMenu_Preview {
- background-color: #e6e678;
+ background-color: #E6E678;
}
#xsheetColumnAreaMenu_Lock {
- background-color: #f5f5f5;
+ background-color: #F5F5F5;
}
#xsheetColumnAreaMenu_Camstand {
- background-color: #ffa480;
+ background-color: #FFA480;
}
#xsheetColumnAreaMenu_Preview,
#xsheetColumnAreaMenu_Lock,
#xsheetColumnAreaMenu_Camstand {
- color: #000000;
+ color: #000;
}
#noteTextEdit {
- color: #000000;
+ color: #000;
}
/* XSheet Spreadsheet
----------------------------------------------------------------------------- */
XsheetViewer {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-BGColor: #a4a4a4;
qproperty-LightLineColor: #676767;
qproperty-MarkerLineColor: #00fff6;
@@ -1736,7 +1754,7 @@ XsheetViewer {
/* Function Editor Spreadsheet
----------------------------------------------------------------------------- */
FunctionTreeView {
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-CurrentTextColor: #b30000;
}
FunctionPanel {
@@ -1745,8 +1763,8 @@ FunctionPanel {
qproperty-FrameLineColor: #d2d2d2;
qproperty-OtherCurvesColor: #969696;
qproperty-RulerBackground: #ffffff;
- qproperty-TextColor: #000000;
- qproperty-SubColor: #ffffff;
+ qproperty-TextColor: #000;
+ qproperty-SubColor: #fff;
qproperty-SelectedColor: #0000ff;
}
SpreadsheetViewer {
@@ -1764,13 +1782,13 @@ SpreadsheetViewer {
qproperty-SelectedInBetweenColor: #e1e1d8;
qproperty-SelectedEmptyColor: #d2d2d2;
qproperty-SelectedSceneRangeEmptyColor: #d2d2d2;
- qproperty-TextColor: #000000;
+ qproperty-TextColor: #000;
qproperty-ColumnHeaderBorderColor: #343434;
qproperty-SelectedColumnTextColor: #b30000;
}
#ExpressionField {
background-color: #e6e6e6;
- border: 1px solid #333333;
+ border: 1px solid #333;
margin: 0;
}
#FunctionSegmentViewerLinkButton {
diff --git a/stuff/config/qss/dark/dark.less b/stuff/config/qss/dark/dark.less
index 03e719b..7fb7a41 100644
--- a/stuff/config/qss/dark/dark.less
+++ b/stuff/config/qss/dark/dark.less
@@ -939,21 +939,16 @@ ParamsPage {
padding-right: 2;
margin-left: 2;
margin-right: 2;
+ border: 0px;
}
- #XSheetToolbarButton {
- padding-left: 3;
- padding-right: 3;
- margin-left: 2;
- margin-right: 2;
- }
#XSheetToolbar {
margin: 0;
padding: 0;
border: 0;
&::separator:horizontal {
- margin-right: 7;
- margin-left: 5;
+ margin-right: 4;
+ margin-left: 4;
}
}
diff --git a/stuff/config/qss/dark/dark.qss b/stuff/config/qss/dark/dark.qss
index 2606bfc..54e4145 100644
--- a/stuff/config/qss/dark/dark.qss
+++ b/stuff/config/qss/dark/dark.qss
@@ -799,12 +799,7 @@ ParamsPage {
padding-right: 2;
margin-left: 2;
margin-right: 2;
-}
-#XSheetToolbarButton {
- padding-left: 3;
- padding-right: 3;
- margin-left: 2;
- margin-right: 2;
+ border: 0px;
}
#XSheetToolbar {
margin: 0;
@@ -812,8 +807,8 @@ ParamsPage {
border: 0;
}
#XSheetToolbar::separator:horizontal {
- margin-right: 7;
- margin-left: 5;
+ margin-right: 4;
+ margin-left: 4;
}
/* Customize QScrollBar vertical*/
QScrollBar {
diff --git a/stuff/config/qss/dark/dark_mac.qss b/stuff/config/qss/dark/dark_mac.qss
index 2606bfc..54e4145 100644
--- a/stuff/config/qss/dark/dark_mac.qss
+++ b/stuff/config/qss/dark/dark_mac.qss
@@ -799,12 +799,7 @@ ParamsPage {
padding-right: 2;
margin-left: 2;
margin-right: 2;
-}
-#XSheetToolbarButton {
- padding-left: 3;
- padding-right: 3;
- margin-left: 2;
- margin-right: 2;
+ border: 0px;
}
#XSheetToolbar {
margin: 0;
@@ -812,8 +807,8 @@ ParamsPage {
border: 0;
}
#XSheetToolbar::separator:horizontal {
- margin-right: 7;
- margin-left: 5;
+ margin-right: 4;
+ margin-left: 4;
}
/* Customize QScrollBar vertical*/
QScrollBar {
diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less
index c8014ae..0aec3ca 100644
--- a/stuff/config/qss/gray_048/gray_048.less
+++ b/stuff/config/qss/gray_048/gray_048.less
@@ -839,6 +839,24 @@ ParamsPage {
background-color: rgb(0,0,128);
}
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+ }
+
+ #XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ &::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+ }
+ }
+
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss
index 4feae90..12a2493 100644
--- a/stuff/config/qss/gray_048/gray_048.qss
+++ b/stuff/config/qss/gray_048/gray_048.qss
@@ -846,6 +846,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss
index 4feae90..12a2493 100644
--- a/stuff/config/qss/gray_048/gray_048_mac.qss
+++ b/stuff/config/qss/gray_048/gray_048_mac.qss
@@ -846,6 +846,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less
index 4e2dbf0..3a81760 100644
--- a/stuff/config/qss/gray_072/gray_072.less
+++ b/stuff/config/qss/gray_072/gray_072.less
@@ -838,6 +838,24 @@ ParamsPage {
background-color: rgb(0,0,128);
}
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+ }
+
+ #XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ &::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+ }
+ }
+
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss
index 20c7ad3..cf65a5d 100644
--- a/stuff/config/qss/gray_072/gray_072.qss
+++ b/stuff/config/qss/gray_072/gray_072.qss
@@ -846,6 +846,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss
index 20c7ad3..cf65a5d 100644
--- a/stuff/config/qss/gray_072/gray_072_mac.qss
+++ b/stuff/config/qss/gray_072/gray_072_mac.qss
@@ -846,6 +846,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less
index 5a46da1..66541fe 100644
--- a/stuff/config/qss/gray_128/gray_128.less
+++ b/stuff/config/qss/gray_128/gray_128.less
@@ -668,6 +668,24 @@ ParamsPage {
background-color: rgb(0,0,128);
}
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+ }
+
+ #XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ &::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+ }
+ }
+
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss
index 1b3a454..e9f4abe 100644
--- a/stuff/config/qss/gray_128/gray_128.qss
+++ b/stuff/config/qss/gray_128/gray_128.qss
@@ -585,6 +585,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss
index 1b3a454..e9f4abe 100644
--- a/stuff/config/qss/gray_128/gray_128_mac.qss
+++ b/stuff/config/qss/gray_128/gray_128_mac.qss
@@ -585,6 +585,22 @@ ParamsPage {
#xsheetColumnAreaMenu_Camstand:selected {
background-color: #000080;
}
+#XSheetToolbarLevelButton {
+ padding-left: 2;
+ padding-right: 2;
+ margin-left: 2;
+ margin-right: 2;
+ border: 0px;
+}
+#XSheetToolbar {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+#XSheetToolbar::separator:horizontal {
+ margin-right: 4;
+ margin-left: 4;
+}
/* Customize QScrollBar vertical*/
QScrollBar {
border: 1px solid black;
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.h
index 6aa4c3d..e269580 100644
--- a/toonz/sources/include/toonz/preferences.h
+++ b/toonz/sources/include/toonz/preferences.h
@@ -356,6 +356,12 @@ public:
return m_inputCellsWithoutDoubleClickingEnabled;
}
+ void enableShowXSheetToolbar(bool on);
+ bool isShowXSheetToolbarEnabled() const { return m_showXSheetToolbar; }
+
+ void enableExpandFunctionHeader(bool on);
+ bool isExpandFunctionHeaderEnabled() const { return m_expandFunctionHeader; }
+
// Animation tab
void setKeyframeType(int s);
@@ -496,7 +502,8 @@ private:
m_ignoreAlphaonColumn1Enabled, m_previewAlwaysOpenNewFlipEnabled,
m_rewindAfterPlaybackEnabled, m_fitToFlipbookEnabled, m_autosaveEnabled,
m_autosaveSceneEnabled, m_autosaveOtherFilesEnabled,
- m_defaultViewerEnabled, m_pixelsOnly;
+ m_defaultViewerEnabled, m_pixelsOnly, m_showXSheetToolbar,
+ m_expandFunctionHeader;
bool m_rasterOptimizedMemory, m_saveUnpaintedInCleanup,
m_askForOverrideRender, m_automaticSVNFolderRefreshEnabled, m_SVNEnabled,
m_levelsBackupEnabled, m_minimizeSaveboxAfterEditing,
diff --git a/toonz/sources/include/toonzqt/functionviewer.h b/toonz/sources/include/toonzqt/functionviewer.h
index ed7b2d3..57f05fc 100644
--- a/toonz/sources/include/toonzqt/functionviewer.h
+++ b/toonz/sources/include/toonzqt/functionviewer.h
@@ -51,6 +51,7 @@ class QStackedWidget;
class QAction;
class QScrollArea;
class QSplitter;
+class QVBoxLayout;
namespace DVGui {
class ValueField;
@@ -154,7 +155,7 @@ private:
TFxHandle *m_fxHandle;
TColumnHandle *m_columnHandle;
TSceneHandle *m_sceneHandle;
-
+ QVBoxLayout *m_leftLayout;
TFrameHandle
m_localFrame; //!< Internal timeline - which is attached to m_frameHandle
//! in case it is not zero.
diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
index fe46957..52c41b2 100644
--- a/toonz/sources/toonz/CMakeLists.txt
+++ b/toonz/sources/toonz/CMakeLists.txt
@@ -138,6 +138,7 @@ set(MOC_HEADERS
xsheetviewer.h
xshnoteviewer.h
xshrowviewer.h
+ xshtoolbar.h
comboviewerpane.h
historypane.h
cleanupsettingspane.h
@@ -195,6 +196,7 @@ set(SOURCES
xsheetviewer.cpp
xshnoteviewer.cpp
xshrowviewer.cpp
+ xshtoolbar.cpp
sceneviewer.cpp
sceneviewerevents.cpp
viewerdraw.cpp
diff --git a/toonz/sources/toonz/Resources/collapse.png b/toonz/sources/toonz/Resources/collapse.png
new file mode 100644
index 0000000..25e7da9
Binary files /dev/null and b/toonz/sources/toonz/Resources/collapse.png differ
diff --git a/toonz/sources/toonz/Resources/collapse_click.png b/toonz/sources/toonz/Resources/collapse_click.png
new file mode 100644
index 0000000..cfce24f
Binary files /dev/null and b/toonz/sources/toonz/Resources/collapse_click.png differ
diff --git a/toonz/sources/toonz/Resources/collapse_over.png b/toonz/sources/toonz/Resources/collapse_over.png
new file mode 100644
index 0000000..25e7da9
Binary files /dev/null and b/toonz/sources/toonz/Resources/collapse_over.png differ
diff --git a/toonz/sources/toonz/Resources/new_raster_level.png b/toonz/sources/toonz/Resources/new_raster_level.png
new file mode 100644
index 0000000..bd13363
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_raster_level.png differ
diff --git a/toonz/sources/toonz/Resources/new_raster_level_click.png b/toonz/sources/toonz/Resources/new_raster_level_click.png
new file mode 100644
index 0000000..bd13363
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_raster_level_click.png differ
diff --git a/toonz/sources/toonz/Resources/new_raster_level_over.png b/toonz/sources/toonz/Resources/new_raster_level_over.png
new file mode 100644
index 0000000..bd13363
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_raster_level_over.png differ
diff --git a/toonz/sources/toonz/Resources/new_toonz_raster_level.png b/toonz/sources/toonz/Resources/new_toonz_raster_level.png
new file mode 100644
index 0000000..c17b54c
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_toonz_raster_level.png differ
diff --git a/toonz/sources/toonz/Resources/new_toonz_raster_level_click.png b/toonz/sources/toonz/Resources/new_toonz_raster_level_click.png
new file mode 100644
index 0000000..c17b54c
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_toonz_raster_level_click.png differ
diff --git a/toonz/sources/toonz/Resources/new_toonz_raster_level_over.png b/toonz/sources/toonz/Resources/new_toonz_raster_level_over.png
new file mode 100644
index 0000000..c17b54c
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_toonz_raster_level_over.png differ
diff --git a/toonz/sources/toonz/Resources/new_vector_level.png b/toonz/sources/toonz/Resources/new_vector_level.png
new file mode 100644
index 0000000..fa925a3
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_vector_level.png differ
diff --git a/toonz/sources/toonz/Resources/new_vector_level_click.png b/toonz/sources/toonz/Resources/new_vector_level_click.png
new file mode 100644
index 0000000..fa925a3
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_vector_level_click.png differ
diff --git a/toonz/sources/toonz/Resources/new_vector_level_over.png b/toonz/sources/toonz/Resources/new_vector_level_over.png
new file mode 100644
index 0000000..fa925a3
Binary files /dev/null and b/toonz/sources/toonz/Resources/new_vector_level_over.png differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon.png b/toonz/sources/toonz/Resources/repeat_icon.png
new file mode 100644
index 0000000..d6db1b2
Binary files /dev/null and b/toonz/sources/toonz/Resources/repeat_icon.png differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon_click.png b/toonz/sources/toonz/Resources/repeat_icon_click.png
new file mode 100644
index 0000000..42ef318
Binary files /dev/null and b/toonz/sources/toonz/Resources/repeat_icon_click.png differ
diff --git a/toonz/sources/toonz/Resources/repeat_icon_over.png b/toonz/sources/toonz/Resources/repeat_icon_over.png
new file mode 100644
index 0000000..d6db1b2
Binary files /dev/null and b/toonz/sources/toonz/Resources/repeat_icon_over.png differ
diff --git a/toonz/sources/toonz/Resources/sub_enter.png b/toonz/sources/toonz/Resources/sub_enter.png
index f53854e..658facd 100644
Binary files a/toonz/sources/toonz/Resources/sub_enter.png and b/toonz/sources/toonz/Resources/sub_enter.png differ
diff --git a/toonz/sources/toonz/Resources/sub_enter_click.png b/toonz/sources/toonz/Resources/sub_enter_click.png
new file mode 100644
index 0000000..c298c0c
Binary files /dev/null and b/toonz/sources/toonz/Resources/sub_enter_click.png differ
diff --git a/toonz/sources/toonz/Resources/sub_enter_over.png b/toonz/sources/toonz/Resources/sub_enter_over.png
new file mode 100644
index 0000000..658facd
Binary files /dev/null and b/toonz/sources/toonz/Resources/sub_enter_over.png differ
diff --git a/toonz/sources/toonz/Resources/sub_enter_rollover.png b/toonz/sources/toonz/Resources/sub_enter_rollover.png
deleted file mode 100644
index 731988a..0000000
Binary files a/toonz/sources/toonz/Resources/sub_enter_rollover.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/sub_leave.png b/toonz/sources/toonz/Resources/sub_leave.png
new file mode 100644
index 0000000..c8753a0
Binary files /dev/null and b/toonz/sources/toonz/Resources/sub_leave.png differ
diff --git a/toonz/sources/toonz/Resources/sub_leave_click.png b/toonz/sources/toonz/Resources/sub_leave_click.png
new file mode 100644
index 0000000..68382cc
Binary files /dev/null and b/toonz/sources/toonz/Resources/sub_leave_click.png differ
diff --git a/toonz/sources/toonz/Resources/sub_leave_over.png b/toonz/sources/toonz/Resources/sub_leave_over.png
new file mode 100644
index 0000000..c8753a0
Binary files /dev/null and b/toonz/sources/toonz/Resources/sub_leave_over.png differ
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 2bfccf9..0896bbf 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -1729,10 +1729,23 @@ void MainWindow::defineActions() {
createMenuXsheetAction(MI_CameraSettings, tr("&Camera Settings..."), "");
createMiscAction(MI_CameraStage, tr("&Camera Settings..."), "");
- createMenuXsheetAction(MI_OpenChild, tr("&Open Sub-xsheet"), "");
- createMenuXsheetAction(MI_CloseChild, tr("&Close Sub-xsheet"), "");
+ QAction *openChildAction =
+ createMenuXsheetAction(MI_OpenChild, tr("&Open Sub-xsheet"), "");
+ openChildAction->setIconText("Open Sub-XSheet");
+ openChildAction->setIcon(createQIconOnOffPNG("sub_enter"));
+
+ QAction *closeChildAction =
+ createMenuXsheetAction(MI_CloseChild, tr("&Close Sub-xsheet"), "");
+ closeChildAction->setIconText("Close Sub-XSheet");
+ closeChildAction->setIcon(createQIconOnOffPNG("sub_leave"));
+
createMenuXsheetAction(MI_ExplodeChild, tr("Explode Sub-xsheet"), "");
- createMenuXsheetAction(MI_Collapse, tr("Collapse"), "");
+
+ QAction *collapseAction =
+ createMenuXsheetAction(MI_Collapse, tr("Collapse"), "");
+ collapseAction->setIconText("Collapse");
+ collapseAction->setIcon(createQIconOnOffPNG("collapse"));
+
createMenuXsheetAction(MI_ToggleEditInPlace, tr("Toggle Edit in Place"), "");
createMenuXsheetAction(MI_SaveSubxsheetAs, tr("&Save Sub-xsheet As..."), "");
createMenuXsheetAction(MI_Resequence, tr("Resequence"), "");
@@ -1753,12 +1766,17 @@ void MainWindow::defineActions() {
"");
createMenuXsheetAction(MI_RemoveGlobalKeyframe, tr("Remove Multiple Keys"),
"");
-
+ createRightClickMenuAction(MI_ToggleXSheetToolbar,
+ tr("Toggle XSheet Toolbar"), "");
createMenuCellsAction(MI_Reverse, tr("&Reverse"), "");
createMenuCellsAction(MI_Swing, tr("&Swing"), "");
createMenuCellsAction(MI_Random, tr("&Random"), "");
createMenuCellsAction(MI_Increment, tr("&Autoexpose"), "");
- createMenuCellsAction(MI_Dup, tr("&Repeat..."), "");
+
+ QAction *repeatAction = createMenuCellsAction(MI_Dup, tr("&Repeat..."), "");
+ repeatAction->setIconText("Repeat");
+ repeatAction->setIcon(createQIconOnOffPNG("repeat_icon"));
+
createMenuCellsAction(MI_ResetStep, tr("&Reset Step"), "");
createMenuCellsAction(MI_IncreaseStep, tr("&Increase Step"), "'");
createMenuCellsAction(MI_DecreaseStep, tr("&Decrease Step"), ";");
@@ -1782,10 +1800,18 @@ void MainWindow::defineActions() {
tr("Similar Drawing Substitution Forward"), "Alt+W");
createMenuCellsAction(MI_DrawingSubGroupBackward,
tr("Similar Drawing Substitution Backward"), "Alt+Q");
+ QAction *reframeOnesAction =
+ createMenuCellsAction(MI_Reframe1, tr("1's"), "");
+ reframeOnesAction->setIconText("1's");
+
+ QAction *reframeTwosAction =
+ createMenuCellsAction(MI_Reframe2, tr("2's"), "");
+ reframeTwosAction->setIconText("2's");
+
+ QAction *reframeThreesAction =
+ createMenuCellsAction(MI_Reframe3, tr("3's"), "");
+ reframeThreesAction->setIconText("3's");
- createMenuCellsAction(MI_Reframe1, tr("1's"), "");
- createMenuCellsAction(MI_Reframe2, tr("2's"), "");
- createMenuCellsAction(MI_Reframe3, tr("3's"), "");
createMenuCellsAction(MI_Reframe4, tr("4's"), "");
createRightClickMenuAction(MI_SetKeyframes, tr("&Set Key"), "Z");
@@ -2246,9 +2272,9 @@ RecentFiles::~RecentFiles() {}
void RecentFiles::addFilePath(QString path, FileType fileType) {
QList files =
- (fileType == Scene)
- ? m_recentScenes
- : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
+ (fileType == Scene) ? m_recentScenes : (fileType == Level)
+ ? m_recentLevels
+ : m_recentFlipbookImages;
int i;
for (i = 0; i < files.size(); i++)
if (files.at(i) == path) files.removeAt(i);
@@ -2373,9 +2399,9 @@ void RecentFiles::saveRecentFiles() {
QList RecentFiles::getFilesNameList(FileType fileType) {
QList files =
- (fileType == Scene)
- ? m_recentScenes
- : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages;
+ (fileType == Scene) ? m_recentScenes : (fileType == Level)
+ ? m_recentLevels
+ : m_recentFlipbookImages;
QList names;
int i;
for (i = 0; i < files.size(); i++) {
@@ -2402,9 +2428,9 @@ void RecentFiles::refreshRecentFilesMenu(FileType fileType) {
menu->setEnabled(false);
else {
CommandId clearActionId =
- (fileType == Scene)
- ? MI_ClearRecentScene
- : (fileType == Level) ? MI_ClearRecentLevel : MI_ClearRecentImage;
+ (fileType == Scene) ? MI_ClearRecentScene : (fileType == Level)
+ ? MI_ClearRecentLevel
+ : MI_ClearRecentImage;
menu->setActions(names);
menu->addSeparator();
QAction *clearAction = CommandManager::instance()->getAction(clearActionId);
diff --git a/toonz/sources/toonz/menubarcommandids.h b/toonz/sources/toonz/menubarcommandids.h
index b95053f..8f023f6 100644
--- a/toonz/sources/toonz/menubarcommandids.h
+++ b/toonz/sources/toonz/menubarcommandids.h
@@ -282,7 +282,7 @@
#define MI_UnlockSelectedColumns "MI_UnlockSelectedColumns"
#define MI_UnlockAllColumns "MI_UnlockAllColumns"
#define MI_ToggleColumnLocks "MI_ToggleColumnLocks"
-
+#define MI_ToggleXSheetToolbar "MI_ToggleXSheetToolbar"
#define MI_FoldColumns "MI_FoldColumns"
#define MI_LoadIntoCurrentPalette "MI_LoadIntoCurrentPalette"
diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
index fe7e0be..a12379f 100644
--- a/toonz/sources/toonz/preferencespopup.cpp
+++ b/toonz/sources/toonz/preferencespopup.cpp
@@ -19,6 +19,7 @@
#include "toonzqt/filefield.h"
// TnzLib includes
+#include "toonz/txsheethandle.h"
#include "toonz/tscenehandle.h"
#include "toonz/txshlevelhandle.h"
#include "toonz/txshleveltypes.h"
@@ -990,6 +991,19 @@ void PreferencesPopup::onUseNumpadForSwitchingStylesClicked(bool checked) {
//-----------------------------------------------------------------------------
+void PreferencesPopup::onShowXSheetToolbarClicked(bool checked) {
+ m_pref->enableShowXSheetToolbar(checked);
+ TApp::instance()->getCurrentScene()->notifyPreferenceChanged("XSheetToolbar");
+}
+
+//-----------------------------------------------------------------------------
+
+void PreferencesPopup::onExpandFunctionHeaderClicked(bool checked) {
+ m_pref->enableExpandFunctionHeader(checked);
+}
+
+//-----------------------------------------------------------------------------
+
void PreferencesPopup::onUseArrowKeyToShiftCellSelectionClicked(int on) {
m_pref->enableUseArrowKeyToShiftCellSelection(on);
}
@@ -1204,6 +1218,12 @@ PreferencesPopup::PreferencesPopup()
new CheckBox(tr("Use Arrow Key to Shift Cell Selection"), this);
CheckBox *inputCellsWithoutDoubleClickingCB =
new CheckBox(tr("Enable to Input Cells without Double Clicking"), this);
+ m_showXSheetToolbar = new QGroupBox(tr("Show Toolbar in the XSheet "), this);
+ m_showXSheetToolbar->setCheckable(true);
+ m_expandFunctionHeader = new CheckBox(
+ tr("Expand Function Editor Header to Match XSheet Toolbar Height "
+ "(Requires Restart)"),
+ this);
//--- Animation ------------------------------
categoryList->addItem(tr("Animation"));
@@ -1470,6 +1490,8 @@ PreferencesPopup::PreferencesPopup()
m_pref->isUseArrowKeyToShiftCellSelectionEnabled());
inputCellsWithoutDoubleClickingCB->setChecked(
m_pref->isInputCellsWithoutDoubleClickingEnabled());
+ m_showXSheetToolbar->setChecked(m_pref->isShowXSheetToolbarEnabled());
+ m_expandFunctionHeader->setChecked(m_pref->isExpandFunctionHeaderEnabled());
//--- Animation ------------------------------
QStringList list;
@@ -1892,7 +1914,6 @@ PreferencesPopup::PreferencesPopup()
Qt::AlignLeft | Qt::AlignVCenter);
drawingFrameLay->addWidget(m_useNumpadForSwitchingStyles, 0,
Qt::AlignLeft | Qt::AlignVCenter);
-
drawingFrameLay->addStretch(1);
}
drawingBox->setLayout(drawingFrameLay);
@@ -1924,11 +1945,21 @@ PreferencesPopup::PreferencesPopup()
xsheetFrameLay->addWidget(showKeyframesOnCellAreaCB, 4, 0, 1, 2);
xsheetFrameLay->addWidget(useArrowKeyToShiftCellSelectionCB, 5, 0, 1, 2);
xsheetFrameLay->addWidget(inputCellsWithoutDoubleClickingCB, 6, 0, 1, 2);
+
+ QVBoxLayout *xSheetToolbarLay = new QVBoxLayout();
+ xSheetToolbarLay->setMargin(10);
+ {
+ xSheetToolbarLay->addWidget(m_expandFunctionHeader, 0,
+ Qt::AlignLeft | Qt::AlignVCenter);
+ }
+ m_showXSheetToolbar->setLayout(xSheetToolbarLay);
+
+ xsheetFrameLay->addWidget(m_showXSheetToolbar, 7, 0, 3, 3);
}
xsheetFrameLay->setColumnStretch(0, 0);
xsheetFrameLay->setColumnStretch(1, 0);
xsheetFrameLay->setColumnStretch(2, 1);
- xsheetFrameLay->setRowStretch(7, 1);
+ xsheetFrameLay->setRowStretch(11, 1);
xsheetBox->setLayout(xsheetFrameLay);
stackedWidget->addWidget(xsheetBox);
@@ -2269,6 +2300,10 @@ PreferencesPopup::PreferencesPopup()
ret = ret &&
connect(inputCellsWithoutDoubleClickingCB, SIGNAL(stateChanged(int)),
SLOT(onInputCellsWithoutDoubleClickingClicked(int)));
+ ret = ret && connect(m_showXSheetToolbar, SIGNAL(clicked(bool)),
+ SLOT(onShowXSheetToolbarClicked(bool)));
+ ret = ret && connect(m_expandFunctionHeader, SIGNAL(clicked(bool)),
+ SLOT(onExpandFunctionHeaderClicked(bool)));
//--- Animation ----------------------
ret = ret && connect(m_keyframeType, SIGNAL(currentIndexChanged(int)),
diff --git a/toonz/sources/toonz/preferencespopup.h b/toonz/sources/toonz/preferencespopup.h
index 84973e7..fe99d17 100644
--- a/toonz/sources/toonz/preferencespopup.h
+++ b/toonz/sources/toonz/preferencespopup.h
@@ -72,13 +72,13 @@ private:
*m_onionSkinVisibility, *m_pixelsOnlyCB, *m_projectRootDocuments,
*m_projectRootDesktop, *m_projectRootCustom, *m_projectRootStuff,
*m_onionSkinDuringPlayback, *m_autoSaveSceneCB, *m_autoSaveOtherFilesCB,
- *m_useNumpadForSwitchingStyles;
+ *m_useNumpadForSwitchingStyles, *m_expandFunctionHeader;
DVGui::FileField *m_customProjectRootFileField;
DVGui::FileField *m_ffmpegPathFileFld, *m_fastRenderPathFileField;
- QGroupBox *m_autoSaveGroup;
+ QGroupBox *m_autoSaveGroup, *m_showXSheetToolbar;
private:
// QWidget* create(const QString& lbl, bool def, const char* slot);
@@ -172,6 +172,8 @@ private slots:
void onFfmpegTimeoutChanged();
void onFastRenderPathChanged();
void onUseNumpadForSwitchingStylesClicked(bool);
+ void onShowXSheetToolbarClicked(bool);
+ void onExpandFunctionHeaderClicked(bool);
void onUseArrowKeyToShiftCellSelectionClicked(int);
void onInputCellsWithoutDoubleClickingClicked(int);
void onWatchFileSystemClicked(int);
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index dcaa2be..af625c0 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -55,6 +55,9 @@
Resources/close_pane.png
Resources/close_pane_rollover.png
Resources/closedfolder.png
+ Resources/collapse.png
+ Resources/collapse_click.png
+ Resources/collapse_over.png
Resources/controlpointeditor.svg
Resources/controlpointeditor_rollover.svg
Resources/compare.png
@@ -155,6 +158,15 @@
Resources/my_computer.png
Resources/my_documents.png
Resources/network.png
+ Resources/new_raster_level.png
+ Resources/new_raster_level_over.png
+ Resources/new_raster_level_click.png
+ Resources/new_toonz_raster_level.png
+ Resources/new_toonz_raster_level_click.png
+ Resources/new_toonz_raster_level_over.png
+ Resources/new_vector_level.png
+ Resources/new_vector_level_click.png
+ Resources/new_vector_level_over.png
Resources/newmemo.png
Resources/newmemo_disabled.png
Resources/newpage.png
@@ -227,6 +239,9 @@
Resources/render_done_with_errors.png
Resources/render_computing.png
Resources/render_suspended.png
+ Resources/repeat_icon.png
+ Resources/repeat_icon_click.png
+ Resources/repeat_icon_over.png
Resources/resizeColumnNode.svg
Resources/rightTitle_inactive.png
Resources/rightTitle.png
@@ -287,7 +302,11 @@
Resources/sub3.png
Resources/sub4.png
Resources/sub_enter.png
- Resources/sub_enter_rollover.png
+ Resources/sub_enter_over.png
+ Resources/sub_enter_click.png
+ Resources/sub_leave.png
+ Resources/sub_leave_over.png
+ Resources/sub_leave_click.png
Resources/swap_off.png
Resources/swap_on.png
Resources/svg.png
diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp
index 97d8066..452ba19 100644
--- a/toonz/sources/toonz/xshcolumnviewer.cpp
+++ b/toonz/sources/toonz/xshcolumnviewer.cpp
@@ -1900,6 +1900,8 @@ void ColumnArea::contextMenuEvent(QContextMenuEvent *event) {
}
menu.addSeparator();
menu.addAction(cmdManager->getAction(MI_FoldColumns));
+ menu.addSeparator();
+ menu.addAction(cmdManager->getAction(MI_ToggleXSheetToolbar));
// force the selected cells placed in n-steps
if (!xsh->isColumnEmpty(col)) {
diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cpp
index 5a440a7..a8debfc 100644
--- a/toonz/sources/toonz/xsheetviewer.cpp
+++ b/toonz/sources/toonz/xsheetviewer.cpp
@@ -161,6 +161,7 @@ XsheetViewer::XsheetViewer(QWidget *parent, Qt::WFlags flags)
, m_isComputingSize(false)
, m_currentNoteIndex(0)
, m_qtModifiers(0)
+ , m_toolbarHeight(30)
, m_frameDisplayStyle(to_enum(FrameDisplayStyleInXsheetRowArea)) {
setFocusPolicy(Qt::StrongFocus);
@@ -170,6 +171,14 @@ XsheetViewer::XsheetViewer(QWidget *parent, Qt::WFlags flags)
m_cellKeyframeSelection->setXsheetHandle(
TApp::instance()->getCurrentXsheet());
+ m_toolbarScrollArea = new XsheetScrollArea(this);
+ m_toolbarScrollArea->setFixedSize(m_x0 * 12, m_toolbarHeight);
+ m_toolbarScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_toolbarScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_toolbar = new XsheetGUI::Toolbar(this);
+ m_toolbar->setFixedSize(m_x0 * 12, m_toolbarHeight);
+ m_toolbarScrollArea->setWidget(m_toolbar);
+
m_noteArea = new XsheetGUI::NoteArea(this);
m_noteArea->setFixedSize(m_x0 + 1, m_y0 - 3);
m_noteScrollArea = new XsheetScrollArea(this);
@@ -605,6 +614,8 @@ void XsheetViewer::showEvent(QShowEvent *) {
SLOT(onSceneSwitched()));
ret = ret && connect(sceneHandle, SIGNAL(nameSceneChanged()), this,
SLOT(changeWindowTitle()));
+ ret = ret && connect(sceneHandle, SIGNAL(preferenceChanged(const QString &)),
+ this, SLOT(onPreferenceChanged(const QString &)));
TXsheetHandle *xsheetHandle = app->getCurrentXsheet();
ret = ret && connect(xsheetHandle, SIGNAL(xsheetSwitched()), this,
@@ -693,15 +704,35 @@ void XsheetViewer::paintEvent(QPaintEvent*)
//-----------------------------------------------------------------------------
-void XsheetViewer::resizeEvent(QResizeEvent *event) {
+void XsheetViewer::updatePanelsSizes() {
int w = width();
int h = height();
int scrollBarWidth = 16;
- m_noteScrollArea->setGeometry(3, 1, m_x0 - 4, m_y0 - 3);
- m_cellScrollArea->setGeometry(m_x0, m_y0, w - m_x0, h - m_y0);
- m_columnScrollArea->setGeometry(m_x0, 1, w - m_x0 - scrollBarWidth, m_y0 - 3);
- m_rowScrollArea->setGeometry(1, m_y0, m_x0 - 1, h - m_y0 - scrollBarWidth);
+ if (Preferences::instance()->isShowXSheetToolbarEnabled()) {
+ m_toolbar->showToolbar(true);
+ m_toolbarScrollArea->setGeometry(1, 1, m_x0 * 12, m_y0 - 3);
+ m_noteScrollArea->setGeometry(3, m_toolbarHeight + 1, m_x0 - 4, m_y0 - 3);
+ m_cellScrollArea->setGeometry(m_x0, m_y0 + m_toolbarHeight, w - m_x0,
+ h - m_y0 - m_toolbarHeight);
+ m_columnScrollArea->setGeometry(m_x0, m_toolbarHeight + 1,
+ w - m_x0 - scrollBarWidth, m_y0 - 3);
+ m_rowScrollArea->setGeometry(1, m_y0 + m_toolbarHeight, m_x0 - 1,
+ h - m_y0 - scrollBarWidth - m_toolbarHeight);
+ } else {
+ m_toolbar->showToolbar(false);
+ m_toolbarScrollArea->setGeometry(3, 1, m_x0 - 4, m_y0 - 3);
+ m_noteScrollArea->setGeometry(3, 1, m_x0 - 4, m_y0 - 3);
+ m_cellScrollArea->setGeometry(m_x0, m_y0, w - m_x0, h - m_y0);
+ m_columnScrollArea->setGeometry(m_x0, 1, w - m_x0 - scrollBarWidth,
+ m_y0 - 3);
+ m_rowScrollArea->setGeometry(1, m_y0, m_x0 - 1, h - m_y0 - scrollBarWidth);
+ }
+}
+
+//-----------------------------------------------------------------------------
+void XsheetViewer::resizeEvent(QResizeEvent *event) {
+ updatePanelsSizes();
//(Nuovo Layout Manager) Reintrodotto per il refresh automatico
refreshContentSize(
0,
@@ -917,6 +948,12 @@ void XsheetViewer::onXsheetChanged() {
//-----------------------------------------------------------------------------
+void XsheetViewer::onPreferenceChanged(const QString &prefName) {
+ if (prefName == "XSheetToolbar") updatePanelsSizes();
+}
+
+//-----------------------------------------------------------------------------
+
void XsheetViewer::onCurrentFrameSwitched() {
int row = TApp::instance()->getCurrentFrame()->getFrame();
QRect visibleRect = m_cellArea->visibleRegion().boundingRect();
diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h
index 5596ca4..d1eb9e4 100644
--- a/toonz/sources/toonz/xsheetviewer.h
+++ b/toonz/sources/toonz/xsheetviewer.h
@@ -10,6 +10,7 @@
#include "xshcolumnviewer.h"
#include "xshrowviewer.h"
#include "xshnoteviewer.h"
+#include "xshtoolbar.h"
#include "cellkeyframeselection.h"
#include "toonzqt/spreadsheetviewer.h"
@@ -313,13 +314,15 @@ class XsheetViewer final : public QFrame, public Spreadsheet::FrameScroller {
XsheetScrollArea *m_columnScrollArea;
XsheetScrollArea *m_rowScrollArea;
XsheetScrollArea *m_noteScrollArea;
+ XsheetScrollArea *m_toolbarScrollArea;
XsheetGUI::ColumnArea *m_columnArea;
XsheetGUI::RowArea *m_rowArea;
XsheetGUI::CellArea *m_cellArea;
XsheetGUI::NoteArea *m_noteArea;
+ XsheetGUI::Toolbar *m_toolbar;
- int m_x0, m_y0;
+ int m_x0, m_y0, m_toolbarHeight;
int m_timerId;
QPoint m_autoPanSpeed;
QPoint m_lastAutoPanPos;
@@ -431,7 +434,7 @@ public:
void updateCells() { m_cellArea->update(m_cellArea->visibleRegion()); }
void updateRows() { m_rowArea->update(m_rowArea->visibleRegion()); }
void updateColumns() { m_columnArea->update(m_columnArea->visibleRegion()); }
-
+ void updatePanelsSizes();
bool refreshContentSize(int scrollDx, int scrollDy);
void updateAreeSize();
@@ -689,7 +692,7 @@ public slots:
void updateCellRowAree();
void onScrubStopped();
-
+ void onPreferenceChanged(const QString &prefName);
//! Aggiorna il "titolo" del widget.
void changeWindowTitle();
diff --git a/toonz/sources/toonz/xshnoteviewer.cpp b/toonz/sources/toonz/xshnoteviewer.cpp
index 61dc56e..3805bf4 100644
--- a/toonz/sources/toonz/xshnoteviewer.cpp
+++ b/toonz/sources/toonz/xshnoteviewer.cpp
@@ -458,7 +458,6 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
m_precNoteButton = new QToolButton(this);
m_nextNoteButton = new QToolButton(this);
m_frameDisplayStyleCombo = new QComboBox(this);
-
//-----
toolButton->setObjectName("ToolbarToolButton");
@@ -498,6 +497,7 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags)
mainLay->setSpacing(5);
{
mainLay->addStretch(1);
+
mainLay->addWidget(toolButton, 0, Qt::AlignHCenter);
QHBoxLayout *noteLay = new QHBoxLayout();
diff --git a/toonz/sources/toonz/xshtoolbar.cpp b/toonz/sources/toonz/xshtoolbar.cpp
new file mode 100644
index 0000000..114d9cc
--- /dev/null
+++ b/toonz/sources/toonz/xshtoolbar.cpp
@@ -0,0 +1,183 @@
+
+
+#include "xshtoolbar.h"
+
+// Tnz6 includes
+#include "xsheetviewer.h"
+#include "tapp.h"
+#include "menubarcommandids.h"
+// TnzQt includes
+#include "toonzqt/gutil.h"
+
+// TnzLib includes
+#include "toonz/preferences.h"
+#include "toonz/tscenehandle.h"
+
+// Qt includes
+#include
+
+//=============================================================================
+
+namespace XsheetGUI {
+
+//=============================================================================
+// Toolbar
+//-----------------------------------------------------------------------------
+
+#if QT_VERSION >= 0x050500
+Toolbar::Toolbar(XsheetViewer *parent, Qt::WindowFlags flags)
+#else
+Toolbar::Toolbar(XsheetViewer *parent, Qt::WFlags flags)
+#endif
+ : QFrame(parent), m_viewer(parent) {
+ setFrameStyle(QFrame::StyledPanel);
+ setObjectName("cornerWidget");
+ m_toolbar = new QToolBar();
+ m_toolbar->setFixedHeight(30);
+ m_toolbar->setObjectName("XSheetToolbar");
+
+ m_newVectorLevelButton = new QPushButton(this);
+ m_newVectorLevelButton->setIconSize(QSize(18, 18));
+ QIcon newVectorIcon = createQIconPNG("new_vector_level");
+ m_newVectorLevelButton->setIcon(newVectorIcon);
+ m_newVectorLevelButton->setObjectName("XSheetToolbarLevelButton");
+ m_newVectorLevelButton->setToolTip(tr("New Vector Level"));
+
+ m_newToonzRasterLevelButton = new QPushButton(this);
+ m_newToonzRasterLevelButton->setIconSize(QSize(18, 18));
+ QIcon newToonzRasterIcon = createQIconPNG("new_toonz_raster_level");
+ m_newToonzRasterLevelButton->setIcon(newToonzRasterIcon);
+ m_newToonzRasterLevelButton->setObjectName("XSheetToolbarLevelButton");
+ m_newToonzRasterLevelButton->setToolTip(tr("New Toonz Raster Level"));
+
+ m_newRasterLevelButton = new QPushButton(this);
+ m_newRasterLevelButton->setIconSize(QSize(18, 18));
+ QIcon newRasterIcon = createQIconPNG("new_raster_level");
+ m_newRasterLevelButton->setIcon(newRasterIcon);
+ m_newRasterLevelButton->setObjectName("XSheetToolbarLevelButton");
+ m_newRasterLevelButton->setToolTip(tr("New Raster Level"));
+
+ TApp *app = TApp::instance();
+ m_keyFrameButton = new ViewerKeyframeNavigator(this, app->getCurrentFrame());
+ m_keyFrameButton->setObjectHandle(app->getCurrentObject());
+ m_keyFrameButton->setXsheetHandle(app->getCurrentXsheet());
+
+ QVBoxLayout *mainLay = new QVBoxLayout();
+ mainLay->setMargin(0);
+ mainLay->setSpacing(5);
+ {
+ mainLay->addStretch(1);
+ QHBoxLayout *toolbarLayout = new QHBoxLayout();
+ toolbarLayout->setSpacing(2);
+ toolbarLayout->setMargin(0);
+ {
+ m_toolbar->addWidget(m_newVectorLevelButton);
+ m_toolbar->addWidget(m_newToonzRasterLevelButton);
+ m_toolbar->addWidget(m_newRasterLevelButton);
+ m_toolbar->addSeparator();
+ QAction *reframeOnes =
+ CommandManager::instance()->getAction("MI_Reframe1");
+ m_toolbar->addAction(reframeOnes);
+ QAction *reframeTwos =
+ CommandManager::instance()->getAction("MI_Reframe2");
+ m_toolbar->addAction(reframeTwos);
+ QAction *reframeThrees =
+ CommandManager::instance()->getAction("MI_Reframe3");
+ m_toolbar->addAction(reframeThrees);
+
+ m_toolbar->addSeparator();
+
+ QAction *repeat = CommandManager::instance()->getAction("MI_Dup");
+ m_toolbar->addAction(repeat);
+
+ m_toolbar->addSeparator();
+
+ QAction *collapse = CommandManager::instance()->getAction("MI_Collapse");
+ m_toolbar->addAction(collapse);
+ QAction *open = CommandManager::instance()->getAction("MI_OpenChild");
+ m_toolbar->addAction(open);
+ QAction *leave = CommandManager::instance()->getAction("MI_CloseChild");
+ m_toolbar->addAction(leave);
+
+ m_toolbar->addSeparator();
+ m_toolbar->addWidget(m_keyFrameButton);
+ toolbarLayout->addWidget(m_toolbar);
+ toolbarLayout->addStretch(0);
+ }
+ mainLay->addLayout(toolbarLayout, 0);
+ if (!Preferences::instance()->isShowXSheetToolbarEnabled()) {
+ m_toolbar->hide();
+ }
+
+ mainLay->addStretch(1);
+ }
+ setLayout(mainLay);
+
+ // signal-slot connections
+ bool ret = true;
+ ret = ret && connect(m_newVectorLevelButton, SIGNAL(released()), this,
+ SLOT(onNewVectorLevelButtonPressed()));
+ ret = ret && connect(m_newToonzRasterLevelButton, SIGNAL(released()), this,
+ SLOT(onNewToonzRasterLevelButtonPressed()));
+ ret = ret && connect(m_newRasterLevelButton, SIGNAL(released()), this,
+ SLOT(onNewRasterLevelButtonPressed()));
+ assert(ret);
+
+ // m_leaveSubButton->hide();
+}
+
+//-----------------------------------------------------------------------------
+
+void Toolbar::onNewVectorLevelButtonPressed() {
+ int defaultLevelType = Preferences::instance()->getDefLevelType();
+ Preferences::instance()->setDefLevelType(PLI_XSHLEVEL);
+ CommandManager::instance()->execute("MI_NewLevel");
+ Preferences::instance()->setDefLevelType(defaultLevelType);
+}
+
+//-----------------------------------------------------------------------------
+
+void Toolbar::onNewToonzRasterLevelButtonPressed() {
+ int defaultLevelType = Preferences::instance()->getDefLevelType();
+ // Preferences::instance()->setOldDefLevelType(defaultLevelType);
+ Preferences::instance()->setDefLevelType(TZP_XSHLEVEL);
+ CommandManager::instance()->execute("MI_NewLevel");
+ Preferences::instance()->setDefLevelType(defaultLevelType);
+}
+
+//-----------------------------------------------------------------------------
+
+void Toolbar::onNewRasterLevelButtonPressed() {
+ int defaultLevelType = Preferences::instance()->getDefLevelType();
+ Preferences::instance()->setDefLevelType(OVL_XSHLEVEL);
+ CommandManager::instance()->execute("MI_NewLevel");
+ Preferences::instance()->setDefLevelType(defaultLevelType);
+}
+
+//-----------------------------------------------------------------------------
+
+void Toolbar::showToolbar(bool show) {
+ show ? m_toolbar->show() : m_toolbar->hide();
+}
+
+//-----------------------------------------------------------------------------
+
+void Toolbar::toggleXSheetToolbar() {
+ bool toolbarEnabled = Preferences::instance()->isShowXSheetToolbarEnabled();
+ Preferences::instance()->enableShowXSheetToolbar(!toolbarEnabled);
+ TApp::instance()->getCurrentScene()->notifyPreferenceChanged("XSheetToolbar");
+}
+
+//-----------------------------------------------------------------------------
+
+//============================================================
+
+class ToggleXSheetToolbarCommand final : public MenuItemHandler {
+public:
+ ToggleXSheetToolbarCommand() : MenuItemHandler(MI_ToggleXSheetToolbar) {}
+ void execute() override { Toolbar::toggleXSheetToolbar(); }
+} ToggleXSheetToolbarCommand;
+
+//============================================================
+
+} // namespace XsheetGUI;
diff --git a/toonz/sources/toonz/xshtoolbar.h b/toonz/sources/toonz/xshtoolbar.h
new file mode 100644
index 0000000..18e5f70
--- /dev/null
+++ b/toonz/sources/toonz/xshtoolbar.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#ifndef XSHTOOLBAR_H
+#define XSHTOOLBAR_H
+
+#include
+
+#include "toonz/txsheet.h"
+#include "toonz/txshleveltypes.h"
+#include "toonzqt/keyframenavigator.h"
+
+#include
+#include
+
+//-----------------------------------------------------------------------------
+
+// forward declaration
+class XsheetViewer;
+class QPushButton;
+
+//-----------------------------------------------------------------------------
+
+namespace XsheetGUI {
+
+//=============================================================================
+// XSheet Toolbar
+//-----------------------------------------------------------------------------
+
+class Toolbar final : public QFrame {
+ Q_OBJECT
+
+ XsheetViewer *m_viewer;
+
+ QPushButton *m_newVectorLevelButton;
+ QPushButton *m_newToonzRasterLevelButton;
+ QPushButton *m_newRasterLevelButton;
+ ViewerKeyframeNavigator *m_keyFrameButton;
+ QToolBar *m_toolbar;
+
+public:
+#if QT_VERSION >= 0x050500
+ Toolbar(XsheetViewer *parent = 0, Qt::WindowFlags flags = 0);
+#else
+ Toolbar(XsheetViewer *parent = 0, Qt::WFlags flags = 0);
+#endif
+ static void toggleXSheetToolbar();
+ void showToolbar(bool show);
+
+protected slots:
+ void onNewVectorLevelButtonPressed();
+ void onNewToonzRasterLevelButtonPressed();
+ void onNewRasterLevelButtonPressed();
+};
+
+} // namespace XsheetGUI;
+
+#endif // XSHTOOLBAR_H
diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp
index be82ba1..9df1d7b 100644
--- a/toonz/sources/toonzlib/preferences.cpp
+++ b/toonz/sources/toonzlib/preferences.cpp
@@ -118,8 +118,8 @@ void getDefaultLevelFormats(LevelFormatVector &lfv) {
lfv[1].m_options.m_premultiply = true;
// for all PNG files, set premultiply by default
- lfv[2].m_name = Preferences::tr("PNG");
- lfv[2].m_pathFormat = QRegExp("..*\\.png", Qt::CaseInsensitive);
+ lfv[2].m_name = Preferences::tr("PNG");
+ lfv[2].m_pathFormat = QRegExp("..*\\.png", Qt::CaseInsensitive);
lfv[2].m_options.m_premultiply = true;
}
}
@@ -308,6 +308,8 @@ Preferences::Preferences()
, m_ffmpegTimeout(60)
, m_shortcutPreset("defopentoonz")
, m_useNumpadForSwitchingStyles(true)
+ , m_showXSheetToolbar(false)
+ , m_expandFunctionHeader(false)
, m_useArrowKeyToShiftCellSelection(false)
, m_inputCellsWithoutDoubleClickingEnabled(false)
, m_importPolicy(0)
@@ -585,6 +587,8 @@ Preferences::Preferences()
setShortcutPreset(m_shortcutPreset.toStdString());
getValue(*m_settings, "useNumpadForSwitchingStyles",
m_useNumpadForSwitchingStyles);
+ getValue(*m_settings, "showXSheetToolbar", m_showXSheetToolbar);
+ getValue(*m_settings, "expandFunctionHeader", m_expandFunctionHeader);
getValue(*m_settings, "useArrowKeyToShiftCellSelection",
m_useArrowKeyToShiftCellSelection);
getValue(*m_settings, "inputCellsWithoutDoubleClickingEnabled",
@@ -1373,6 +1377,20 @@ void Preferences::enableUseNumpadForSwitchingStyles(bool on) {
//-----------------------------------------------------------------
+void Preferences::enableShowXSheetToolbar(bool on) {
+ m_showXSheetToolbar = on;
+ m_settings->setValue("showXSheetToolbar", on ? "1" : "0");
+}
+
+//-----------------------------------------------------------------
+
+void Preferences::enableExpandFunctionHeader(bool on) {
+ m_expandFunctionHeader = on;
+ m_settings->setValue("expandFunctionHeader", on ? "1" : "0");
+}
+
+//-----------------------------------------------------------------
+
void Preferences::enableUseArrowKeyToShiftCellSelection(bool on) {
m_useArrowKeyToShiftCellSelection = on;
m_settings->setValue("useArrowKeyToShiftCellSelection", on ? "1" : "0");
diff --git a/toonz/sources/toonzqt/functionviewer.cpp b/toonz/sources/toonzqt/functionviewer.cpp
index a07cb65..6e07783 100644
--- a/toonz/sources/toonzqt/functionviewer.cpp
+++ b/toonz/sources/toonzqt/functionviewer.cpp
@@ -26,6 +26,7 @@
#include "toonz/tproject.h"
#include "toonz/tscenehandle.h"
#include "toonz/sceneproperties.h"
+#include "toonz/preferences.h"
// TnzBase includes
#include "tparamcontainer.h"
@@ -109,15 +110,19 @@ FunctionViewer::FunctionViewer(QWidget *parent, Qt::WFlags flags)
//---- layout
- QVBoxLayout *leftLayout = new QVBoxLayout();
- leftLayout->setMargin(0);
- leftLayout->setSpacing(0);
+ m_leftLayout = new QVBoxLayout();
+ m_leftLayout->setMargin(0);
+ m_leftLayout->setSpacing(0);
{
- leftLayout->addWidget(m_toolbar);
- leftLayout->addSpacing(36);
- leftLayout->addWidget(m_numericalColumns);
+ m_leftLayout->addWidget(m_toolbar);
+ if (Preferences::instance()->isShowXSheetToolbarEnabled() &&
+ Preferences::instance()->isExpandFunctionHeaderEnabled()) {
+ m_leftLayout->addSpacing(66);
+ } else
+ m_leftLayout->addSpacing(36);
+ m_leftLayout->addWidget(m_numericalColumns);
}
- leftPanel->setLayout(leftLayout);
+ leftPanel->setLayout(m_leftLayout);
addWidget(leftPanel);
@@ -325,8 +330,8 @@ void FunctionViewer::setXsheetHandle(TXsheetHandle *xshHandle) {
TXsheet *xsh = m_xshHandle->getXsheet();
m_functionGraph->getModel()->refreshData(xsh);
- bool ret =
- connect(m_xshHandle, SIGNAL(xsheetChanged), this, SLOT(refreshModel()));
+ bool ret = connect(m_xshHandle, SIGNAL(xsheetChanged()), this,
+ SLOT(refreshModel()));
assert(ret);
}
}