diff --git a/GUI/App.xaml b/GUI/App.xaml index cc57d885..0bd0ff22 100644 --- a/GUI/App.xaml +++ b/GUI/App.xaml @@ -6,6 +6,7 @@ ShutdownMode="OnMainWindowClose" Exit="ApplicationExit"> https://github.com/morkt/GARbro#readme + https://github.com/morkt/GARbro/issues https://morkt.github.io/GARbro/version.xml diff --git a/GUI/GARbro.GUI.csproj b/GUI/GARbro.GUI.csproj index 996c47b3..1e4bf6b6 100644 --- a/GUI/GARbro.GUI.csproj +++ b/GUI/GARbro.GUI.csproj @@ -188,6 +188,9 @@ TextViewer.xaml + + TroubleShootingDialog.xaml + UpdateDialog.xaml @@ -249,6 +252,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/GUI/MainWindow.xaml b/GUI/MainWindow.xaml index 2eb645b5..b3b24bff 100644 --- a/GUI/MainWindow.xaml +++ b/GUI/MainWindow.xaml @@ -154,6 +154,7 @@ + @@ -292,6 +293,8 @@ + + @@ -417,6 +420,9 @@ + + + diff --git a/GUI/MainWindow.xaml.cs b/GUI/MainWindow.xaml.cs index 9380b602..868e7050 100644 --- a/GUI/MainWindow.xaml.cs +++ b/GUI/MainWindow.xaml.cs @@ -901,6 +901,21 @@ namespace GARbro.GUI OpenDirectoryEntry (ViewModel, entry); } + private void DescendExec (object control, ExecutedRoutedEventArgs e) + { + var entry = CurrentDirectory.SelectedItem as EntryViewModel; + if (entry != null) + OpenDirectoryEntry (ViewModel, entry); + } + + private void AscendExec (object control, ExecutedRoutedEventArgs e) + { + var vm = ViewModel; + var parent_dir = vm.FirstOrDefault (entry => entry.Name == ".."); + if (parent_dir != null) + OpenDirectoryEntry (vm, parent_dir); + } + private void OpenDirectoryEntry (DirectoryViewModel vm, EntryViewModel entry) { string old_dir = null == vm ? "" : vm.Path.Last(); @@ -1296,6 +1311,13 @@ namespace GARbro.GUI settings.ShowDialog(); } + private void TroubleShootingExec (object sender, ExecutedRoutedEventArgs e) + { + var dialog = new TroubleShootingDialog(); + dialog.Owner = this; + dialog.ShowDialog(); + } + private void CanExecuteAlways (object sender, CanExecuteRoutedEventArgs e) { e.CanExecute = true; @@ -1525,5 +1547,8 @@ namespace GARbro.GUI public static readonly RoutedCommand CopyNames = new RoutedCommand(); public static readonly RoutedCommand StopPlayback = new RoutedCommand(); public static readonly RoutedCommand Preferences = new RoutedCommand(); + public static readonly RoutedCommand TroubleShooting = new RoutedCommand(); + public static readonly RoutedCommand Descend = new RoutedCommand(); + public static readonly RoutedCommand Ascend = new RoutedCommand(); } } diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx index 89c130ab..5a29f3ac 100644 --- a/GUI/Strings/guiStrings.ru-RU.resx +++ b/GUI/Strings/guiStrings.ru-RU.resx @@ -511,7 +511,7 @@ Что делать? - Не удадось конвертировать файл + Не удалось конвертировать файл {0} {1} diff --git a/GUI/TroubleShootingDialog.xaml b/GUI/TroubleShootingDialog.xaml new file mode 100644 index 00000000..de2e14a5 --- /dev/null +++ b/GUI/TroubleShootingDialog.xaml @@ -0,0 +1,21 @@ + + + +