Skip to content

Commit

Permalink
Merge pull request #5379 from konero/cycle-clr
Browse files Browse the repository at this point in the history 
[ui] Extra x-sheet colors
  • Loading branch information
@RodneyBaker
RodneyBaker authored Apr 26, 2024
2 parents 4dba8ca + 6bead43 commit be3a35f
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 155 deletions.
27 changes: 4 additions & 23 deletions stuff/config/qss/Blue/Blue.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,6 @@ DvScrollWidget {
image: url('../Default/imgs/white/scroll-down.svg');
}
/* -------------------------------------------------------------------------- */
/* For the buttons to display a BG color we need to set a blank image, setting
an empty URL solves this. */
#keyFrameNavigator {
background: transparent;
margin: 0;
Expand All @@ -595,20 +593,12 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #PreviousKey:disabled {
image: url('');
}
#keyFrameNavigator #NextKey {
margin: 0 2;
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #NextKey:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo,
#keyFrameNavigator #KeyPartial,
Expand All @@ -617,20 +607,10 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #KeyNo:disabled,
#keyFrameNavigator #KeyPartial:disabled,
#keyFrameNavigator #KeyTotal:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo {
background-color: rgba(0, 0, 0, 0);
border: 1 solid rgba(0, 0, 0, 0);
image: url('');
}
#keyFrameNavigator #KeyNo:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo:hover {
background-color: #696c6f;
Expand All @@ -639,7 +619,6 @@ DvScrollWidget {
#keyFrameNavigator #KeyPartial {
background-color: #be7323;
border: 1 solid #be7323;
image: url('');
}
#keyFrameNavigator #KeyPartial:hover {
background-color: #db8d39;
Expand Down Expand Up @@ -1783,6 +1762,7 @@ ProjectPopup QLabel {
----------------------------------------------------------------------------- */
SchematicViewer {
qproperty-TextColor: #d6d8dd;
qproperty-PassThroughTextColor: #d6d8dd;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);
qproperty-LevelColumnColor: #4C6E4C;
qproperty-VectorColumnColor: #7B7B4C;
Expand Down Expand Up @@ -2305,7 +2285,6 @@ XsheetViewer {
qproperty-SelectedTextColor: #d6d8dd;
qproperty-FrameTextColor: #d6d8dd;
qproperty-CurrentFrameTextColor: #d6d8dd;
qproperty-CycleColor: #d6d8dd;
qproperty-BGColor: #3a3b3d;
qproperty-LightLineColor: rgba(0, 0, 0, 0.2);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
Expand All @@ -2324,6 +2303,8 @@ XsheetViewer {
qproperty-ColumnHeadPastelizer: rgba(0, 0, 0, 0);
qproperty-SelectedColumnHead: rgba(221, 231, 237, 0.3);
qproperty-PlayRangeColor: #414345;
qproperty-KeyframeLineColor: #d6d8dd;
qproperty-LevelEndColor: #d6d8dd;
qproperty-FoldedColumnBGColor: #5a5d5f;
qproperty-FoldedColumnLineColor: #353638;
qproperty-EmptyCellColor: #323435;
Expand Down Expand Up @@ -2479,7 +2460,7 @@ SpreadsheetViewer {
qproperty-FrameTextColor: #d6d8dd;
qproperty-GroupNameTextColor: #d6d8dd;
qproperty-ChannelNameTextColor: #d6d8dd;
qproperty-CycleColor: #d6d8dd;
qproperty-KeyframeLineColor: #d6d8dd;
qproperty-ColumnHeaderBorderColor: #212223;
}
#ExpressionField {
Expand Down
27 changes: 4 additions & 23 deletions stuff/config/qss/Dark/Dark.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,6 @@ DvScrollWidget {
image: url('../Default/imgs/white/scroll-down.svg');
}
/* -------------------------------------------------------------------------- */
/* For the buttons to display a BG color we need to set a blank image, setting
an empty URL solves this. */
#keyFrameNavigator {
background: transparent;
margin: 0;
Expand All @@ -595,20 +593,12 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #PreviousKey:disabled {
image: url('');
}
#keyFrameNavigator #NextKey {
margin: 0 2;
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #NextKey:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo,
#keyFrameNavigator #KeyPartial,
Expand All @@ -617,20 +607,10 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #KeyNo:disabled,
#keyFrameNavigator #KeyPartial:disabled,
#keyFrameNavigator #KeyTotal:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo {
background-color: rgba(0, 0, 0, 0);
border: 1 solid rgba(0, 0, 0, 0);
image: url('');
}
#keyFrameNavigator #KeyNo:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo:hover {
background-color: #595959;
Expand All @@ -639,7 +619,6 @@ DvScrollWidget {
#keyFrameNavigator #KeyPartial {
background-color: #be7323;
border: 1 solid #be7323;
image: url('');
}
#keyFrameNavigator #KeyPartial:hover {
background-color: #db8d39;
Expand Down Expand Up @@ -1783,6 +1762,7 @@ ProjectPopup QLabel {
----------------------------------------------------------------------------- */
SchematicViewer {
qproperty-TextColor: #e6e6e6;
qproperty-PassThroughTextColor: #e6e6e6;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.4);
qproperty-LevelColumnColor: #4C6E4C;
qproperty-VectorColumnColor: #7B7B4C;
Expand Down Expand Up @@ -2305,7 +2285,6 @@ XsheetViewer {
qproperty-SelectedTextColor: #e6e6e6;
qproperty-FrameTextColor: #e6e6e6;
qproperty-CurrentFrameTextColor: #e6e6e6;
qproperty-CycleColor: #e6e6e6;
qproperty-BGColor: #303030;
qproperty-LightLineColor: rgba(0, 0, 0, 0.3);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
Expand All @@ -2324,6 +2303,8 @@ XsheetViewer {
qproperty-ColumnHeadPastelizer: rgba(0, 0, 0, 0);
qproperty-SelectedColumnHead: rgba(221, 231, 237, 0.3);
qproperty-PlayRangeColor: #383838;
qproperty-KeyframeLineColor: #e6e6e6;
qproperty-LevelEndColor: #e6e6e6;
qproperty-FoldedColumnBGColor: #4a4a4a;
qproperty-FoldedColumnLineColor: #232323;
qproperty-EmptyCellColor: #282828;
Expand Down Expand Up @@ -2479,7 +2460,7 @@ SpreadsheetViewer {
qproperty-FrameTextColor: #e6e6e6;
qproperty-GroupNameTextColor: #e6e6e6;
qproperty-ChannelNameTextColor: #e6e6e6;
qproperty-CycleColor: #e6e6e6;
qproperty-KeyframeLineColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #4a4a4a;
}
#ExpressionField {
Expand Down
27 changes: 4 additions & 23 deletions stuff/config/qss/Default/Default.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,6 @@ DvScrollWidget {
image: url('imgs/white/scroll-down.svg');
}
/* -------------------------------------------------------------------------- */
/* For the buttons to display a BG color we need to set a blank image, setting
an empty URL solves this. */
#keyFrameNavigator {
background: transparent;
margin: 0;
Expand All @@ -595,20 +593,12 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #PreviousKey:disabled {
image: url('');
}
#keyFrameNavigator #NextKey {
margin: 0 2;
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #NextKey:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo,
#keyFrameNavigator #KeyPartial,
Expand All @@ -617,20 +607,10 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
}
#keyFrameNavigator #KeyNo:disabled,
#keyFrameNavigator #KeyPartial:disabled,
#keyFrameNavigator #KeyTotal:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo {
background-color: rgba(0, 0, 0, 0);
border: 1 solid rgba(0, 0, 0, 0);
image: url('');
}
#keyFrameNavigator #KeyNo:disabled {
image: url('');
}
#keyFrameNavigator #KeyNo:hover {
background-color: #717171;
Expand All @@ -639,7 +619,6 @@ DvScrollWidget {
#keyFrameNavigator #KeyPartial {
background-color: #be7323;
border: 1 solid #be7323;
image: url('');
}
#keyFrameNavigator #KeyPartial:hover {
background-color: #db8d39;
Expand Down Expand Up @@ -1783,6 +1762,7 @@ ProjectPopup QLabel {
----------------------------------------------------------------------------- */
SchematicViewer {
qproperty-TextColor: #e6e6e6;
qproperty-PassThroughTextColor: #e6e6e6;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.3);
qproperty-LevelColumnColor: #4C6E4C;
qproperty-VectorColumnColor: #7B7B4C;
Expand Down Expand Up @@ -2305,7 +2285,6 @@ XsheetViewer {
qproperty-SelectedTextColor: #e6e6e6;
qproperty-FrameTextColor: #e6e6e6;
qproperty-CurrentFrameTextColor: #e6e6e6;
qproperty-CycleColor: #e6e6e6;
qproperty-BGColor: #404040;
qproperty-LightLineColor: rgba(0, 0, 0, 0.2);
qproperty-MarkerLineColor: rgba(255, 255, 255, 0.15);
Expand All @@ -2324,6 +2303,8 @@ XsheetViewer {
qproperty-ColumnHeadPastelizer: rgba(0, 0, 0, 0);
qproperty-SelectedColumnHead: rgba(221, 231, 237, 0.3);
qproperty-PlayRangeColor: #484848;
qproperty-KeyframeLineColor: #e6e6e6;
qproperty-LevelEndColor: #e6e6e6;
qproperty-FoldedColumnBGColor: #626262;
qproperty-FoldedColumnLineColor: #3b3b3b;
qproperty-EmptyCellColor: #393939;
Expand Down Expand Up @@ -2479,7 +2460,7 @@ SpreadsheetViewer {
qproperty-FrameTextColor: #e6e6e6;
qproperty-GroupNameTextColor: #e6e6e6;
qproperty-ChannelNameTextColor: #e6e6e6;
qproperty-CycleColor: #e6e6e6;
qproperty-KeyframeLineColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #272727;
}
#ExpressionField {
Expand Down
2 changes: 2 additions & 0 deletions stuff/config/qss/Default/less/Default.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,8 @@
@xsheet-DarkBG-color: lighten(@bg, 60.0000);
@xsheet-DarkLine-color: lighten(@bg, 30.5882);
@xsheet-ColumnIconLine-color: @accent;
@xsheet-KeyframeLine-color: @xsheet-text-color;
@xsheet-LevelEnd-color: @xsheet-text-color;

@xsheet-CellArea-bg-color-focus: rgb(0, 0, 0);
@xsheet-CellFocus-color: #000;
Expand Down
19 changes: 0 additions & 19 deletions stuff/config/qss/Default/less/layouts/mainwindow.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,6 @@ DvScrollWidget {

/* -------------------------------------------------------------------------- */

/* For the buttons to display a BG color we need to set a blank image, setting
an empty URL solves this. */
#keyFrameNavigator {
background: transparent;
margin: 0;
Expand All @@ -441,20 +439,12 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
&:disabled {
image: url('');
}
}
#NextKey {
margin: 0 2;
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
&:disabled {
image: url('');
}
}
#KeyNo,
#KeyPartial,
Expand All @@ -463,18 +453,10 @@ DvScrollWidget {
padding-right: -1;
width: 20px;
height: 20px;
image: url('');
&:disabled {
image: url('');
}
}
#KeyNo {
background-color: @keyframe-off-color;
border: 1 solid @keyframe-off-border-color;
image: url('');
&:disabled {
image: url('');
}
&:hover {
background-color: @keyframe-off-color-hover;
border-color: @keyframe-off-border-color-hover;
Expand All @@ -483,7 +465,6 @@ DvScrollWidget {
#KeyPartial {
background-color: @keyframe-partial-color;
border: 1 solid @keyframe-partial-border-color;
image: url('');
&:hover {
background-color: @keyframe-partial-color-hover;
border-color: @keyframe-partial-border-color-hover;
Expand Down
1 change: 1 addition & 0 deletions stuff/config/qss/Default/less/layouts/schematic.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

SchematicViewer {
qproperty-TextColor: @schematic-text-color;
qproperty-PassThroughTextColor: @schematic-text-color;
qproperty-VerticalLineColor: @schematic-VerticalLine-color;

qproperty-LevelColumnColor: @xsheet-LevelColumn-color;
Expand Down
5 changes: 3 additions & 2 deletions stuff/config/qss/Default/less/layouts/xsheet.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ XsheetViewer {
qproperty-SelectedTextColor: @xsheet-selected-text-color;
qproperty-FrameTextColor: @xsheet-text-color;
qproperty-CurrentFrameTextColor: @xsheet-currentFrame-text-color;
qproperty-CycleColor: @xsheet-text-color;
qproperty-BGColor: @xsheet-bg-color;
qproperty-LightLineColor: @xsheet-LightLine-color;
qproperty-MarkerLineColor: @xsheet-MarkerLine-color;
Expand All @@ -106,6 +105,8 @@ XsheetViewer {
qproperty-ColumnHeadPastelizer: @xsheet-ColumnHeadPastelizer-color;
qproperty-SelectedColumnHead: @xsheet-SelectedColumnHead-color;
qproperty-PlayRangeColor: @xsheet-PlayRange-Color;
qproperty-KeyframeLineColor: @xsheet-KeyframeLine-color;
qproperty-LevelEndColor: @xsheet-LevelEnd-color;

qproperty-FoldedColumnBGColor: @xsheet-FoldedColumnBG-color;
qproperty-FoldedColumnLineColor: @xsheet-FoldedColumnLine-color;
Expand Down Expand Up @@ -312,7 +313,7 @@ SpreadsheetViewer {
qproperty-FrameTextColor: @xsheet-text-color;
qproperty-GroupNameTextColor: @xsheet-text-color;
qproperty-ChannelNameTextColor: @xsheet-text-color;
qproperty-CycleColor: @xsheet-text-color;
qproperty-KeyframeLineColor: @xsheet-KeyframeLine-color;
qproperty-ColumnHeaderBorderColor: @function-ColumnHeaderBorder-color; // paired
}

Expand Down
Loading

0 comments on commit be3a35f

Please sign in to comment.