UI overhaul, achievements are now listed in the GUI
This commit is contained in:
parent
2b77f9feb0
commit
8eb3b0d60e
@ -30,7 +30,7 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
private int _appId;
|
||||
|
||||
//private SteamApp _currentGame;
|
||||
private List<Achievement> achievements;
|
||||
private ObservableCollection<Achievement> _achievements;
|
||||
private ObservableCollection<DlcApp> _dlcs;
|
||||
private string _accountName;
|
||||
private long _steamId;
|
||||
@ -143,6 +143,16 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
}
|
||||
}
|
||||
|
||||
public ObservableCollection<Achievement> Achievements
|
||||
{
|
||||
get => _achievements;
|
||||
set
|
||||
{
|
||||
_achievements = value;
|
||||
RaisePropertyChanged(() => Achievements);
|
||||
}
|
||||
}
|
||||
|
||||
public string AccountName
|
||||
{
|
||||
get => _accountName;
|
||||
@ -381,13 +391,14 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
|
||||
MainWindowEnabled = false;
|
||||
StatusText = "Trying to get list of achievements...";
|
||||
achievements = await _steam.GetListOfAchievements(new SteamApp { AppId = AppId, Name = GameName });
|
||||
var listOfAchievements = await _steam.GetListOfAchievements(new SteamApp { AppId = AppId, Name = GameName });
|
||||
Achievements = new MvxObservableCollection<Achievement>(listOfAchievements);
|
||||
MainWindowEnabled = true;
|
||||
|
||||
if (achievements.Count > 0)
|
||||
if (Achievements.Count > 0)
|
||||
{
|
||||
var empty = achievements.Count == 1 ? "" : "s";
|
||||
StatusText = $"Successfully got {achievements.Count} achievement{empty}! Ready.";
|
||||
var empty = Achievements.Count == 1 ? "" : "s";
|
||||
StatusText = $"Successfully got {Achievements.Count} achievement{empty}! Ready.";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -443,7 +454,7 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
await _goldberg.Save(dirPath, new GoldbergConfiguration
|
||||
{
|
||||
AppId = AppId,
|
||||
Achievements = achievements.ToList(),
|
||||
Achievements = Achievements.ToList(),
|
||||
DlcList = DLCs.ToList(),
|
||||
Offline = Offline,
|
||||
DisableNetworking = DisableNetworking,
|
||||
@ -554,7 +565,7 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
DllPath = "Path to game's steam_api(64).dll...";
|
||||
GameName = "Game name...";
|
||||
AppId = -1;
|
||||
achievements = new List<Achievement>();
|
||||
Achievements = new ObservableCollection<Achievement>();
|
||||
DLCs = new ObservableCollection<DlcApp>();
|
||||
AccountName = "Account name...";
|
||||
SteamId = -1;
|
||||
@ -575,7 +586,7 @@ namespace GoldbergGUI.Core.ViewModels
|
||||
private void SetFormFromConfig(GoldbergConfiguration config)
|
||||
{
|
||||
AppId = config.AppId;
|
||||
achievements = new List<Achievement>(config.Achievements);
|
||||
Achievements = new ObservableCollection<Achievement>(config.Achievements);
|
||||
DLCs = new ObservableCollection<DlcApp>(config.DlcList);
|
||||
Offline = config.Offline;
|
||||
DisableNetworking = config.DisableNetworking;
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
<Grid Margin="10,20,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto" MaxHeight="0"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
@ -42,11 +42,11 @@
|
||||
<TextBox Text="{Binding GameName, Mode=TwoWay}" TextWrapping="Wrap" VerticalAlignment="Center" Padding="1,0,0,0" Grid.Row="2" Margin="0,5,215,5" Height="20"/>
|
||||
<Button Content="_Find ID..." Command="{Binding FindIdCommand}" Width="80" Grid.Row="2" Margin="0,5,130,5" HorizontalAlignment="Right" Height="20"/>
|
||||
<TextBox Text="{Binding AppId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="1,0,0,0" Grid.Row="2" Width="125" Margin="0,5,0,5" Height="20"/>
|
||||
<GroupBox Header="DLC" Grid.Row="3" Padding="0,0,0,0" Margin="0,5,0,0">
|
||||
<GroupBox.InputBindings>
|
||||
<KeyBinding Key="V" Modifiers="Control"
|
||||
Command="{Binding PasteDlcCommand}"/>
|
||||
</GroupBox.InputBindings>
|
||||
<TabControl Grid.Row="3" Margin="0,5,0,0" Padding="0,0,0,0">
|
||||
<TabItem Header="DLC">
|
||||
<TabItem.InputBindings>
|
||||
<KeyBinding Key="V" Modifiers="Control" Command="{Binding PasteDlcCommand}"/>
|
||||
</TabItem.InputBindings>
|
||||
<Grid Margin="10,10,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition/>
|
||||
@ -67,16 +67,46 @@
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<CheckBox Grid.Column="1" x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
|
||||
<Button Grid.Column="1" Content="Get _Achievements for AppID" Command="{Binding GetListOfAchievementsCommand}" Margin="0,5,20,0" Width="200" HorizontalAlignment="Right" />
|
||||
<Button Grid.Column="2" Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" Width="120" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20"/>
|
||||
<CheckBox x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
|
||||
<Button Grid.Column="2" Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20" Width="117"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</TabItem>
|
||||
<TabItem Header="Achievements" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
|
||||
<Grid Margin="10,10,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<DataGrid Margin="0,0,0,5" ItemsSource="{Binding Achievements, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SelectionMode="Extended" SelectionUnit="FullRow" HeadersVisibility="Column" AutoGenerateColumns="False" CanUserResizeColumns="True" IsReadOnly="True">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Name" Binding="{Binding DisplayName}" Width="*"/>
|
||||
<DataGridTextColumn Header="Description" Binding="{Binding Description}" Width="*"/>
|
||||
<DataGridCheckBoxColumn Header="Hidden" Binding="{Binding Hidden}" Width="60" CanUserResize="False"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Grid.Row="1" Grid.Column="1" Content="Get _Achievements for AppID" Command="{Binding GetListOfAchievementsCommand}" Margin="0,5,0,0" HorizontalAlignment="Right" Width="165" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="Misc" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
|
||||
<StackPanel Margin="10,10,10,10">
|
||||
<Button Content="_Generate steam__interfaces.txt" IsEnabled="{Binding SteamInterfacesTxtExists, UpdateSourceTrigger=PropertyChanged}" Command="{Binding GenerateSteamInterfacesCommand}" Height="20" Margin="0,0,0,5" />
|
||||
<CheckBox Content="Offline" IsChecked="{Binding Offline, Mode=TwoWay}" Height="20" VerticalAlignment="Stretch" VerticalContentAlignment="Center"/>
|
||||
<CheckBox Content="Disable Networking" IsChecked="{Binding DisableNetworking, Mode=TwoWay}" Height="20" VerticalContentAlignment="Center"/>
|
||||
<CheckBox Content="Disable Overlay" IsChecked="{Binding DisableOverlay, Mode=TwoWay}" Height="20" VerticalContentAlignment="Center" IsEnabled="False"/>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<!-- Advanced -->
|
||||
<TabItem Header="Advanced" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
|
||||
<!--<TabItem Header="Advanced" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
|
||||
<Grid HorizontalAlignment="Stretch" Margin="10,20,10,10" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@ -102,7 +132,7 @@
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
</TabItem>-->
|
||||
<!-- Settings -->
|
||||
<TabItem Header="Global Settings">
|
||||
<StackPanel Margin="10,20,10,10">
|
||||
@ -178,6 +208,8 @@
|
||||
<TextBlock Text="Developed by Jeddunk" />
|
||||
<TextBlock Text="Licensed under GNU GPLv3" />
|
||||
<TextBlock Text="Goldberg Emulator is owned by Mr. Goldberg and licensed under GNU LGPLv3" Margin="0,10,0,0"/>
|
||||
<TextBlock Text="Contributors:" Margin="0,10,0,0" FontWeight="Bold"/>
|
||||
<TextBlock Text="UrbanCMC" Margin="0,5,0,0"/>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</Label.ContentTemplate>
|
||||
|
||||
@ -9,6 +9,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.WPF", "Goldberg
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamStorefrontAPI", "SteamStorefrontAPI\SteamStorefrontAPI\SteamStorefrontAPI.csproj", "{42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E7DA860-D7FD-4090-B7EC-6DA3974DC845}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
COPYING = COPYING
|
||||
README.md = README.md
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
||||
18
README.md
18
README.md
@ -30,7 +30,7 @@ While the most used options are available right now, I am planning to support al
|
||||
* Subscribed Groups
|
||||
* Mods (Steam Workshop)
|
||||
* Inventory and Items
|
||||
* Achievements
|
||||
* ~~Achievements~~
|
||||
* Stats, Leaderboards
|
||||
* Controller (Steam Input)
|
||||
|
||||
@ -40,8 +40,20 @@ Apart from those, I'm also always looking into improving the user experience of
|
||||
|
||||
Goldberg Emulator is owned by Mr. Goldberg and licensed under the GNU Lesser General Public License v3.0.
|
||||
|
||||
### Contributors
|
||||
|
||||
* [UrbanCMC](https://github.com/UrbanCMC/) - Implementation of achievements
|
||||
|
||||
### Dependencies
|
||||
|
||||
* AngleSharp
|
||||
* MvvmCross
|
||||
* NinjaNye
|
||||
* Serilog
|
||||
* SharpCompress
|
||||
* sqlite-net-pcl
|
||||
* My fork of SteamStorefrontAPI
|
||||
|
||||
## License
|
||||
|
||||
GoldbergGUI is licensed under the GNU General Public License v3.0.
|
||||
|
||||
Dependencies will be listed ASAP.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user