Skip to content

Feature/library view manager #8

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

Closed
daschuer wants to merge 25 commits into from
Closed

Feature/library view manager #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
83a3574
Begin of classes creation
jmigual May 12, 2016
de0e420
Code formating
jmigual May 12, 2016
25992f1
Add function to add a WLibraryStack
jmigual May 12, 2016
0106e5b
Add WLibaryViewManager to SkinParser and others
jmigual May 16, 2016
f09cf01
Added next and previous functions to librarystack
jmigual May 16, 2016
9a4c689
Simplify code from WLibaryViewManager
jmigual May 16, 2016
69628b7
Add WLibraryFeature class
jmigual May 18, 2016
82a0033
Add experiment skin
jmigual May 18, 2016
9254803
Change WLibraryStack to allow using of WWidgetStack
jmigual May 18, 2016
b5c2cd3
Reformat some code
jmigual May 18, 2016
d237e14
Fix compilation warning in LegacySkinParser
jmigual May 18, 2016
c4f3026
Add new parseLibraryStack function in LegacySkinParser
jmigual May 18, 2016
38cff54
Merged branch master into feature/libraryViewManager
jmigual May 18, 2016
a5cd7ec
Fix bug with empty widget stacks
jmigual May 18, 2016
dd86244
Add menu options for wlibrarystack
jmigual May 18, 2016
f254bc5
Add parsing options for WLibraryStack
jmigual May 18, 2016
e984590
Changes to experiment skin to allow more experimentation
jmigual May 18, 2016
7ca4d86
Add more style to Experiment skin and add widgetGroup
jmigual May 19, 2016
c8112a6
Add pushButton template
jmigual May 19, 2016
57e1158
Add twice the LibraryTable
jmigual May 19, 2016
483f793
Style improvements
jmigual May 19, 2016
2126f16
Begin of add Library implementation
jmigual May 19, 2016
adbd9c2
Add new options necessary to construct items
jmigual May 20, 2016
6ae7ce4
Add new add options for WLibraryStack
jmigual May 20, 2016
07eed8c
Merged branch master into feature/libraryViewManager
jmigual May 29, 2016
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
1 change: 1 addition & 0 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,7 @@ def sources(self, build):
"widget/wwidget.cpp",
"widget/wwidgetgroup.cpp",
"widget/wwidgetstack.cpp",
"widget/wlibrarystack.cpp",
"widget/wsizeawarestack.cpp",
"widget/wlabel.cpp",
"widget/wtracktext.cpp",
Expand Down
16 changes: 16 additions & 0 deletions res/skins/Experiment/button_1state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE template>
<Template>
<PushButton>
<NumberStates>1</NumberStates>
<MinimumSize>40,20</MinimumSize>
<MaximumSize>100,20</MaximumSize>
<SizePolicy>me,me</SizePolicy>
<State>
<Number>0</Number>
<Text><Variable name="text"/></Text>
</State>
<Connection>
<ConfigKey><Variable name="connection_control"/></ConfigKey>
</Connection>
</PushButton>
</Template>
63 changes: 63 additions & 0 deletions res/skins/Experiment/pressed.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.
160 changes: 160 additions & 0 deletions res/skins/Experiment/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
<!DOCTYPE skin>
<skin>
<manifest>
<title>Experiment</title>
<author>jmigual</author>
<version>0.0</version>
<description>An experiment</description>
<language>en</language>
<license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
</manifest>

<ObjectName>Mixxx</ObjectName>

<MinimumSize>1280,700</MinimumSize>
<SizePolicy>me,me</SizePolicy>
<Layout>vertical</Layout>

<Style src="skin:style.qss"/>

<Children>
<Splitter>
<Orientation>horizontal</Orientation>
<MinimumSize>40,20</MinimumSize>
<SizePolicy>me,me</SizePolicy>
<SplitSizes>2,8</SplitSizes>

<Children>
<WidgetGroup>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>

<Children>
<Template src="skin:button_1state.xml">
<SetVariable name="text">Previous</SetVariable>
<SetVariable name="connection_control">[Experiment],left_previous</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Next</SetVariable>
<SetVariable name="connection_control">[Experiment],left_next</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Config</SetVariable>
<SetVariable name="connection_control">[Experiment],left_config</SetVariable>
</Template>

</Children>
</WidgetGroup>
<LibraryStack>
<PrevControl>[Experiment],left_previous</PrevControl>
<NextControl>[Experiment],left_next</NextControl>
<ConfigControl>[Experiment],left_config</ConfigControl>
<Children>
<LibrarySidebar></LibrarySidebar>
<Label>
<Text>Prova 2</Text>
</Label>
<Label>
<Text>Prova 3</Text>
</Label>
</Children>
</LibraryStack>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>

<Children>
<WidgetGroup>
<Layout>horizontal</Layout>

<Children>
<Template src="skin:button_1state.xml">
<SetVariable name="text">Previous</SetVariable>
<SetVariable name="connection_control">[Experiment],right_previous</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Next</SetVariable>
<SetVariable name="connection_control">[Experiment],right_next</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Config</SetVariable>
<SetVariable name="connection_control">[Experiment],right_config</SetVariable>
</Template>
</Children>
</WidgetGroup>

<LibraryStack>
<PrevControl>[Experiment],right_previous</PrevControl>
<NextControl>[Experiment],right_next</NextControl>
<ConfigControl>[Experiment],right_config</ConfigControl>

<Children>
<Library>
</Library>
<Label>
<Text>Prova 4</Text>
</Label>
<Label>
<Text>Prova 5</Text>
</Label>
</Children>
</LibraryStack>
</Children>
</WidgetGroup>

<WidgetGroup>
<Layout>vertical</Layout>

<Children>
<WidgetGroup>
<Layout>horizontal</Layout>

<Children>
<Template src="skin:button_1state.xml">
<SetVariable name="text">Previous</SetVariable>
<SetVariable name="connection_control">[Experiment],right_previous2</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Next</SetVariable>
<SetVariable name="connection_control">[Experiment],right_next2</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="text">Config</SetVariable>
<SetVariable name="connection_control">[Experiment],right_config2</SetVariable>
</Template>
</Children>
</WidgetGroup>

<LibraryStack>
<PrevControl>[Experiment],right_previous2</PrevControl>
<NextControl>[Experiment],right_next2</NextControl>
<ConfigControl>[Experiment],right_config2</ConfigControl>

<Children>
<Library>
</Library>
<Label>
<Text>Prova 4</Text>
</Label>
<Label>
<Text>Prova 5</Text>
</Label>
</Children>
</LibraryStack>
</Children>
</WidgetGroup>
</Children>
</Splitter>
</Children>
</skin>
Loading