Merge pull request #3508 from shun-iwasawa/g/gui_modification

GUI modifications
opentoonz · Sep 28, 2020 · 8089ebb · 8089ebb
2 parents c7cb211 + caf3c62
commit 8089ebb
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 43 deletions.
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qss
@@ -189,11 +189,13 @@ QTabBar::tab:only-one {
 /* -----------------------------------------------------------------------------
    Main
 ----------------------------------------------------------------------------- */
-QWidget {
+QWidget,
+QTextEdit[readOnly="true"] {
   background-color: #414345;
   color: #d6d8dd;
 }
-QWidget:disabled {
+QWidget:disabled,
+QTextEdit[readOnly="true"]:disabled {
   color: rgba(214, 216, 221, 0.4);
 }
 QFrame {
@@ -987,6 +989,15 @@ QTextEdit:disabled,
   border-color: #333537;
   color: rgba(214, 216, 221, 0.4);
 }
+QTextEdit[readOnly="true"] {
+  border: 0;
+}
+QTextEdit[readOnly="true"]:focus,
+QTextEdit[readOnly="true"]:disabled {
+  background-color: #414345;
+  color: #d6d8dd;
+  border: 0;
+}
 /* -----------------------------------------------------------------------------
    CheckBox
 ----------------------------------------------------------------------------- */
@@ -2157,7 +2168,9 @@ Ruler {
 /* ScrollAreas (Row, Column and Cell)
 ----------------------------------------------------------------------------- */
 #xsheetArea,
-#ScrollArea {
+#ScrollColumnArea,
+#ScrollRowArea,
+#ScrollCellArea {
   background-color: #414345;
   border: 0;
 }
@@ -2329,6 +2342,16 @@ FunctionTreeView {
 }
 /* Function Editor Spreadsheet
 ----------------------------------------------------------------------------- */
+#ScrollRowArea,
+#ScrollCellArea {
+  border-top: 1 solid rgba(0, 0, 0, 0.3);
+}
+#ScrollCellArea {
+  border-left: 1 solid rgba(0, 0, 0, 0.3);
+}
+#ScrollColumnArea {
+  padding-left: 2;
+}
 FunctionPanel {
   qproperty-BGColor: #3a3b3d;
   qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss
@@ -189,11 +189,13 @@ QTabBar::tab:only-one {
 /* -----------------------------------------------------------------------------
    Main
 ----------------------------------------------------------------------------- */
-QWidget {
+QWidget,
+QTextEdit[readOnly="true"] {
   background-color: #303030;
   color: #e6e6e6;
 }
-QWidget:disabled {
+QWidget:disabled,
+QTextEdit[readOnly="true"]:disabled {
   color: rgba(230, 230, 230, 0.4);
 }
 QFrame {
@@ -987,6 +989,15 @@ QTextEdit:disabled,
   border-color: #434343;
   color: rgba(230, 230, 230, 0.4);
 }
+QTextEdit[readOnly="true"] {
+  border: 0;
+}
+QTextEdit[readOnly="true"]:focus,
+QTextEdit[readOnly="true"]:disabled {
+  background-color: #303030;
+  color: #e6e6e6;
+  border: 0;
+}
 /* -----------------------------------------------------------------------------
    CheckBox
 ----------------------------------------------------------------------------- */
@@ -2157,7 +2168,9 @@ Ruler {
 /* ScrollAreas (Row, Column and Cell)
 ----------------------------------------------------------------------------- */
 #xsheetArea,
-#ScrollArea {
+#ScrollColumnArea,
+#ScrollRowArea,
+#ScrollCellArea {
   background-color: #303030;
   border: 0;
 }
@@ -2329,6 +2342,16 @@ FunctionTreeView {
 }
 /* Function Editor Spreadsheet
 ----------------------------------------------------------------------------- */
+#ScrollRowArea,
+#ScrollCellArea {
+  border-top: 1 solid rgba(0, 0, 0, 0.4);
+}
+#ScrollCellArea {
+  border-left: 1 solid rgba(0, 0, 0, 0.4);
+}
+#ScrollColumnArea {
+  padding-left: 2;
+}
 FunctionPanel {
   qproperty-BGColor: #303030;
   qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);
@@ -2344,7 +2367,7 @@ SpreadsheetViewer {
   qproperty-CurrentRowBgColor: rgba(83, 133, 166, 0.7);
   qproperty-LightLineColor: rgba(0, 0, 0, 0.3);
   qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
-  qproperty-BGColor: #303030;
+  qproperty-BGColor: #262626;
   qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);
   qproperty-KeyFrameColor: #995d1d;
   qproperty-KeyFrameBorderColor: #db9041;
@@ -2355,7 +2378,7 @@ SpreadsheetViewer {
   qproperty-SelectedEmptyColor: rgba(90, 100, 106, 0.5);
   qproperty-SelectedSceneRangeEmptyColor: rgba(90, 100, 106, 0.5);
   qproperty-TextColor: #e6e6e6;
-  qproperty-ColumnHeaderBorderColor: #0f0f0f;
+  qproperty-ColumnHeaderBorderColor: #4a4a4a;
 }
 #ExpressionField {
   background-color: #cecece;

diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qss
@@ -189,11 +189,13 @@ QTabBar::tab:only-one {
 /* -----------------------------------------------------------------------------
    Main
 ----------------------------------------------------------------------------- */
-QWidget {
+QWidget,
+QTextEdit[readOnly="true"] {
   background-color: #484848;
   color: #e6e6e6;
 }
-QWidget:disabled {
+QWidget:disabled,
+QTextEdit[readOnly="true"]:disabled {
   color: rgba(230, 230, 230, 0.4);
 }
 QFrame {
@@ -987,6 +989,15 @@ QTextEdit:disabled,
   border-color: #3a3a3a;
   color: rgba(230, 230, 230, 0.4);
 }
+QTextEdit[readOnly="true"] {
+  border: 0;
+}
+QTextEdit[readOnly="true"]:focus,
+QTextEdit[readOnly="true"]:disabled {
+  background-color: #484848;
+  color: #e6e6e6;
+  border: 0;
+}
 /* -----------------------------------------------------------------------------
    CheckBox
 ----------------------------------------------------------------------------- */
@@ -2157,7 +2168,9 @@ Ruler {
 /* ScrollAreas (Row, Column and Cell)
 ----------------------------------------------------------------------------- */
 #xsheetArea,
-#ScrollArea {
+#ScrollColumnArea,
+#ScrollRowArea,
+#ScrollCellArea {
   background-color: #484848;
   border: 0;
 }
@@ -2329,6 +2342,16 @@ FunctionTreeView {
 }
 /* Function Editor Spreadsheet
 ----------------------------------------------------------------------------- */
+#ScrollRowArea,
+#ScrollCellArea {
+  border-top: 1 solid rgba(0, 0, 0, 0.3);
+}
+#ScrollCellArea {
+  border-left: 1 solid rgba(0, 0, 0, 0.3);
+}
+#ScrollColumnArea {
+  padding-left: 2;
+}
 FunctionPanel {
   qproperty-BGColor: #404040;
   qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);

diff --git a/stuff/config/qss/Default/less/Default.less b/stuff/config/qss/Default/less/Default.less
@@ -550,6 +550,7 @@
 @function-LightLightBG-color:            @xsheet-OnionSkinAreaBG-color;
 @function-SelectedSceneRangeEmpty-color: @xsheet-SelectedEmptyCell-color;
 @function-ColumnHeaderBorder-color:      darken(@bg, 13);
+@function-ColumnHeaderBG-color: @xsheet-NotEmptyColumn-color;
 
 // Keyframe Colors
 @function-KeyFrame-color:          darken(desaturate(spin(@keyframe-total-color, 0.0000), 0.7570), 8.4314);

diff --git a/stuff/config/qss/Default/less/layouts/controls.less b/stuff/config/qss/Default/less/layouts/controls.less
@@ -144,12 +144,24 @@ QComboBox {
   }
 }
 
-QPlainTextEdit
-,QLineEdit
-,QTextEdit {
+QPlainTextEdit,
+QLineEdit,
+QTextEdit {
   &:extend(.LineEdit all);
 }
 
+// reset all styles for read-only QtextEdit
+QTextEdit[readOnly="true"]{
+  &:extend(QWidget all);
+  border: 0;
+  &:focus,
+  &:disabled {
+    background-color: @bg;
+    color: @text-color;
+    border: 0;
+  }
+}
+
 /* -----------------------------------------------------------------------------
    CheckBox
 ----------------------------------------------------------------------------- */

diff --git a/stuff/config/qss/Default/less/layouts/xsheet.less b/stuff/config/qss/Default/less/layouts/xsheet.less
@@ -6,7 +6,9 @@
 ----------------------------------------------------------------------------- */
 
 #xsheetArea,
-#ScrollArea {
+#ScrollColumnArea,
+#ScrollRowArea,
+#ScrollCellArea {
   background-color: @xsheet-empty-bg-color;
   border: 0;
 }
@@ -240,6 +242,20 @@ FunctionTreeView {
 // If a qproperty shares the same likeness with XSheet then pair the variables.
 // XSheet should be considered as parent.
 
+
+#ScrollRowArea,
+#ScrollCellArea {  
+  border-top:1 solid @xsheet-VerticalLine-color;
+}
+
+#ScrollCellArea {
+  border-left:1 solid @xsheet-VerticalLine-color;
+}
+
+#ScrollColumnArea {
+  padding-left:2;
+}
+
 FunctionPanel {
   qproperty-BGColor: @function-panel-bg-color;
   qproperty-ValueLineColor: @function-panel-ValueLine-color;
@@ -256,7 +272,7 @@ SpreadsheetViewer {
   qproperty-CurrentRowBgColor: @xsheet-CurrentRowBG-color; // paired
   qproperty-LightLineColor: @xsheet-LightLine-color; // paired
   qproperty-MarkerLineColor: @xsheet-MarkerLine-color; // paired
-  qproperty-BGColor: @xsheet-NotEmptyColumn-color; // paired
+  qproperty-BGColor: @function-ColumnHeaderBG-color;
   qproperty-VerticalLineColor: @xsheet-VerticalLine-color; // paired
   qproperty-KeyFrameColor: @function-KeyFrame-color;
   qproperty-KeyFrameBorderColor: @function-KeyFrameBorder-color;

diff --git a/stuff/config/qss/Default/less/themes/Dark.less b/stuff/config/qss/Default/less/themes/Dark.less
@@ -108,3 +108,7 @@
 
 // Function Curve Panel
 @function-panel-OtherCurves-color: lighten(@function-panel-bg-color, 30);
+
+// Function Spreadsheet Viewer
+@function-ColumnHeaderBorder-color: lighten(@bg, 10);
+@function-ColumnHeaderBG-color: darken(@bg, 4);
diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qss
@@ -189,11 +189,13 @@ QTabBar::tab:only-one {
 /* -----------------------------------------------------------------------------
    Main
 ----------------------------------------------------------------------------- */
-QWidget {
+QWidget,
+QTextEdit[readOnly="true"] {
   background-color: #DBDBDB;
   color: #000;
 }
-QWidget:disabled {
+QWidget:disabled,
+QTextEdit[readOnly="true"]:disabled {
   color: rgba(0, 0, 0, 0.4);
 }
 QFrame {
@@ -987,6 +989,15 @@ QTextEdit:disabled,
   border-color: #c2c2c2;
   color: rgba(0, 0, 0, 0.4);
 }
+QTextEdit[readOnly="true"] {
+  border: 0;
+}
+QTextEdit[readOnly="true"]:focus,
+QTextEdit[readOnly="true"]:disabled {
+  background-color: #DBDBDB;
+  color: #000;
+  border: 0;
+}
 /* -----------------------------------------------------------------------------
    CheckBox
 ----------------------------------------------------------------------------- */
@@ -2157,7 +2168,9 @@ Ruler {
 /* ScrollAreas (Row, Column and Cell)
 ----------------------------------------------------------------------------- */
 #xsheetArea,
-#ScrollArea {
+#ScrollColumnArea,
+#ScrollRowArea,
+#ScrollCellArea {
   background-color: #DBDBDB;
   border: 0;
 }
@@ -2329,6 +2342,16 @@ FunctionTreeView {
 }
 /* Function Editor Spreadsheet
 ----------------------------------------------------------------------------- */
+#ScrollRowArea,
+#ScrollCellArea {
+  border-top: 1 solid rgba(0, 0, 0, 0.15);
+}
+#ScrollCellArea {
+  border-left: 1 solid rgba(0, 0, 0, 0.15);
+}
+#ScrollColumnArea {
+  padding-left: 2;
+}
 FunctionPanel {
   qproperty-BGColor: #808080;
   qproperty-ValueLineColor: rgba(0, 0, 0, 0.1);