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

Skins: small fixes for 2.3 #3325

Merged
merged 4 commits into from
Nov 15, 2020
Merged

Skins: small fixes for 2.3 #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af3f29e
LateNight: disable 'highlight' connection from beat spinbox
ronso0 Nov 14, 2020
20793dc
LateNight clean up
ronso0 Nov 14, 2020
9eb1786
Tango: fix skin description and 64-samplers skin preview
ronso0 Nov 14, 2020
401f1c9
LateNight PaleMoon: brighten Key border
ronso0 Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions res/skins/LateNight/decks/row_5_transportLoopJump.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,11 @@
<MinimumSize>46,26</MinimumSize>
<MaximumSize>72,26</MaximumSize>
<Value><Variable name="Group"/>,beatloop_size</Value>
<!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
<Connection>
<ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</Connection> -->
</BeatSpinBox>
</Children>
</WidgetGroup>
Expand Down Expand Up @@ -313,10 +314,11 @@
<MinimumSize>46,26</MinimumSize>
<MaximumSize>72,26</MaximumSize>
<Value><Variable name="Group"/>,beatjump_size</Value>
<!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
<Connection>
<ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</Connection> -->
</BeatSpinBox>
</Children>
</WidgetGroup>
Expand Down
6 changes: 4 additions & 2 deletions res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@
<MinimumSize>46,26</MinimumSize>
<MaximumSize>72,26</MaximumSize>
<Value><Variable name="Group"/>,beatloop_size</Value>
<!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
<Connection>
<ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</Connection> -->
</BeatSpinBox>

<WidgetGroup>
Expand All @@ -124,10 +125,11 @@
<Align>center</Align>
<Alignment>center</Alignment>
<Value><Variable name="Group"/>,beatjump_size</Value>
<!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
<Connection>
<ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
<BindProperty>highlight</BindProperty>
</Connection>
</Connection> -->
</BeatSpinBox>
</Children>
<Connection>
Expand Down
7 changes: 4 additions & 3 deletions res/skins/LateNight/mixer/vumeters_compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</Children>
</WidgetGroup><!-- 1 / Master / 2 -->

<WidgetGroup><!-- 3 / (Master) / 4 -->
<WidgetGroup><!-- 3 / (Main) / 4 -->
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<Children>
Expand All @@ -69,9 +69,10 @@
<Children>
<WidgetGroup>
<Layout>stacked</Layout>
<Size>15f,96f</Size>
<Size>14f,96f</Size>
<Children>
<WidgetGroup>
<!-- <TooltipId>master_VuMeter</TooltipId> -->
<ObjectName>VuMasterCover</ObjectName>
</WidgetGroup>
<!-- Unfortnately we can load a Singleton only once,
Expand All @@ -97,7 +98,7 @@
<ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- 3 / dimmed Master / 4 -->
</WidgetGroup><!-- 3 / (Main) / 4 -->

</Children>
<Connection>
Expand Down
13 changes: 2 additions & 11 deletions res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,8 @@ WPushButton#SamplerExpand[displayValue="0"],
#RecDot[highlight="0"] {
image: url(skin:/classic/buttons/btn__rec_dot.svg) no-repeat center center;
}
#RecDot[highlight="1"], #RecDot[highlight="2"] {
#RecDot[highlight="1"],
#RecDot[highlight="2"] {
image: url(skin:/classic/buttons/btn__rec_dot_active.svg) no-repeat center center;
}

Expand Down Expand Up @@ -1945,16 +1946,6 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
/************** Library *******************************************************/

#LibraryContainer {
/* ToDo (ronso0)
Check, may be obsolete since tollbar is at the top now.

make a smooth transition from toolbar at the bottom to
darker skin background at the top.
Splitter handles should be translucent for this to work.

background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #080808,
stop:1 #1e1e1e); */
}

WLibrary,
Expand Down
26 changes: 9 additions & 17 deletions res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ QAbstractScrollArea::corner {
#WaveformsFrame,
#OverviewBox,
#OverviewBoxMini,
#KeyText,
WSearchLineEdit,
WCueMenuPopup #CueLabelEdit {
border-top: 1px solid #0d0d0d;
Expand Down Expand Up @@ -182,12 +183,10 @@ WSearchLineEdit {
#OverviewBoxMini[highlight="1"] {
background-color: #151515;
}
WBeatSpinBox[highlight="0"] {
background-color: #171719;
}
WBeatSpinBox[highlight="1"] {
background-color: #121213;
}
#KeyText {
border-width: 1px 0px 1px 0px;
}

#KeyText,
#DeckSettingsContainer,
#DeckSettingsContainerCompact,
Expand All @@ -196,8 +195,7 @@ WSearchLineEdit {
/* Prevent cut-off or shifted stars on macOS */
WStarRating {
background-color: #19191a;
}
#KeyText,
}
#DeckSettingsContainer,
#DeckSettingsContainerCompact,
#SamplerSettingsContainer {
Expand Down Expand Up @@ -1252,7 +1250,8 @@ WEffectSelector,
color: #766b65;
}

WBeatSpinBox, #spinBoxTransition {
WBeatSpinBox,
#spinBoxTransition {
color: #a7998b;
}

Expand Down Expand Up @@ -1566,7 +1565,7 @@ WPushButton#QuickEffectButton[displayValue="0"],
WPushButton#PlaySampler[displayValue="0"],
#MicAuxUnit WPushButton[displayValue="0"],
#MicDuckingContainer WPushButton[displayValue="0"],
/* Beatsize up/down buttons */
WBeatSpinBox,
WBeatSpinBox::up-button,
WBeatSpinBox::down-button {
background-color: #121213;
Expand Down Expand Up @@ -2435,12 +2434,6 @@ WColorPicker QPushButton[checked="true"] {
}

#LibraryContainer {
/* make a smooth transition from toolbar at the bottom to
darker skin background at the top.
Splitter handles should be translucent for this to work.
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #080808,
stop:1 #1e1e1e); */
}

#LibraryContainer QTableView,
Expand Down Expand Up @@ -2654,7 +2647,6 @@ WSearchLineEdit {
background-color: #161617;
color: #161617;
}
/* Clear button: see /skins/default.qss */

/************ splitters ***********************/
/* HorizontalSplitter (the splitter itself is horizontal)
Expand Down
0 ...go (64 Samplers)/skin_preview_Classic.png → ...kins/Tango (64 Samplers)/skin_preview.png
View file
Open in desktop
File renamed without changes
Binary file removed res/skins/Tango (64 Samplers)/skin_preview_ClubTwist.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion res/skins/Tango/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<title>Tango</title>
<author>[email protected]</author>
<version>2.3.0.01</version>
<description>A flexible nighttime skin with stacked waveforms, 4 decks and 8 samplers that can be minimized to the bare essentials.</description>
<description>A flexible nighttime skin with stacked waveforms, 4 decks and 16 samplers that can be minimized to the bare essentials.</description>
<language>en</language>
<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>

Expand Down