Skip to content

Commit

Permalink
Merge pull request #1759 from daschuer/lp1773588
Browse files Browse the repository at this point in the history 
Shade: remove superfluid margins and padding in sampler.xml
  • Loading branch information
@daschuer
daschuer authored Jul 31, 2018
2 parents 4fca1c9 + 97ceaca commit 23ca3cc
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions res/skins/Shade/looping.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ObjectName>EffectLeftBorder</ObjectName>
<Size>5f,40f</Size>
<BackPath>style/style_bg_deck_border.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>

<WidgetGroup>
Expand Down Expand Up @@ -112,7 +112,7 @@
<WidgetGroup>
<Pos>100,10</Pos>
<Size>50f,20f</Size>
<Style>QGroupBox { border: 10px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Layout>horizontal</Layout>
<Children>
<BeatSpinBox>
Expand Down Expand Up @@ -425,7 +425,7 @@
<WidgetGroup>
<Size>50f,20f</Size>
<Pos>21,10</Pos>
<Style>QGroupBox { border: 10px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Layout>horizontal</Layout>
<Children>
<BeatSpinBox>
Expand Down Expand Up @@ -464,13 +464,13 @@
<ObjectName>EffectRightBorder</ObjectName>
<Size>5f,40f</Size>
<BackPath>style/style_bg_deck_border.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>

<WidgetGroup>
<ObjectName>EffectRightBorder</ObjectName>
<Size>3f,40f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>

</Children>
Expand Down
30 changes: 15 additions & 15 deletions res/skins/Shade/sampler.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
<ObjectName>Sampler</ObjectName>
<Size>i,103f</Size>
<Layout>horizontal</Layout>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 10px; } </Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0px; } </Style>
<Children>
<WidgetGroup>
<ObjectName>SamplerLeftBorder</ObjectName>
<Size>5f,100f</Size>
<BackPath>style/style_bg_deck_border.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>
<WidgetGroup>
<Size>0e,103f</Size>
<Layout>vertical</Layout>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
<Layout>vertical</Layout>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
<Children>
<WidgetGroup>
<ObjectName>SamplerTop</ObjectName>
Expand Down Expand Up @@ -104,15 +104,15 @@
<WidgetGroup>
<ObjectName>SamplerMid</ObjectName>
<Size>0e,36f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Layout>horizontal</Layout>
<Children>

<WidgetGroup>
<ObjectName>SamplerMid</ObjectName>
<Size>27f,36f</Size>
<BackPath>style/style_bg_sampler_mid.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<PushButton>
<TooltipId>play_start</TooltipId>
Expand Down Expand Up @@ -149,7 +149,7 @@
<ObjectName>SamplerMid</ObjectName>
<Size>0e,36f</Size>
<BackPath>style/style_bg_sampler_mid.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Layout>horizontal</Layout>
<Children>
<Overview>
Expand Down Expand Up @@ -183,7 +183,7 @@
<ObjectName>SamplerButtonGrid</ObjectName>
<Size>42f,36f</Size>
<BackPath>style/style_bg_sampler_woverview_buttons.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<PushButton>
<TooltipId>repeat</TooltipId>
Expand Down Expand Up @@ -274,18 +274,18 @@
<ObjectName>SamplerBottom</ObjectName>
<Size>0e,40f</Size>
<BackPath>style/style_bg_sampler_bottom.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<ObjectName>SamplerBottom</ObjectName>
<Size>0e,40f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>
<WidgetGroup>
<ObjectName>SamplerBottom</ObjectName>
<Size>204f,40f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<PushButton>
<TooltipId>beatsync_beatsync_tempo</TooltipId>
Expand Down Expand Up @@ -484,7 +484,7 @@
<ObjectName>SamplerVUMeter</ObjectName>
<Size>8f,100f</Size>
<BackPath>style/style_bg_sampler_vu.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<StatusLight>
<TooltipId>sampler_PeakIndicator</TooltipId>
Expand Down Expand Up @@ -517,7 +517,7 @@
<ObjectName>SamplerPitch</ObjectName>
<Size>21f,100f</Size>
<BackPath>style/style_bg_sampler_right.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<SliderComposed>
<TooltipId>rate</TooltipId>
Expand All @@ -537,12 +537,12 @@
<ObjectName>SamplerRightBorder</ObjectName>
<Size>5f,100f</Size>
<BackPath>style/style_bg_deck_border.png</BackPath>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>
<WidgetGroup>
<ObjectName>SamplerRightBorder</ObjectName>
<Size>3f,100f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>
</Children>
</WidgetGroup>
Expand Down
24 changes: 12 additions & 12 deletions res/skins/Shade/skin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
https://qt-project.org/doc/qt-4.8/stylesheet.html
Debugging:
To outline WidgetGroups change all occurrences (exept this one ;-) of
To outline WidgetGroups change all occurrences (except this one ;-) of
"QGroupBox { border: 0px solid" to "QGroupBox { border: 1px solid"
Parent WidgedGroups are outlined one pixel solid red;
Expand Down Expand Up @@ -253,7 +253,7 @@
<Children>
<WidgetGroup>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
<Layout>vertical</Layout>
<Layout>vertical</Layout>
<Children>
<Template src="skin:deck.xml">
<SetVariable name="channum">1</SetVariable>
Expand Down Expand Up @@ -389,13 +389,13 @@
<WidgetGroup>
<SizePolicy>me,min</SizePolicy>
<Layout>horizontal</Layout>
<Style>QGroupBox { border: 0px solid yellow; margin: 1px 0px 6px 0px;} </Style>
<Style>QGroupBox { border: 0px solid yellow; margin: 0px;}</Style>
<Children>
<WidgetGroup>
<ObjectName>EffectLeftBorder</ObjectName>
<Size>3f,44f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
</WidgetGroup>
<WidgetGroup>
<ObjectName>EffectLeftBorder</ObjectName>
<Size>3f,43f</Size>
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
</WidgetGroup>
<Template src="skin:looping.xml">
<SetVariable name="channum">1</SetVariable>
</Template>
Expand All @@ -416,9 +416,9 @@
<Not/>
</Transform>
</Connection>
</WidgetGroup>
<Template src="skin:effectrow.xml"/>
<Template src="skin:srcrow.xml"/>
</WidgetGroup>
<Template src="skin:effectrow.xml"/>
<Template src="skin:srcrow.xml"/>
<Template src="skin:samplerrow.xml">
<SetVariable name="rownum">1</SetVariable>
<SetVariable name="samplernum1">1</SetVariable>
Expand All @@ -433,7 +433,7 @@
<SetVariable name="samplernum2">4</SetVariable>
<SetVariable name="samplernum3">7</SetVariable>
<SetVariable name="samplernum4">8</SetVariable>
</Template>
</Template>
<!--
**********************************************
Library / Preview Deck / Search / Tree view
Expand Down

0 comments on commit 23ca3cc

Please sign in to comment.