Skip to content

Commit

Permalink
LateNight: move preview deck above search bar
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Jan 5, 2021
1 parent fc0d25d commit 07763db
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 63 deletions.
8 changes: 7 additions & 1 deletion res/skins/LateNight/decks/preview_deck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- This wrapper makes the PreviewDeck borders work correctly -->
<WidgetGroup>
<Layout>vertical</Layout>
<Layout>horizontal</Layout>
<SizePolicy>me,max</SizePolicy>
<Children>

Expand Down Expand Up @@ -165,6 +165,12 @@
</Children>
</WidgetGroup><!-- PreviewDeck -->

<WidgetGroup>
<ObjectName>PreviewDeckRightSpacer</ObjectName>
<Layout>horizontal</Layout>
<Children/>
</WidgetGroup>

</Children>
<Connection>
<ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
Expand Down
8 changes: 7 additions & 1 deletion res/skins/LateNight/library.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<MinimumSize>100,</MinimumSize>
<Children>

<Template src="skin:/decks/preview_deck.xml"/>

<!--Search Input Field + Library Expand toggle -->
<WidgetGroup>
<ObjectName></ObjectName>
Expand Down Expand Up @@ -69,7 +71,11 @@
</Children>
</WidgetGroup><!-- SearchLineBox -->

<Template src="skin:/decks/preview_deck.xml"/>
<WidgetGroup>
<ObjectName>SearchTreeSpacer</ObjectName>
<Layout>horizontal</Layout>
<Children/>
</WidgetGroup>

<Splitter>
<ObjectName>SidebarCoverSplitter</ObjectName>
Expand Down
3 changes: 3 additions & 0 deletions res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/skins/LateNight/palemoon/style/lib_bg.png
View file
Binary file not shown.
48 changes: 28 additions & 20 deletions res/skins/LateNight/style_classic.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ WLibrary,
#SidebarBox,
#PreviewDeck,
#LibExpandBox,
#LibrarySplitter::handle,
#SearchLineBox {
border-top: 1px solid #333;
border-left: 1px solid #333;
Expand Down Expand Up @@ -126,6 +127,30 @@ WSearchLineEdit,
background-color: #080808;
}

/* Some tweaks to create a frameless library table */
#LibrarySplitter {
border-width: 0px;
}
#LibrarySplitter::handle {
border-width: 1px 0px 0px 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
#PreviewDeckRightSpacer,
#SearchTreeSpacer {
border-right: 1px solid #333;
background-color: transparent;
}
#PreviewDeckRightSpacer {
min-width: 4px;
max-width: 4px;
}
#SearchTreeSpacer {
min-height: 3px;
max-height: 3px;
}

/* background of fillers */
#FxRackFillerL,
#FxRackFillerR,
Expand Down Expand Up @@ -225,10 +250,6 @@ WBeatSpinBox,

WLibrary {
border-top-left-radius: 0px;
}
WLibrary,
#SearchLineBox {
border-top: 0px;
}
#SearchLineBox {
padding-right: 2px;
Expand All @@ -239,9 +260,8 @@ WLibrary,

#LibExpandBox {
qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
border-width: 0px 0px 1px 0px;
border-width: 1px 0px 1px 0px;
border-radius: 0px;
margin-bottom: 3px;
padding: 0px 0px 2px 2px;
}

Expand Down Expand Up @@ -312,8 +332,6 @@ WLibrary,
#FxRackFillerL,
#MicAuxRack,
#SamplerRow,
#LibExpandBox,
#SearchLineBox,
#PreviewDeck {
margin-bottom: 4px;
}
Expand Down Expand Up @@ -354,10 +372,6 @@ WLibrary,
qproperty-layoutSpacing: 3;
}

#PreviewDeck {
margin-right: 3px;
}

#SkinSettingsContainer {
margin-left: 3px;
}
Expand Down Expand Up @@ -942,7 +956,7 @@ WPushButton#FxSuperLinkInvertButton {

#PreviewDeckTextBox {
}
#PreviewLabel { /* Placeholder */
#PreviewLabel { /* Placeholder when no track is loaded */
padding-left: 2px;
}
#PreviewTitle {
Expand Down Expand Up @@ -2278,13 +2292,7 @@ WSearchLineEdit {
/* LibrarySplitter
(the splitter itself is vertical)
Used to split Library sidebar & Tracks table */
#LibrarySplitter {
border-top: 1px solid #333333;
}
#LibrarySplitter::handle { /*
background-image: url(skin:/classic/style/library_splitter_handle_unchecked.svg);
background-position: center top;
background-repeat: no-repeat; */
#LibrarySplitter::handle {
image: url(skin:/classic/style/splitter_handle_vertical.png);
background-color: #1e1e1e;
}
Expand Down
102 changes: 61 additions & 41 deletions res/skins/LateNight/style_palemoon.qss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
#PreviewDeck,
#SidebarCoverSplitter,
#SidebarCoverSplitter:handle,
/*#LibrarySplitter,*/
#LibrarySplitter::handle,
/*WLibrary,*/
QAbstractScrollArea::corner {
border-top: 1px solid #212123;
border-right: 1px solid #111;
Expand All @@ -92,10 +90,8 @@ QAbstractScrollArea::corner {
}

#SidebarSearchPreviewContainer {
background-color: #0f0f0f;
margin-top: 1px;
}

/*WLibrary,*/
#SidebarBox {
padding: 2px 0px 0px 2px;
}
Expand All @@ -105,7 +101,6 @@ QAbstractScrollArea::corner {
border-bottom-left-radius: 0px;
border-top-left-radius: 0px;
}
/*WLibrary,*/
#SidebarCoverSplitter,
#SidebarCoverSplitter::handle,
#LibrarySplitter,
Expand All @@ -116,6 +111,7 @@ QAbstractScrollArea::corner {
#SidebarCoverSplitter::handle {
border-width: 0px;
}
/* Some tweaks to create a frameless library table */
#LibrarySplitter {
border-width: 0px;
}
Expand All @@ -125,12 +121,20 @@ QAbstractScrollArea::corner {
WLibrary {
border-width: 1px 0px 0px 0px;
}
/* Some tweaks to create a frameless library table */
#PreviewDeckRightSpacer,
#SearchTreeSpacer {
border-right: 1px solid #222;
background-color: transparent;
}
#PreviewDeckRightSpacer {
min-width: 3px;
max-width: 3px;
}
#SearchTreeSpacer {
min-height: 3px;
max-height: 3px;
}
#LibraryContainer {
background-color: #151517;
background-image: url(skin:/palemoon/style/lib_bg.png);
background-position: top;
background-repeat: repeat-x;
}
#LibraryContainer QScrollBar::handle:horizontal,
#LibraryContainer QScrollBar::handle:vertical,
Expand Down Expand Up @@ -173,6 +177,7 @@ WSearchLineEdit {
padding: 5px 0px 0px 8px;
border-top: 1px solid #212123;
}

#WaveformsFrame,
#OverviewBox,
#OverviewBoxMini,
Expand Down Expand Up @@ -242,7 +247,6 @@ WSearchLineEdit {
}

#SearchLineBox {
margin-top: 1px;
padding-right: 2px;
border-right: 0px;
border-top-right-radius: 0px;
Expand All @@ -254,9 +258,7 @@ WSearchLineEdit {
border-right: 0px;
border-left: 0px;
border-radius: 0px;
margin-bottom: 3px;
padding: 0px 2px 2px 2px;
margin-top: 1px;
}

#SidebarBox {
Expand Down Expand Up @@ -397,8 +399,6 @@ WSearchLineEdit {
#FxRackFillerL,
#MicAuxRack,
#SamplerRow,
#LibExpandBox,
#SearchLineBox,
#PreviewDeck {
margin-bottom: 3px;
}
Expand Down Expand Up @@ -445,7 +445,8 @@ WSearchLineEdit {
}

#PreviewDeck {
margin-right: 3px;
/* right margin is managed by #PreviewDeckRightSpacer which
also generates the left border of the splitter handle */
}

#SkinSettingsContainer {
Expand Down Expand Up @@ -1089,7 +1090,7 @@ WPushButton#FxSuperLinkInvertButton {

#PreviewDeckTextBox {
}
#PreviewLabel { /* Placeholder */
#PreviewLabel { /* Placeholder when no track is loaded */
padding-left: 2px;
}
#PreviewTitle {
Expand Down Expand Up @@ -1233,10 +1234,18 @@ WEffectSelector,
font-size: 14px;
}
/* dim² ivory */
#Deck1 #PlayPositionText, #DeckCompact1 #PlayPositionTextSmall, #DeckMini1 #PlayPositionTextSmall,
#Deck1 #KeyText, #DeckCompact1 #KeyText, #DeckMini1 #KeyTextSmall,
#Deck2 #PlayPositionText, #DeckCompact2 #PlayPositionTextSmall, #DeckMini2 #PlayPositionTextSmall,
#Deck2 #KeyText, #DeckCompact2 #KeyText, #DeckMini2 #KeyTextSmall,
#Deck1 #PlayPositionText,
#DeckCompact1 #PlayPositionTextSmall,
#DeckMini1 #PlayPositionTextSmall,
#Deck1 #KeyText,
#DeckCompact1 #KeyText,
#DeckMini1 #KeyTextSmall,
#Deck2 #PlayPositionText,
#DeckCompact2 #PlayPositionTextSmall,
#DeckMini2 #PlayPositionTextSmall,
#Deck2 #KeyText,
#DeckCompact2 #KeyText,
#DeckMini2 #KeyTextSmall,
#SamplerBpm, #SamplerBpmMini,
#LibraryContainer QHeaderView {
color: #766b65;
Expand All @@ -1248,16 +1257,30 @@ WEffectSelector,
}

/* pale blue */
#Deck3 #TitleText, #Deck3 #ArtistText,
#DeckCompact3 #TitleText, #DeckCompact3 #ArtistText,
#DeckMini3 #TitleTextSmall, #DeckMini3 #ArtistTextSmall,
#Deck3 #BpmText, #DeckCompact3 #BpmText, #DeckMini3 #BpmTextSmall,
#Deck3 #KeyText, #DeckCompact3 #KeyText, #DeckMini3 #KeyTextSmall,
#Deck4 #TitleText, #Deck4 #ArtistText,
#DeckCompact4 #TitleText, #DeckCompact4 #ArtistText,
#DeckMini4 #TitleTextSmall, #DeckMini4 #ArtistTextSmall,
#Deck4 #BpmText, #DeckCompact4 #BpmText, #DeckMini4 #BpmTextSmall,
#Deck4 #KeyText, #DeckCompact4 #KeyText, #DeckMini4 #KeyTextSmall {
#Deck3 #TitleText,
#Deck3 #ArtistText,
#DeckCompact3 #TitleText,
#DeckCompact3 #ArtistText,
#DeckMini3 #TitleTextSmall,
#DeckMini3 #ArtistTextSmall,
#Deck3 #BpmText,
#DeckCompact3 #BpmText,
#DeckMini3 #BpmTextSmall,
#Deck3 #KeyText,
#DeckCompact3 #KeyText,
#DeckMini3 #KeyTextSmall,
#Deck4 #TitleText,
#Deck4 #ArtistText,
#DeckCompact4 #TitleText,
#DeckCompact4 #ArtistText,
#DeckMini4 #TitleTextSmall,
#DeckMini4 #ArtistTextSmall,
#Deck4 #BpmText,
#DeckCompact4 #BpmText,
#DeckMini4 #BpmTextSmall,
#Deck4 #KeyText,
#DeckCompact4 #KeyText,
#DeckMini4 #KeyTextSmall {
color: #85bdbb;
}
#Deck3 WStarRating, #DeckCompact3 WStarRating,
Expand Down Expand Up @@ -1457,9 +1480,7 @@ WEffectSelector,

#LibraryContainer QHeaderView {
border-bottom-right-radius: 1px solid #000;
outline: none; /*
border-width: 1px 0px 1px 0px;
border-image: url(skin:/palemoon/buttons/btn_embedded_library_header.svg) 1 1 1 1; */
outline: none;
}
#LibraryContainer QHeaderView::section {
outline: none;
Expand Down Expand Up @@ -1768,8 +1789,8 @@ WPushButton#FxSuperLinkInvertButton[displayValue="0"] {
}

/* Yellow */
#RecFeedback[displayValue="1"], /* initialize recording */
#BroadcastButton[displayValue="1"] /* connecting */ {
#RecFeedback[displayValue="1"], /* initialize recording */
#BroadcastButton[displayValue="1"] /* connecting */ {
background-color: #d09300;
}

Expand All @@ -1778,15 +1799,14 @@ WPushButton#FxSuperLinkInvertButton[displayValue="0"] {
}

/* pink */
#BroadcastButton[displayValue="3"],
#RecFeedback[displayValue="3"] { /* failure */
#BroadcastButton[displayValue="3"], /* failure */
#RecFeedback[displayValue="3"] {
background-color: #f856e7;
}

/* Grey for GUI toggles */
#GuiToggleButton[displayValue="1"],
#SkinSettingsToggle[displayValue="1"] { /*
background-color: #216e75; Pale blue */
#SkinSettingsToggle[displayValue="1"] {
background-color: #555;
}

Expand Down

0 comments on commit 07763db

Please sign in to comment.