Skip to content

Commit

Permalink
skins: migrate Text -> TrackProperty, remove empty Text nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Dec 25, 2023
1 parent 5dd65ec commit e3e547b
Show file tree
Hide file tree
Showing 15 changed files with 10 additions and 29 deletions.
2 changes: 0 additions & 2 deletions res/skins/Deere/deck_overview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<Mark>
<Control>intro_start_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|right</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down Expand Up @@ -93,7 +92,6 @@
<Mark>
<Control>outro_end_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Deere/effect_focus_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ Variables:
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
</State>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Deere/hide_show_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_unfold_more_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_unfold_more_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_unfold_less_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_unfold_less_48px.svg</Unpressed>
</State>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Deere/knob_with_button.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
</State>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Deere/knob_with_button_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
</State>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Deere/knob_with_button_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
</State>
<State>
<Number>1</Number>
<Text></Text>
<Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
<Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
</State>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/preview_deck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<ObjectName>PreviewDeckTextRow</ObjectName>
<Layout>horizontal</Layout>
<Children>
<Text>
<TrackProperty>
<TooltipId>text</TooltipId>
<SizePolicy>me,min</SizePolicy>
<Group><Variable name="group"/></Group>
<Elide>right</Elide>
</Text>
</TrackProperty>

<Template src="skin:left_1state_button.xml">
<SetVariable name="TooltipId">eject</SetVariable>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/LateNight/decks/overview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<Mark>
<Control>intro_start_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|right</Align>
<Color><Variable name="IntroOutroColor"/></Color>
<TextColor>#FFFFFF</TextColor>
Expand Down Expand Up @@ -112,7 +111,6 @@
<Mark>
<Control>outro_end_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|left</Align>
<Color><Variable name="IntroOutroColor"/></Color>
<TextColor>#FFFFFF</TextColor>
Expand Down
1 change: 0 additions & 1 deletion res/skins/LateNight/skin_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ Description:
</State>
<State>
<Number>1</Number>
<Text></Text>
<Alignment>left</Alignment>
</State>
<Connection>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Shade/deck_overview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<Mark>
<Control>intro_start_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|right</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down Expand Up @@ -84,7 +83,6 @@
<Mark>
<Control>outro_end_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Shade/preview_deck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Size>0e,18f</Size>
<Layout>horizontal</Layout>
<Children>
<Text>
<TrackProperty>
<TooltipId>text</TooltipId>
<Style> QLabel {
font-size: 12px;
Expand All @@ -55,7 +55,7 @@
<Group>[PreviewDeck1]</Group>
<SizePolicy>me,min</SizePolicy>
<Elide>right</Elide>
</Text>
</TrackProperty>
</Children>
</WidgetGroup>
<WidgetGroup>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Shade/sampler.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<BackPath>style/style_bg_sampler_top.png</BackPath>
<Layout>horizontal</Layout>
<Children>
<Text>
<TrackProperty>
<TooltipId>text</TooltipId>
<Style>QLabel {
font-size: 12px;
Expand All @@ -35,7 +35,7 @@
<Group><Variable name="group"/></Group>
<SizePolicy>me,max</SizePolicy>
<Elide>right</Elide>
</Text>
</TrackProperty>
<!-- Alternative "TITLE ONLY" display
<TrackProperty>
<TooltipId>track_title</TooltipId>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Shade/samplersmall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<Pos>0,2</Pos>
<Layout>vertical</Layout>
<Children>
<Text>
<TrackProperty>
<Size>0e,40f</Size>
<TooltipId>text</TooltipId>
<Style>QLabel {
Expand All @@ -66,7 +66,7 @@
</Style>
<Group>[Sampler<Variable name="samplernum"/>]</Group>
<Elide>right</Elide>
</Text>
</TrackProperty>
<!-- Alternative "TITLE ONLY" display
<TrackProperty>
<TooltipId>track_title</TooltipId>
Expand Down
2 changes: 0 additions & 2 deletions res/skins/Tango/decks/overview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Variables:
<Mark>
<Control>intro_start_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|right</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down Expand Up @@ -114,7 +113,6 @@ Variables:
<Mark>
<Control>outro_end_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text></Text>
<Align>top|left</Align>
<Color>#0000FF</Color>
<TextColor>#FFFFFF</TextColor>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Tango/decks/preview_deck.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ Variables:
<Size>1me,18f</Size>
<ObjectName>PreviewTitle</ObjectName>
<Children>
<Text>
<TrackProperty>
<TooltipId>text</TooltipId>
<Size>1me,17f</Size>
<Group><Variable name="group"/></Group>
<Elide>right</Elide>
</Text>
</TrackProperty>
</Children>
</WidgetGroup>

Expand Down

0 comments on commit e3e547b

Please sign in to comment.