Skip to content

Commit 2f93ec4

Browse files
stakiralottev1991
authored andcommitted
Simplifies tempo importing (stakira#1568)
Imports tempo for new projects, otherwise asks the user.
1 parent 04ef670 commit 2f93ec4

File tree

5 files changed

+15
-43
lines changed

5 files changed

+15
-43
lines changed

OpenUtau.Core/Util/Preferences.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public class SerializablePreferences {
188188
public bool RememberMid = false;
189189
public bool RememberUst = true;
190190
public bool RememberVsqx = true;
191-
public int ImportTempo = 0;
192191
public string PhoneticAssistant = string.Empty;
193192
public string RecentOpenSingerDirectory = string.Empty;
194193
public string RecentOpenProjectDirectory = string.Empty;

OpenUtau/Strings/Strings.axaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,6 @@ Warning: this option removes custom presets.</system:String>
371371

372372
<system:String x:Key="prefs.advanced">Advanced</system:String>
373373
<system:String x:Key="prefs.advanced.beta">Beta</system:String>
374-
<system:String x:Key="prefs.advanced.importtempo">When importing tracks, use the tempos of the imported project</system:String>
375-
<system:String x:Key="prefs.advanced.importtempo.always">Always</system:String>
376-
<system:String x:Key="prefs.advanced.importtempo.ask">Ask me each time</system:String>
377-
<system:String x:Key="prefs.advanced.importtempo.never">Never</system:String>
378374
<system:String x:Key="prefs.advanced.lyricshelper">Lyrics Helper</system:String>
379375
<system:String x:Key="prefs.advanced.lyricshelper.brackets">Lyrics Helper Adds Brackets</system:String>
380376
<system:String x:Key="prefs.advanced.rememberfiletypes">Remember these file types in "Open Recent"</system:String>

OpenUtau/ViewModels/PreferencesViewModel.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public override string ToString() {
100100
[Reactive] public bool RememberMid{ get; set; }
101101
[Reactive] public bool RememberUst{ get; set; }
102102
[Reactive] public bool RememberVsqx{ get; set; }
103-
[Reactive] public int ImportTempo{ get; set; }
104103

105104
private List<AudioOutputDevice>? audioOutputDevices;
106105
private AudioOutputDevice? audioOutputDevice;
@@ -167,7 +166,6 @@ public PreferencesViewModel() {
167166
RememberMid = Preferences.Default.RememberMid;
168167
RememberUst = Preferences.Default.RememberUst;
169168
RememberVsqx = Preferences.Default.RememberVsqx;
170-
ImportTempo = Preferences.Default.ImportTempo;
171169
ClearCacheOnQuit = Preferences.Default.ClearCacheOnQuit;
172170

173171
this.WhenAnyValue(vm => vm.AudioOutputDevice)
@@ -326,11 +324,6 @@ public PreferencesViewModel() {
326324
Preferences.Default.RememberVsqx = index;
327325
Preferences.Save();
328326
});
329-
this.WhenAnyValue(vm => vm.ImportTempo)
330-
.Subscribe(index => {
331-
Preferences.Default.ImportTempo = index;
332-
Preferences.Save();
333-
});
334327
this.WhenAnyValue(vm => vm.ClearCacheOnQuit)
335328
.Subscribe(index => {
336329
Preferences.Default.ClearCacheOnQuit = index;

OpenUtau/Views/MainWindow.axaml.cs

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -320,30 +320,20 @@ async void OnMenuImportTracks(object sender, RoutedEventArgs args) {
320320
if (loadedProjects == null || loadedProjects.Length == 0) {
321321
return;
322322
}
323-
bool importTempo = true;
324-
switch (Preferences.Default.ImportTempo) {
325-
case 1:
326-
importTempo = false;
327-
break;
328-
case 2:
329-
if (loadedProjects[0].tempos.Count == 0) {
330-
importTempo = false;
331-
break;
332-
}
333-
var tempoString = String.Join("\n",
334-
loadedProjects[0].tempos
335-
.Select(tempo => $"position: {tempo.position}, tempo: {tempo.bpm}")
336-
);
337-
//ask the user
338-
var result = await MessageBox.Show(
339-
this,
340-
ThemeManager.GetString("dialogs.importtracks.importtempo") + "\n" + tempoString,
341-
ThemeManager.GetString("dialogs.importtracks.caption"),
342-
MessageBox.MessageBoxButtons.YesNo);
343-
if (result == MessageBox.MessageBoxResult.No) {
344-
importTempo = false;
345-
}
346-
break;
323+
// Imports tempo for new projects, otherwise asks the user.
324+
bool importTempo = DocManager.Inst.Project.parts.Count == 0;
325+
if (!importTempo && loadedProjects[0].tempos.Count > 0) {
326+
var tempoString = string.Join("\n",
327+
loadedProjects[0].tempos
328+
.Select(tempo => $"position: {tempo.position}, tempo: {tempo.bpm}")
329+
);
330+
// Ask the user
331+
var result = await MessageBox.Show(
332+
this,
333+
ThemeManager.GetString("dialogs.importtracks.importtempo") + "\n" + tempoString,
334+
ThemeManager.GetString("dialogs.importtracks.caption"),
335+
MessageBox.MessageBoxButtons.YesNo);
336+
importTempo = result == MessageBox.MessageBoxResult.Yes;
347337
}
348338
viewModel.ImportTracks(loadedProjects, importTempo);
349339
} catch (Exception e) {
@@ -626,7 +616,7 @@ async void OnMenuInstallWavtoolResampler(object sender, RoutedEventArgs args) {
626616
if (file == null) {
627617
return;
628618
}
629-
619+
630620
if (file.EndsWith(".exe")) {
631621
var setup = new ExeSetupDialog() {
632622
DataContext = new ExeSetupViewModel(file)

OpenUtau/Views/PreferencesDialog.axaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,6 @@
290290
<CheckBox IsChecked="{Binding RememberVsqx}" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center"/>
291291
<TextBlock Text=" .vsqx" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center"/>
292292
</Grid>
293-
<TextBlock Text="{DynamicResource prefs.advanced.importtempo}" Margin="0,10,0,0"/>
294-
<ComboBox SelectedIndex="{Binding ImportTempo}">
295-
<ComboBoxItem Content="{DynamicResource prefs.advanced.importtempo.always}"/>
296-
<ComboBoxItem Content="{DynamicResource prefs.advanced.importtempo.never}"/>
297-
<ComboBoxItem Content="{DynamicResource prefs.advanced.importtempo.ask}"/>
298-
</ComboBox>
299293
</StackPanel>
300294
</Carousel>
301295
</ScrollViewer>

0 commit comments

Comments
 (0)