From 195a076ad7206c63c72c05371f67cca00fb8ebe3 Mon Sep 17 00:00:00 2001 From: ComputerElite <71177995+ComputerElite@users.noreply.github.com> Date: Wed, 22 Feb 2023 18:20:24 +0100 Subject: [PATCH] Only show suredeletesong prompt on first song --- C#/MainWindow.xaml.cs | 17 ++++++++--------- C#/PlaylistEditor.xaml.cs | 21 +++++++++++++-------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/C#/MainWindow.xaml.cs b/C#/MainWindow.xaml.cs index 1ea9541e..f5ee2020 100644 --- a/C#/MainWindow.xaml.cs +++ b/C#/MainWindow.xaml.cs @@ -45,7 +45,7 @@ public partial class MainWindow : Window { public static int MajorV = 1; public static int MinorV = 16; - public static int PatchV = 7; + public static int PatchV = 8; public static bool Preview = false; public static bool log = false; @@ -687,15 +687,14 @@ public void StartBMBFUpdate() Running = false; return; } + Process.Start("https://computerelite.github.io/tools/Oculus/AppVersions.html?id=2448060205267927"); MessageBoxResult result2 = MessageBox.Show(globalLanguage.mainMenu.code.downloadBS, "BMBF Manager - BMBF Updater", MessageBoxButton.OK, MessageBoxImage.Warning); - MessageBoxResult result3 = MessageBox.Show(globalLanguage.mainMenu.code.makingSure, "BMBF Manager - BMBF Updater", MessageBoxButton.YesNo, MessageBoxImage.Warning); - switch (result3) + OpenFileDialog dialog = new OpenFileDialog(); + dialog.Filter = "Apk (*.apk)|*.apk"; + txtbox.AppendText(globalLanguage.mainMenu.code.installingBS); + if(dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - case MessageBoxResult.No: - txtbox.AppendText("\n\n" + globalLanguage.mainMenu.code.bMBFUpdatatingAbortedInstallBS); - txtbox.ScrollToEnd(); - Running = false; - return; + aDBI.adb("install \"" + dialog.FileName + "\"", txtbox); } } else @@ -1224,4 +1223,4 @@ internal void CustomProto(string Link) SupportWindow.StartSupport(Link); } } -} +} \ No newline at end of file diff --git a/C#/PlaylistEditor.xaml.cs b/C#/PlaylistEditor.xaml.cs index 08997074..9c0b27de 100644 --- a/C#/PlaylistEditor.xaml.cs +++ b/C#/PlaylistEditor.xaml.cs @@ -632,15 +632,20 @@ private void DelSong(object sender, RoutedEventArgs e) txtbox.ScrollToEnd(); return; } - MessageBoxResult r = MessageBox.Show(MainWindow.globalLanguage.processer.ReturnProcessed(MainWindow.globalLanguage.playlistEditor.code.sureDeleteSong, UnsortedPlaylist[selected + NotProcessed].SongName), "BMBF Manager - Playlist Editor", MessageBoxButton.YesNo, MessageBoxImage.Warning); - switch (r) + if(!asked) { - case MessageBoxResult.No: - txtbox.AppendText("\n\n" + MainWindow.globalLanguage.processer.ReturnProcessed(MainWindow.globalLanguage.playlistEditor.code.deletingSongAborted, UnsortedPlaylist[selected + NotProcessed].SongName)); - txtbox.ScrollToEnd(); - NotProcessed++; - continue; - } + MessageBoxResult r = MessageBox.Show(MainWindow.globalLanguage.processer.ReturnProcessed(MainWindow.globalLanguage.playlistEditor.code.sureDeleteSong, UnsortedPlaylist[selected + NotProcessed].SongName), "BMBF Manager - Playlist Editor", MessageBoxButton.YesNo, MessageBoxImage.Warning); + switch (r) + { + case MessageBoxResult.No: + txtbox.AppendText("\n\n" + MainWindow.globalLanguage.processer.ReturnProcessed(MainWindow.globalLanguage.playlistEditor.code.deletingSongAborted, UnsortedPlaylist[selected + NotProcessed].SongName)); + txtbox.ScrollToEnd(); + NotProcessed++; + continue; + } + asked = true; + } + ADBInteractor interactor = new ADBInteractor(); string name = UnsortedPlaylist[selected + NotProcessed].SongName; for(int i = 0; i < BMBFConfig.Config.Playlists.Count; i++)