Skip to content

Commit

Permalink
Merge pull request #1752 from daschuer/lp1779468
Browse files Browse the repository at this point in the history
Tooltip issues from Lp1779468
  • Loading branch information
daschuer authored Aug 9, 2018
2 parents 23ca3cc + 37575b0 commit 2f2526b
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 16 deletions.
10 changes: 6 additions & 4 deletions res/skins/Deere/sampler_text_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<Layout>horizontal</Layout>
<Children>
<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_start</SetVariable>
<SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
<SetVariable name="ObjectName">SamplerPlayButton</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
Expand All @@ -36,12 +36,13 @@
<SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
</Template>

</Children>
<Connection>
<!-- This enables the style with the blue play botton -->
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
Expand All @@ -55,7 +56,7 @@
<Children>

<Template src="skin:left_right_display_2state_button.xml">
<SetVariable name="TooltipId">play_start</SetVariable>
<SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
<SetVariable name="ObjectName">SamplerPlayButtonRepeating</SetVariable>
<SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
<SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
Expand All @@ -67,12 +68,13 @@
<SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
<SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
<SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
</Template>

</Children>
<Connection>
<!-- This enables the style with the violet play botton -->
<ConfigKey><Variable name="group"/>,repeat</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SizePolicy>min,min</SizePolicy>
<Children>
<PushButton>
<TooltipId>play_start</TooltipId>
<TooltipId>cue_gotoandplay_cue_default</TooltipId>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
<State>
Expand Down
13 changes: 10 additions & 3 deletions res/skins/Shade/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
<Children>
<PushButton>
<TooltipId>play_start</TooltipId>
<TooltipId>cue_gotoandplay_cue_default</TooltipId>
<Style></Style>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
Expand Down Expand Up @@ -166,11 +166,18 @@
<SignalColor>#191F24</SignalColor>
<PlayPosColor>#00FF00</PlayPosColor>
<DefaultMark>
<Align>top</Align>
<Align>bottom|right</Align>
<Color>#FD0564</Color>
<TextColor>#FFFFFF</TextColor>
<TextColor>#000000</TextColor>
<Text> %1 </Text>
</DefaultMark>
<Mark>
<Control>cue_point</Control>
<Text>C</Text>
<Align>top|right</Align>
<Color>#FF001C</Color>
<TextColor>#000000</TextColor>
</Mark>
<Connection>
<ConfigKey>[Sampler<Variable name="samplernum"/>],playposition</ConfigKey>
<EmitOnDownPress>false</EmitOnDownPress>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Shade/samplersmall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Size>4f,28f</Size>
</WidgetGroup>
<PushButton>
<TooltipId>play_start</TooltipId>
<TooltipId>cue_gotoandplay_cue_default</TooltipId>
<Style></Style>
<NumberStates>2</NumberStates>
<RightClickIsPushButton>true</RightClickIsPushButton>
Expand Down
3 changes: 2 additions & 1 deletion res/skins/Tango/preview_deck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,12 @@ Variables:
<Children>
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
<SetVariable name="TooltipId">play_start</SetVariable>
<SetVariable name="Size">24f,34f</SetVariable>
<SetVariable name="state_0_icon">play_previewdeck.svg</SetVariable>
<SetVariable name="state_1_icon">pause_previewdeck.svg</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,start</SetVariable>
<SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
</Template>
<!-- Turns Orange when playing Cue/HotCue.
Expand Down
1 change: 1 addition & 0 deletions res/skins/Tango/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Variables:
<Children>
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">SamplerPlayCue</SetVariable>
<SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
<SetVariable name="Size">34f,34f</SetVariable>
<SetVariable name="state_0_icon">play_sampler.svg</SetVariable>
<SetVariable name="state_1_icon">pause_sampler.svg</SetVariable>
Expand Down
22 changes: 16 additions & 6 deletions src/skin/tooltips.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -417,16 +417,26 @@ void Tooltips::addStandardTooltips() {

QString whilePlaying = tr("(while playing)");
QString whileStopped = tr("(while stopped)");
QString cueWhilePlaying = tr("Stops track at cue point, OR go to cue point and play after release (CUP mode).");
QString cueWhileStopped = tr("Set cue point (Pioneer/Mixxx/Numark mode), set cue point and play after release (CUP mode) "
"OR preview from it (Denon mode).");
QString cueHint = tr("Hint: Change the default cue mode in Preferences -> Interface.");
add("cue_default_cue_gotoandstop")
<< tr("Cue")
<< QString("%1 %2: %3").arg(leftClick, whilePlaying, tr("Stops track at cue point, OR go to cue point and play after release (CUP mode)."))
<< QString("%1 %2: %3").arg(leftClick, whileStopped, tr("Set cue point (Pioneer/Mixxx/Numark mode), set cue point and play after release (CUP mode) "
"OR preview from it (Denon mode)."))
<< tr("Hint: Change the default cue mode in Preferences -> Interface.")
<< QString("%1 %2: %3").arg(leftClick, whilePlaying, cueWhilePlaying)
<< QString("%1 %2: %3").arg(leftClick, whileStopped, cueWhileStopped)
<< cueHint
<< quantizeSnap
<< QString("%1: %2").arg(rightClick, tr("Seeks the track to the cue point and stops."));

add("pfl")
add("cue_gotoandplay_cue_default")
<< tr("Play")
<< QString("%1: %2").arg(leftClick, tr("Plays track from the cue point."))
<< QString("%1 %2: %3").arg(rightClick, whilePlaying, cueWhilePlaying)
<< QString("%1 %2: %3").arg(rightClick, whileStopped, cueWhileStopped)
<< cueHint
<< quantizeSnap;

add("pfl")
<< tr("Headphone")
<< tr("Sends the selected channel's audio to the headphone output,")
<< tr("selected in Preferences -> Sound Hardware.");
Expand Down

0 comments on commit 2f2526b

Please sign in to comment.