Skip to content

Commit ec004d6

Browse files
authored
Merge pull request #913 from oxygen-dioxide/hover-label
Add hover tooltips for mute/solo toggle button and track settings button
2 parents 82d4f9d + d741e4a commit ec004d6

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

OpenUtau/Controls/TrackHeader.axaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</Button.ContextMenu>
102102
</Button>
103103
<ToggleButton Classes="normal" Grid.Row="1" Grid.Column="3" Margin="1" Padding="0" Height="18"
104-
HorizontalAlignment="Stretch"
104+
HorizontalAlignment="Stretch" ToolTip.Tip="{DynamicResource tracks.mute}"
105105
IsChecked="{Binding Mute, Mode=OneWay}" Command="{Binding ToggleMute}">
106106
<TextBlock Text="M" TextAlignment="Center"/>
107107
<ToggleButton.ContextMenu>
@@ -114,7 +114,7 @@
114114
</ToggleButton.ContextMenu>
115115
</ToggleButton>
116116
<ToggleButton Classes="normal" Grid.Row="2" Grid.Column="3" Margin="1" Padding="0" Height="18"
117-
HorizontalAlignment="Stretch"
117+
HorizontalAlignment="Stretch" ToolTip.Tip="{DynamicResource tracks.solo}"
118118
IsChecked="{Binding Solo, Mode=OneWay}" Command="{Binding ToggleSolo}">
119119
<TextBlock Text="S" TextAlignment="Center"/>
120120
<ToggleButton.ContextMenu>
@@ -126,7 +126,8 @@
126126
</ToggleButton.ContextMenu>
127127
</ToggleButton>
128128
<Button Grid.Row="3" Grid.Column="3" Margin="1" Padding="0" Height="18" Background="Transparent"
129-
HorizontalAlignment="Stretch" Click="TrackSettingsButtonClicked">
129+
HorizontalAlignment="Stretch" Click="TrackSettingsButtonClicked"
130+
ToolTip.Tip="{DynamicResource tracks.tracksettings}">
130131
<Path Classes="clear" Width="24" Height="24"
131132
Data="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"
132133
Fill="{StaticResource NeutralAccentBrush}">

OpenUtau/Strings/Strings.axaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,12 @@ General
442442
<system:String x:Key="tracks.rename">Rename track</system:String>
443443
<system:String x:Key="tracks.selectrenderer">Select Renderer</system:String>
444444
<system:String x:Key="tracks.selectsinger">Select Singer</system:String>
445+
<system:String x:Key="tracks.solo">Solo</system:String>
445446
<system:String x:Key="tracks.solo.add">Solo additionally (which not removes solo from other tracks)</system:String>
446447
<system:String x:Key="tracks.solo.only">Solo this only (which removes solo from other tracks)</system:String>
447448
<system:String x:Key="tracks.solo.unsoloall">Unsolo all</system:String>
448449
<system:String x:Key="tracks.trackcolor">Change track color</system:String>
450+
<system:String x:Key="tracks.tracksettings">Track Settings</system:String>
449451

450452
<FontFamily x:Key="ui.fontfamily">Segoe UI,San Francisco,Helvetica Neue</FontFamily>
451453
<FontFamily x:Key="ui.textbox.fontfamily">Microsoft YaHei,Simsun,苹方-简,宋体-简</FontFamily>

0 commit comments

Comments
 (0)