Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GUI modifications #3508

Merged
merged 1 commit into from
Sep 28, 2020
Merged

GUI modifications #3508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 26 additions & 3 deletions stuff/config/qss/Blue/Blue.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -2157,7 +2168,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #414345;
border: 0;
}
Expand Down Expand Up @@ -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);
Expand Down
33 changes: 28 additions & 5 deletions stuff/config/qss/Dark/Dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -2157,7 +2168,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #303030;
border: 0;
}
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand Down
29 changes: 26 additions & 3 deletions stuff/config/qss/Default/Default.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -2157,7 +2168,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #484848;
border: 0;
}
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions stuff/config/qss/Default/less/Default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
18 changes: 15 additions & 3 deletions stuff/config/qss/Default/less/layouts/controls.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------------------------------------------------------------- */
Expand Down
20 changes: 18 additions & 2 deletions stuff/config/qss/Default/less/layouts/xsheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
----------------------------------------------------------------------------- */

#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: @xsheet-empty-bg-color;
border: 0;
}
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions stuff/config/qss/Default/less/themes/Dark.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
29 changes: 26 additions & 3 deletions stuff/config/qss/Light/Light.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
----------------------------------------------------------------------------- */
Expand Down Expand Up @@ -2157,7 +2168,9 @@ Ruler {
/* ScrollAreas (Row, Column and Cell)
----------------------------------------------------------------------------- */
#xsheetArea,
#ScrollArea {
#ScrollColumnArea,
#ScrollRowArea,
#ScrollCellArea {
background-color: #DBDBDB;
border: 0;
}
Expand Down Expand Up @@ -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);
Expand Down