Skip to content

Commit

Permalink
Deere: sane default splitter sizes for each configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@Be-ing
Be-ing committed Apr 13, 2017
1 parent 766a17f commit 7e41a0e
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 103 deletions.
131 changes: 37 additions & 94 deletions res/skins/Deere/main_decks.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
<Layout>vertical</Layout>
<Children>

<!-- 2 decks stacked no QuickEffect -->
<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterStackedWaveforms2NoQE</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],WaveformSplitter2DecksNoQE</SplitSizesConfigKey>
<SplitSizes>166,230</SplitSizes>
<Children>
<WidgetGroup>
<ObjectName>StackedWaveformsContainer</ObjectName>
Expand Down Expand Up @@ -63,31 +65,17 @@
</Connection>
</WidgetGroup>

<!-- 2 decks split no QuickEffect -->
<WidgetGroup>
<Layout>vertical</Layout>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1,155max</Size>
<MaximumSize>-1,330</MaximumSize>
<Children>

<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterSplitWaveforms2NoQE</SplitSizesConfigKey>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>-1,155max</Size>
<MaximumSize>-1,330</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

</Children>
</Splitter>

<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Deere],show_stacked_waveforms</ConfigKey>
Expand Down Expand Up @@ -117,11 +105,13 @@
<Layout>vertical</Layout>
<Children>

<!-- 2 decks stacked with QuickEffect -->
<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterStackedWaveforms2YesQE</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],WaveformSplitter2DecksWithQE</SplitSizesConfigKey>
<SplitSizes>158,230</SplitSizes>
<Children>
<WidgetGroup>
<ObjectName>StackedWaveformsContainer</ObjectName>
Expand Down Expand Up @@ -159,31 +149,15 @@
</Connection>
</WidgetGroup>

<!-- 2 decks split with QuickEffect -->
<WidgetGroup>
<Layout>vertical</Layout>
<Size>-1,160max</Size>
<MaximumSize>-1,260</MaximumSize>
<Children>

<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterSplitWaveforms2YesQE</SplitSizesConfigKey>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<Size>-1,160max</Size>
<MaximumSize>-1,260</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

</Children>
</Splitter>

<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Deere],show_stacked_waveforms</ConfigKey>
Expand Down Expand Up @@ -227,14 +201,14 @@
<Layout>vertical</Layout>
<Children>

<!-- 4 decks stacked no QuickEffect -->
<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterStackedWaveforms4NoQE</SplitSizesConfigKey>
<SplitSizes>2,8</SplitSizes>
<SplitSizesConfigKey>[Deere],WaveformSplitter4DecksNoQE</SplitSizesConfigKey>
<SplitSizes>220,362</SplitSizes>
<Children>
<!-- Is displayed if the stacked waveforms option is activated in the skin settings -->
<WidgetGroup>
<ObjectName>StackedWaveformsContainer</ObjectName>
<Layout>vertical</Layout>
Expand Down Expand Up @@ -277,30 +251,15 @@
</Connection>
</WidgetGroup>

<!-- 4 decks split no QuickEffect -->
<WidgetGroup>
<Layout>vertical</Layout>
<Size>-1me,-1me</Size>
<MaximumSize>-1,630</MaximumSize>
<Children>

<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterSplitWaveforms4NoQE</SplitSizesConfigKey>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<MaximumSize>-1,630</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

</Children>
</Splitter>

<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Deere],show_stacked_waveforms</ConfigKey>
Expand Down Expand Up @@ -329,14 +288,14 @@
<Layout>vertical</Layout>
<Children>

<!-- 4 decks stacked with QuickEffect -->
<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterStackedWaveforms4YesQE</SplitSizesConfigKey>
<SplitSizes>2,8</SplitSizes>
<SplitSizesConfigKey>[Deere],WaveformSplitter4DecksWithQE</SplitSizesConfigKey>
<SplitSizes>149,350</SplitSizes>
<Children>
<!-- Is displayed if the stacked waveforms option is activated in the skin settings -->
<WidgetGroup>
<ObjectName>StackedWaveformsContainer</ObjectName>
<Layout>vertical</Layout>
Expand Down Expand Up @@ -379,30 +338,14 @@
</Connection>
</WidgetGroup>

<!-- 4 decks split with QuickEffect -->
<WidgetGroup>
<Layout>vertical</Layout>
<MaximumSize>-1,630</MaximumSize>
<Children>

<Splitter>
<ObjectName>DeckSplitter</ObjectName>
<Orientation>vertical</Orientation>
<Size>-1me,-1me</Size>
<SplitSizesConfigKey>[Deere],DeckSplitterSplitWaveforms4YesQE</SplitSizesConfigKey>
<Children>

<WidgetGroup>
<Layout>horizontal</Layout>
<MaximumSize>-1,630</MaximumSize>
<Children>
<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
</WidgetGroup>

</Children>
</Splitter>

<SingletonContainer>
<ObjectName>DecksMixerSingleton</ObjectName>
</SingletonContainer>
</Children>
<Connection>
<ConfigKey>[Deere],show_stacked_waveforms</ConfigKey>
Expand Down
21 changes: 12 additions & 9 deletions res/skins/Deere/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
<attribute config_key="[Library],show_library">1</attribute>

<!--Skin settings-->
<attribute persist="true" config_key="[Deere],show_stacked_waveforms">1</attribute>
<attribute persist="true" config_key="[Deere],show_stacked_waveforms">0</attribute>
<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
<attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>

<attribute persist="true" config_key="[Master],show_4decks">0</attribute>
<attribute persist="true" config_key="[Master],show_4effectunits">0</attribute>
<attribute persist="true" config_key="[Master],show_coverart">1</attribute>
<attribute persist="true" config_key="[Master],show_spinnies">0</attribute>
<attribute persist="true" config_key="[Master],show_superknobs">1</attribute>
<attribute persist="true" config_key="[Master],show_coverart">0</attribute>
<attribute persist="true" config_key="[Master],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Deere],show_starrating">0</attribute>
<attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
<attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
Expand All @@ -38,6 +37,7 @@
<attribute persist="true" config_key="[Samplers],show_expanded">0</attribute>

<attribute persist="true" config_key="[EffectRack1],show">1</attribute>
<attribute persist="true" config_key="[Master],show_superknobs">1</attribute>
</attributes>
</manifest>

Expand Down Expand Up @@ -229,7 +229,6 @@
<Children>
<Template src="skin:tool_bar.xml"/>


<WidgetGroup>
<Layout>vertical</Layout>
<Size>-1me,-1me</Size>
Expand All @@ -243,7 +242,8 @@
<Splitter>
<ObjectName>LibraryVerticalSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SplitSizesConfigKey>[Deere],DecksLibrarySplit</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],LibrarySplitter2DecksSplit</SplitSizesConfigKey>
<SplitSizes>246,454</SplitSizes>
<Size>-1me,-1me</Size>
<Children>
<WidgetGroup>
Expand Down Expand Up @@ -287,7 +287,8 @@
<Splitter>
<ObjectName>LibraryVerticalSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SplitSizesConfigKey>[Deere],DecksLibrarySplit</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],LibrarySplitter2DecksStacked</SplitSizesConfigKey>
<SplitSizes>395,233 </SplitSizes>
<Size>-1me,-1me</Size>
<Children>
<WidgetGroup>
Expand Down Expand Up @@ -342,7 +343,8 @@
<Splitter>
<ObjectName>LibraryVerticalSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SplitSizesConfigKey>[Deere],DecksLibrarySplit4</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],LibrarySplitter4DecksSplit</SplitSizesConfigKey>
<SplitSizes>519,181</SplitSizes>
<Size>-1me,-1me</Size>
<Children>
<WidgetGroup>
Expand Down Expand Up @@ -386,7 +388,8 @@
<Splitter>
<ObjectName>LibraryVerticalSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SplitSizesConfigKey>[Deere],DecksLibrarySplit4</SplitSizesConfigKey>
<SplitSizesConfigKey>[Deere],LibrarySplitter4DecksStacked</SplitSizesConfigKey>
<SplitSizes>647,53</SplitSizes>
<Size>-1me,-1me</Size>
<Children>
<WidgetGroup>
Expand Down

0 comments on commit 7e41a0e

Please sign in to comment.