Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Turn scale degree on when the user changes the key, add hover tooltip to music key menu and snap div menu #1204

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Turn scale degree on when the user changes the key, add hover tooltip to music key menu and snap div menu #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion OpenUtau/Strings/Strings.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ Warning: this option removes custom presets.</system:String>

<system:String x:Key="phoneticassistant.caption">Phonetic Assistant</system:String>
<system:String x:Key="phoneticassistant.copy">Copy</system:String>


<system:String x:Key="pianoroll.key">Key (for scale degree display)</system:String>
<system:String x:Key="pianoroll.menu.batch">Batch Edits</system:String>
<system:String x:Key="pianoroll.menu.lyrics">Lyrics</system:String>
<system:String x:Key="pianoroll.menu.lyrics.dashtoplus">Replace "-" with "+"</system:String>
Expand Down Expand Up @@ -312,6 +313,7 @@ Warning: this option removes custom presets.</system:String>
<system:String x:Key="pianoroll.menu.searchnote.close">Close</system:String>
<system:String x:Key="pianoroll.menu.searchnote.next">Next</system:String>
<system:String x:Key="pianoroll.menu.searchnote.prev">Prev</system:String>
<system:String x:Key="pianoroll.snapdiv">Snap Division</system:String>
<system:String x:Key="pianoroll.toggle.finalpitch">View Final Pitch to Render (R)</system:String>
<system:String x:Key="pianoroll.toggle.noteparams">View Note Parameters (\)</system:String>
<system:String x:Key="pianoroll.toggle.phoneme">View Phonemes (O)</system:String>
Expand Down
5 changes: 5 additions & 0 deletions OpenUtau/ViewModels/NotesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public NotesViewModel() {

Keys = new List<MenuItemViewModel>();
SetKeyCommand = ReactiveCommand.Create<int>(key => {
//Turn on scale degree display if it is off
if(Preferences.Default.DegreeStyle == 0){
Preferences.Default.DegreeStyle = 1;
Preferences.Save();
}
DocManager.Inst.StartUndoGroup();
DocManager.Inst.ExecuteCmd(new KeyCommand(Project, key));
DocManager.Inst.EndUndoGroup();
Expand Down
6 changes: 4 additions & 2 deletions OpenUtau/Views/PianoRollWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@
<Path Classes="stroked" Data="M 4.5 13.5 L 7.5 13.5 L 7.5 9.5 A 1,1 0 1 1 10.5,9.5 L 10.5 13.5 L 13.5 13.5 L 13.5 8.5 A 1,1 0 1 0 4.5,8.5 Z"/>
</Border>
</ToggleButton>
<Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton">
<Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnSnapDivMenuButton"
ToolTip.Tip="{DynamicResource pianoroll.snapdiv}">
<TextBlock Grid.Column="0" Text="{Binding NotesViewModel.SnapDivText}"
TextAlignment="Right" FontSize="10" FontFamily="monospace"
Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
Expand All @@ -528,7 +529,8 @@
</ContextMenu>
</Button.ContextMenu>
</Button>
<Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton">
<Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton"
ToolTip.Tip="{DynamicResource pianoroll.key}">
<TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
TextAlignment="Right" FontSize="10" FontFamily="monospace"
Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
Expand Down
Loading