luxick/EstusShots-Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make player and drink editor use the editor base class

Browse Source
This commit is contained in:
luxick
2020-03-06 21:58:03 +01:00
parent f3974807a8
commit 5c6b19f360
8 changed files with 370 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
EstusShots.Gtk/Pages/BaseDataPage.cs
View File

@@ -44,6 +44,12 @@ namespace EstusShots.Gtk
new DataColumnDouble(nameof(Drink.Vol)) {Title = "%"}
};
_drinksControl = new BindableListControl<Drink>(drinkColumns, nameof(Drink.DrinkId), DrinksTreeView);
_drinksControl.ItemActivated += item =>
{
var drinkEditor = new DrinkEditor(this, item);
drinkEditor.DialogClosed += DrinkEditorClosed;
drinkEditor.Show();
};
// TODO Only Load when navigated to
Task _;
@@ -51,32 +57,36 @@ namespace EstusShots.Gtk
_ = ReloadDrinks();
}
// Events
private void PlayersControlActivated(Player player)
{
var dialog = new PlayerEditor(this, player);
dialog.OnDialogClosed += PlayerEditorClosed;
dialog.DialogClosed += PlayerEditorClosed;
dialog.Show();
}
private void NewPlayerButtonOnClicked(object sender, EventArgs e)
{
var dialog = new PlayerEditor(this, new Player());
dialog.OnDialogClosed += PlayerEditorClosed;
dialog.DialogClosed += PlayerEditorClosed;
dialog.Show();
}
private void NewDrinkButtonOnClicked(object sender, EventArgs e)
{
var dialog = new DrinkEditor(this, new Drink());
dialog.OnDialogClosed += DialogOnOnDialogClosed;
dialog.DialogClosed += DrinkEditorClosed;
dialog.Show();
}
private async void DialogOnOnDialogClosed(object o, DialogClosedEventArgs args)
private async void DrinkEditorClosed(object o, DialogClosedEventArgs<Drink> args)
{
if (!args.Ok || !(args.Model is Drink drink)) return;
if (!args.Ok) return;
var res = await Task.Factory.StartNew(()
=> Client.Drinks.SaveDrink(new SaveDrinkParameter(drink)).Result);
=> Client.Drinks.SaveDrink(new SaveDrinkParameter(args.Model)).Result);
if (!res.OperationResult.Success)
{
@@ -88,11 +98,11 @@ namespace EstusShots.Gtk
await ReloadDrinks();
}
private async void PlayerEditorClosed(object o, DialogClosedEventArgs args)
private async void PlayerEditorClosed(object o, DialogClosedEventArgs<Player> args)
{
if (!args.Ok || !(args.Model is Player player)) return;
if (!args.Ok) return;
var res = await Task.Factory.StartNew(()
=> Client.Players.SavePlayer(new SavePlayerParameter(player)).Result);
=> Client.Players.SavePlayer(new SavePlayerParameter(args.Model)).Result);
if (!res.OperationResult.Success)
{
Info($"Unable to save: {res.OperationResult.ShortMessage}");

4
EstusShots.Gtk/Pages/SeasonsPage.cs
View File

@@ -43,7 +43,7 @@ namespace EstusShots.Gtk
private void NewSeasonButtonOnClicked(object sender, EventArgs e)
{
var dialog = new SeasonEditor(this, new Season());
dialog.OnDialogClosed += SeasonEditorClosed;
dialog.DialogClosed += SeasonEditorClosed;
dialog.Show();
}
@@ -80,7 +80,7 @@ namespace EstusShots.Gtk
private void SeasonsControlItemActivated(Season item)
{
var dialog = new SeasonEditor(this, item);
dialog.OnDialogClosed += SeasonEditorClosed;
dialog.DialogClosed += SeasonEditorClosed;
dialog.Show();
}