jeddunk/GoldbergGUI
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 5 Wiki Activity

Added status bar.

Browse Source
This commit is contained in:
Jeddunk 2021-01-13 22:15:00 +01:00
parent fcf966f434
commit 32c48b01b9
2 changed files with 170 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
GoldbergGUI.Core/ViewModels/MainViewModel.cs
View File

@ -64,6 +64,7 @@ namespace GoldbergGUI.Core.ViewModels
{ {
//var errorDuringInit = false; //var errorDuringInit = false;
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Initializing! Please wait...";
try try
{ {
SteamLanguages = new ObservableCollection<string>(_goldberg.Languages()); SteamLanguages = new ObservableCollection<string>(_goldberg.Languages());
@ -78,11 +79,12 @@ namespace GoldbergGUI.Core.ViewModels
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine(e); Console.WriteLine(e);
_log.Error(e.Message);
throw; throw;
//errorDuringInit = true;
} }
MainWindowEnabled = true; MainWindowEnabled = true;
StatusText = "Ready.";
}); });
} }
@ -100,6 +102,8 @@ namespace GoldbergGUI.Core.ViewModels
{ {
_dllPath = value; _dllPath = value;
RaisePropertyChanged(() => DllPath); RaisePropertyChanged(() => DllPath);
RaisePropertyChanged(() => DllSelected);
RaisePropertyChanged(() => SteamInterfacesTxtExists);
} }
} }
@ -132,8 +136,8 @@ namespace GoldbergGUI.Core.ViewModels
{ {
_dlcs = value; _dlcs = value;
RaisePropertyChanged(() => DLCs); RaisePropertyChanged(() => DLCs);
RaisePropertyChanged(() => DllSelected); /*RaisePropertyChanged(() => DllSelected);
RaisePropertyChanged(() => SteamInterfacesTxtExists); RaisePropertyChanged(() => SteamInterfacesTxtExists);*/
} }
} }
@ -258,6 +262,8 @@ namespace GoldbergGUI.Core.ViewModels
private async Task OpenFile() private async Task OpenFile()
{ {
MainWindowEnabled = false;
StatusText = "Please choose a file...";
var dialog = new OpenFileDialog var dialog = new OpenFileDialog
{ {
Filter = "SteamAPI DLL|steam_api.dll;steam_api64.dll|" + Filter = "SteamAPI DLL|steam_api.dll;steam_api64.dll|" +
@ -267,12 +273,16 @@ namespace GoldbergGUI.Core.ViewModels
}; };
if (dialog.ShowDialog() != true) if (dialog.ShowDialog() != true)
{ {
MainWindowEnabled = true;
_log.Warn("File selection canceled."); _log.Warn("File selection canceled.");
StatusText = "No file selected! Ready.";
return; return;
} }
DllPath = dialog.FileName; DllPath = dialog.FileName;
await ReadConfig().ConfigureAwait(false); await ReadConfig().ConfigureAwait(false);
MainWindowEnabled = true;
StatusText = "Ready.";
} }
public IMvxCommand FindIdCommand => new MvxAsyncCommand(FindId); public IMvxCommand FindIdCommand => new MvxAsyncCommand(FindId);
@ -298,6 +308,7 @@ namespace GoldbergGUI.Core.ViewModels
} }
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Trying to find AppID...";
var appByName = _steam.GetAppByName(_gameName); var appByName = _steam.GetAppByName(_gameName);
if (appByName != null) if (appByName != null)
{ {
@ -328,6 +339,7 @@ namespace GoldbergGUI.Core.ViewModels
} }
MainWindowEnabled = true; MainWindowEnabled = true;
StatusText = "Ready.";
} }
//public IMvxCommand GetNameByIdCommand => new MvxAsyncCommand(GetNameById); //public IMvxCommand GetNameByIdCommand => new MvxAsyncCommand(GetNameById);
@ -355,10 +367,20 @@ namespace GoldbergGUI.Core.ViewModels
} }
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Trying to get list of DLCs...";
var listOfDlc = await _steam.GetListOfDlc(new SteamApp {AppId = AppId, Name = GameName}, true) var listOfDlc = await _steam.GetListOfDlc(new SteamApp {AppId = AppId, Name = GameName}, true)
.ConfigureAwait(false); .ConfigureAwait(false);
DLCs = new MvxObservableCollection<SteamApp>(listOfDlc); DLCs = new MvxObservableCollection<SteamApp>(listOfDlc);
MainWindowEnabled = true; MainWindowEnabled = true;
if (DLCs.Count > 0)
{
var empty = DLCs.Count == 1 ? "" : "s";
StatusText = $"Successfully got {DLCs.Count} DLC{empty}! Ready.";
}
else
{
StatusText = "No DLC found! Ready.";
}
} }
public IMvxCommand SaveConfigCommand => new MvxAsyncCommand(SaveConfig); public IMvxCommand SaveConfigCommand => new MvxAsyncCommand(SaveConfig);
@ -376,6 +398,7 @@ namespace GoldbergGUI.Core.ViewModels
_log.Info("Saving Goldberg settings..."); _log.Info("Saving Goldberg settings...");
if (!GetDllPathDir(out var dirPath)) return; if (!GetDllPathDir(out var dirPath)) return;
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Saving...";
await _goldberg.Save(dirPath, new GoldbergConfiguration await _goldberg.Save(dirPath, new GoldbergConfiguration
{ {
AppId = AppId, AppId = AppId,
@ -387,6 +410,7 @@ namespace GoldbergGUI.Core.ViewModels
).ConfigureAwait(false); ).ConfigureAwait(false);
GoldbergApplied = _goldberg.GoldbergApplied(dirPath); GoldbergApplied = _goldberg.GoldbergApplied(dirPath);
MainWindowEnabled = true; MainWindowEnabled = true;
StatusText = "Ready.";
} }
public IMvxCommand ResetConfigCommand => new MvxAsyncCommand(ResetConfig); public IMvxCommand ResetConfigCommand => new MvxAsyncCommand(ResetConfig);
@ -402,8 +426,10 @@ namespace GoldbergGUI.Core.ViewModels
_log.Info("Reset form..."); _log.Info("Reset form...");
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Resetting...";
await ReadConfig().ConfigureAwait(false); await ReadConfig().ConfigureAwait(false);
MainWindowEnabled = true; MainWindowEnabled = true;
StatusText = "Ready.";
} }
public IMvxCommand GenerateSteamInterfacesCommand => new MvxAsyncCommand(GenerateSteamInterfaces); public IMvxCommand GenerateSteamInterfacesCommand => new MvxAsyncCommand(GenerateSteamInterfaces);
@ -418,6 +444,7 @@ namespace GoldbergGUI.Core.ViewModels
_log.Info("Generate steam_interfaces.txt..."); _log.Info("Generate steam_interfaces.txt...");
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = @"Generating ""steam_interfaces.txt"".";
GetDllPathDir(out var dirPath); GetDllPathDir(out var dirPath);
if (File.Exists(Path.Combine(dirPath, "steam_api_o.dll"))) if (File.Exists(Path.Combine(dirPath, "steam_api_o.dll")))
await _goldberg.GenerateInterfacesFile(Path.Combine(dirPath, "steam_api_o.dll")).ConfigureAwait(false); await _goldberg.GenerateInterfacesFile(Path.Combine(dirPath, "steam_api_o.dll")).ConfigureAwait(false);
@ -427,6 +454,7 @@ namespace GoldbergGUI.Core.ViewModels
else await _goldberg.GenerateInterfacesFile(DllPath).ConfigureAwait(false); else await _goldberg.GenerateInterfacesFile(DllPath).ConfigureAwait(false);
await RaisePropertyChanged(() => SteamInterfacesTxtExists).ConfigureAwait(false); await RaisePropertyChanged(() => SteamInterfacesTxtExists).ConfigureAwait(false);
MainWindowEnabled = true; MainWindowEnabled = true;
StatusText = "Ready.";
} }
public IMvxCommand PasteDlcCommand => new MvxCommand(() => public IMvxCommand PasteDlcCommand => new MvxCommand(() =>
@ -439,7 +467,7 @@ namespace GoldbergGUI.Core.ViewModels
} }
else else
{ {
DLCs.Clear(); var pastedDlc = new List<SteamApp>();
var result = Clipboard.GetText(); var result = Clipboard.GetText();
var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)"); var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)");
foreach (var line in result.Split(new[] foreach (var line in result.Split(new[]
@ -450,12 +478,23 @@ namespace GoldbergGUI.Core.ViewModels
{ {
var match = expression.Match(line); var match = expression.Match(line);
if (match.Success) if (match.Success)
DLCs.Add(new SteamApp pastedDlc.Add(new SteamApp
{ {
AppId = Convert.ToInt32(match.Groups["id"].Value), AppId = Convert.ToInt32(match.Groups["id"].Value),
Name = match.Groups["name"].Value Name = match.Groups["name"].Value
}); });
} }
if (pastedDlc.Count > 0)
{
DLCs.Clear();
DLCs = new ObservableCollection<SteamApp>(pastedDlc);
var empty = DLCs.Count == 1 ? "" : "s";
StatusText = $"Successfully got {DLCs.Count} DLC{empty} from clipboard! Ready.";
}
else
{
StatusText = "No DLC found in clipboard! Ready.";
}
} }
}); });
@ -477,12 +516,10 @@ namespace GoldbergGUI.Core.ViewModels
private async Task ReadConfig() private async Task ReadConfig()
{ {
if (!GetDllPathDir(out var dirPath)) return; if (!GetDllPathDir(out var dirPath)) return;
MainWindowEnabled = false;
var config = await _goldberg.Read(dirPath).ConfigureAwait(false); var config = await _goldberg.Read(dirPath).ConfigureAwait(false);
SetFormFromConfig(config); SetFormFromConfig(config);
GoldbergApplied = _goldberg.GoldbergApplied(dirPath); GoldbergApplied = _goldberg.GoldbergApplied(dirPath);
await RaisePropertyChanged(() => SteamInterfacesTxtExists).ConfigureAwait(false); await RaisePropertyChanged(() => SteamInterfacesTxtExists).ConfigureAwait(false);
MainWindowEnabled = true;
} }
private void SetFormFromConfig(GoldbergConfiguration config) private void SetFormFromConfig(GoldbergConfiguration config)

13
GoldbergGUI.WPF/Views/MainView.xaml
View File

@ -7,7 +7,12 @@
xmlns:viewmodel="clr-namespace:GoldbergGUI.Core.ViewModels;assembly=GoldbergGUI.Core" xmlns:viewmodel="clr-namespace:GoldbergGUI.Core.ViewModels;assembly=GoldbergGUI.Core"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="400" d:DataContext="{d:DesignInstance Type=viewmodel:MainViewModel }"> d:DesignHeight="500" d:DesignWidth="400" d:DataContext="{d:DesignInstance Type=viewmodel:MainViewModel }">
<Grid Margin="5,5,5,5" IsEnabled="{Binding MainWindowEnabled}"> <Grid Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid IsEnabled="{Binding MainWindowEnabled}" Margin="5,5,5,5">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -104,7 +109,7 @@
<TextBox Text="{Binding SteamId, Mode=TwoWay}" Grid.Column="1" Height="20" Grid.Row="1"/> <TextBox Text="{Binding SteamId, Mode=TwoWay}" Grid.Column="1" Height="20" Grid.Row="1"/>
<Label Content="Language" HorizontalAlignment="Left" Grid.Row="2" <Label Content="Language" HorizontalAlignment="Left" Grid.Row="2"
Grid.Column="0" Margin="0,0,10,0" /> Grid.Column="0" Margin="0,0,10,0" />
<ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{Binding SteamLanguages}" SelectedItem="{Binding SelectedLanguage}"></ComboBox> <ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{Binding SteamLanguages}" SelectedItem="{Binding SelectedLanguage}"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
@ -139,6 +144,10 @@
<Button Content="Save" Command="{Binding SaveConfigCommand}" Width="80" Grid.Column="1" Height="20" Margin="0,0,5,0"/> <Button Content="Save" Command="{Binding SaveConfigCommand}" Width="80" Grid.Column="1" Height="20" Margin="0,0,5,0"/>
<Button Content="Reset" Command="{Binding ResetConfigCommand}" Width="80" Grid.Column="2" Height="20"/> <Button Content="Reset" Command="{Binding ResetConfigCommand}" Width="80" Grid.Column="2" Height="20"/>
</Grid> </Grid>
</Grid>
<!-- Status Bar --> <!-- Status Bar -->
<StatusBar Grid.Column="0" Grid.Row="1" Padding="2,2,2,2" BorderBrush="#33000000" BorderThickness="0,2,0,0">
<StatusBarItem Content="{Binding StatusText}"/>
</StatusBar>
</Grid> </Grid>
</views:MvxWpfView> </views:MvxWpfView>