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

Lib redesign skin fixes #1671

Merged
merged 32 commits into from
Jun 23, 2018
Merged

Lib redesign skin fixes #1671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1c31d7d
lib-redesign Deere: move Lib expand toggle above sidebar buttons
May 18, 2018
f08c2ca
lib-redesign LateNight: fix Library styling
May 19, 2018
4b978c3
lib-redesign LateNight: add CO for Lib icon text to skin.xml
May 19, 2018
b0627dd
lib-redesign Tango: fix & comment Library styling
May 19, 2018
c4a7b5c
lib-redesign LateNight: fix inactive library buttons
May 19, 2018
a284bf0
lib-redesign LateNight: add Id to LibrarySidebarButtons
May 19, 2018
0f820c3
lib-redesign LateNight: small UX tweaks
May 19, 2018
22e4fc0
LateNight/Tango: tweak library sort buttons
May 19, 2018
4dd9849
lib-redesign Deere: hide feature label
May 20, 2018
983e208
lib-redesign Deere: fix library feature top margin
May 20, 2018
2b5ec51
lib-redesign Deere: style AutoDJ transition time like beatsize spinboxes
May 20, 2018
4824f42
lib-redesign Deere: emphasize tab buttons in library feature
May 20, 2018
8b3d5f7
lib-redesign LateNight: properly hide the feature label
May 20, 2018
265b248
lib-redesign LateNight: style feature tab header buttons
May 20, 2018
4fa873e
lib-redesign LateNight: style buttons, remove double border in AutoDJ…
May 20, 2018
5690baf
lib-redesign Deere: revert Feature label hack for recording feature
May 20, 2018
3c264c2
lib-redesign Tango: make Analysis radio buttons smaller
May 20, 2018
f13eca8
lib-redesign Tango: style AutoDJ spinbox like beatsize spinboxes
May 20, 2018
a2b0477
lib-redesign Tango: clean up
May 20, 2018
c659ddb
lib-redesign Shade: remove label above feature pane, remove old QPush…
May 21, 2018
2b06492
lib-redesign: clean up code, rename lib sidebar width detector and sp…
May 21, 2018
d46c33c
lib-redesign Tango: move Breadcrumbs above searchbox like in other sk…
May 22, 2018
c711bd8
lib-redesign LateNight/Tango: fix some indentations, add comments
May 23, 2018
161956a
lib-redesign LateNight: brighter text for selected tree/table items
May 24, 2018
db189a4
lib-redesign skins: resolve merge conflicts
Jun 13, 2018
4bbbe0f
lib-redesign Shade: fix Library spacing & scrollbars, fix indentation…
Jun 14, 2018
680a701
lib-redesign skins: allow to toggle Library button text in all skins
Jun 14, 2018
682f0c8
lib-redesign skins: small fixes
Jun 17, 2018
86fc0f3
lib-redesign Shade: style Library features like rest of skin, incl. c…
Jun 19, 2018
330d364
merge jmigual-library-redesign, fix conflicts again
Jun 20, 2018
41115f2
lib-redesign skins: fix regressions introduced by git auto-merge
Jun 20, 2018
2b0a466
lib-redesign-skins: fix Splitter regressions
Jun 20, 2018
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
53 changes: 48 additions & 5 deletions res/skins/LateNight/buttons/btn_lib_radio_button_off.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions res/skins/LateNight/buttons/btn_lib_radio_button_off_hover.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 60 additions & 6 deletions res/skins/LateNight/buttons/btn_lib_radio_button_on.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
92 changes: 62 additions & 30 deletions res/skins/LateNight/library.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Template>
<WidgetGroup>
<ObjectName>Library</ObjectName>
<SizePolicy>me,i</SizePolicy>
<MinimumSize>1270,-</MinimumSize>
<Layout>vertical</Layout>
<Children>

<WidgetGroup><Size>0me,5f</Size></WidgetGroup>
<!--
<WidgetGroup><Size>0me,5f</Size></WidgetGroup>
**********************************************
Library / Preview Deck / Search / Tree view
**********************************************
-->
<WidgetGroup>
<ObjectName>Library</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>

<Splitter>
<ObjectName>LibrarySplitter</ObjectName>
<ObjectName>VertSplitter</ObjectName>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please spell out "VerticalSplitter"

<SizePolicy>me,me</SizePolicy>
<SplitSizes>1,10</SplitSizes>
<SplitSizesConfigKey>[LateNight],LibrarySidebarSplitSize</SplitSizesConfigKey>
Expand All @@ -32,45 +32,77 @@

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

<!--Search Input Field-->
<SearchBox></SearchBox>

<Splitter>
<ObjectName>CoverArtSplitter</ObjectName>
<Size>me,me</Size>
<SplitSizes>1,1</SplitSizes>
<SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey>
<Orientation>vertical</Orientation>
<Collapsible>0,0</Collapsible>
<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<!--Library Tree View-->
<LibrarySidebar></LibrarySidebar>
<!--Cover Art-->
<CoverArt>
<SizePolicy>me,me</SizePolicy>
<MinimumSize>40,40</MinimumSize>
<Connection>
<ConfigKey persist="true">[Library],show_coverart</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</CoverArt>
<WidgetGroup>
<ObjectName>LibrarySidebarButtonsContainer</ObjectName>
<Layout>vertical</Layout>
<Children>
<LibrarySidebarButtons>
<SizePolicy>min,me</SizePolicy>
</LibrarySidebarButtons>
</Children>
</WidgetGroup>

<Splitter>
<ObjectName>HoriSplitter</ObjectName>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please spell out "HorizontalSplitter"

<Size>me,me</Size>
<SplitSizes>1,1</SplitSizes>
<SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey>
<Orientation>vertical</Orientation>
<Collapsible>0,0</Collapsible>
<Children>
<!--Library Tree View-->
<LibrarySidebarExpanded>
<ObjectName>LibrarySidebarExpanded</ObjectName>
<Id>1</Id>
</LibrarySidebarExpanded>
<!--Cover Art-->
<CoverArt>
<SizePolicy>me,me</SizePolicy>
<MinimumSize>40,40</MinimumSize>
<Connection>
<ConfigKey persist="true">[Library],show_coverart</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</CoverArt>
</Children>
</Splitter>
</Children>
</Splitter>
</WidgetGroup>

</Children>
</WidgetGroup>

<!-- Library Table-->
<Library>
<BgColor>#585858</BgColor>
<FgColor>#eece33</FgColor>
</Library>
<!-- Breadcrumbs + Searchbox + Library Table-->
<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<LibraryBreadCrumb>
<ObjectName>LibraryBreadCrumb</ObjectName>
<SizePolicy>me,min</SizePolicy>
<Id>1</Id>
</LibraryBreadCrumb>

<SearchBox>
<Id>1</Id>
</SearchBox>

<LibraryPane>
<BgColor>#585858</BgColor>
<FgColor>#eece33</FgColor>
<Id>1</Id>
</LibraryPane>
</Children>
</WidgetGroup>

</Children>
</Splitter>

</Children>
</WidgetGroup>

</Children>
</WidgetGroup>
</Template>
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

<!-- Decks, Effects ... Library -->
<Splitter>
<ObjectName>CoverArtSplitter</ObjectName>
<ObjectName>HoriSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SizePolicy>me,min</SizePolicy>
<SplitSizes>1,5</SplitSizes>
Expand Down
Loading