Skip to content

Commit 69a45fd

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Migrate dialogs...
1 parent 83d9758 commit 69a45fd

30 files changed

+72
-194
lines changed

‎Source/NETworkManager/ViewModels/ARPTableViewModel.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System.Windows.Data;
2020
using System.Windows.Input;
2121
using System.Windows.Threading;
22+
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
2223

2324
namespace NETworkManager.ViewModels;
2425

@@ -517,7 +518,7 @@ private Task ExportAction()
517518
ConfigurationManager.Current.IsChildWindowOpen = false;
518519

519520
try
520-
{
521+
{
521522
ExportManager.Export(instance.FilePath, instance.FileType,
522523
instance.ExportAll
523524
? Results
@@ -527,12 +528,9 @@ private Task ExportAction()
527528
{
528529
Log.Error("Error while exporting data as " + instance.FileType, ex);
529530

530-
var settings = AppearanceManager.MetroDialog;
531-
settings.AffirmativeButtonText = Strings.OK;
532-
533-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
534-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
535-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
531+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
532+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
533+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
536534
}
537535

538536
SettingsManager.Current.ARPTable_ExportFileType = instance.FileType;
@@ -552,7 +550,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
552550

553551
ConfigurationManager.Current.IsChildWindowOpen = true;
554552

555-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
553+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
556554
}
557555

558556
#endregion

‎Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ public class BitCalculatorViewModel : ViewModelBase
2626
{
2727
#region Variables
2828

29-
/// <summary>
30-
/// The dialog coordinator instance.
31-
/// </summary>
32-
private readonly IDialogCoordinator _dialogCoordinator;
33-
3429
private static readonly ILog Log = LogManager.GetLogger(typeof(BitCalculatorViewModel));
3530

3631
/// <summary>
@@ -180,11 +175,9 @@ private set
180175
/// <summary>
181176
/// Initializes a new instance of the <see cref="BitCalculatorViewModel"/> class.
182177
/// </summary>
183-
/// <param name="instance">The dialog coordinator instance.</param>
184-
public BitCalculatorViewModel(IDialogCoordinator instance)
178+
public BitCalculatorViewModel()
185179
{
186180
_isLoading = true;
187-
_dialogCoordinator = instance;
188181

189182
InputHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.BitCalculator_InputHistory);
190183

@@ -258,12 +251,9 @@ private Task ExportAction()
258251
{
259252
Log.Error("Error while exporting data as " + instance.FileType, ex);
260253

261-
var settings = AppearanceManager.MetroDialog;
262-
settings.AffirmativeButtonText = Strings.OK;
263-
264-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
265-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
266-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
254+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
255+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
256+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
267257
}
268258

269259
SettingsManager.Current.BitCalculator_ExportFileType = instance.FileType;
@@ -283,7 +273,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
283273

284274
ConfigurationManager.Current.IsChildWindowOpen = true;
285275

286-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
276+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
287277
}
288278

289279
#endregion

‎Source/NETworkManager/ViewModels/ConnectionsViewModel.cs‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@ public class ConnectionsViewModel : ViewModelBase
3333
/// <summary>
3434
/// Initializes a new instance of the <see cref="ConnectionsViewModel"/> class.
3535
/// </summary>
36-
/// <param name="instance">The dialog coordinator instance.</param>
37-
public ConnectionsViewModel(IDialogCoordinator instance)
36+
public ConnectionsViewModel()
3837
{
3938
_isLoading = true;
4039

41-
_dialogCoordinator = instance;
42-
4340
// Result view + search
4441
ResultsView = CollectionViewSource.GetDefaultView(Results);
4542

@@ -108,11 +105,6 @@ private async void AutoRefreshTimer_Tick(object sender, EventArgs e)
108105

109106
private static readonly ILog Log = LogManager.GetLogger(typeof(ConnectionsViewModel));
110107

111-
/// <summary>
112-
/// The dialog coordinator instance.
113-
/// </summary>
114-
private readonly IDialogCoordinator _dialogCoordinator;
115-
116108
/// <summary>
117109
/// Indicates whether the view model is loading.
118110
/// </summary>
@@ -412,12 +404,9 @@ private Task ExportAction()
412404
{
413405
Log.Error("Error while exporting data as " + instance.FileType, ex);
414406

415-
var settings = AppearanceManager.MetroDialog;
416-
settings.AffirmativeButtonText = Strings.OK;
417-
418-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
419-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
420-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
407+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
408+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
409+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
421410
}
422411

423412
SettingsManager.Current.Connections_ExportFileType = instance.FileType;
@@ -438,7 +427,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
438427

439428
ConfigurationManager.Current.IsChildWindowOpen = true;
440429

441-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
430+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
442431
}
443432

444433
#endregion

‎Source/NETworkManager/ViewModels/DNSLookupViewModel.cs‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using System.Collections.Generic;
1616
using System.Collections.ObjectModel;
1717
using System.ComponentModel;
18-
using System.Diagnostics;
1918
using System.Linq;
2019
using System.Net;
2120
using System.Threading.Tasks;
@@ -34,11 +33,6 @@ public class DNSLookupViewModel : ViewModelBase
3433
#region Variables
3534
private static readonly ILog Log = LogManager.GetLogger(typeof(DNSLookupViewModel));
3635

37-
/// <summary>
38-
/// The dialog coordinator instance.
39-
/// </summary>
40-
private readonly IDialogCoordinator _dialogCoordinator;
41-
4236
private readonly Guid _tabId;
4337
private bool _firstLoad = true;
4438
private bool _closed;
@@ -304,15 +298,12 @@ private set
304298
/// <summary>
305299
/// Initializes a new instance of the <see cref="DNSLookupViewModel"/> class.
306300
/// </summary>
307-
/// <param name="instance">The dialog coordinator instance.</param>
308301
/// <param name="tabId">The ID of the tab.</param>
309302
/// <param name="host">The host to lookup.</param>
310-
public DNSLookupViewModel(IDialogCoordinator instance, Guid tabId, string host)
303+
public DNSLookupViewModel(Guid tabId, string host)
311304
{
312305
_isLoading = true;
313306

314-
_dialogCoordinator = instance;
315-
316307
ConfigurationManager.Current.DNSLookupTabCount++;
317308

318309
_tabId = tabId;
@@ -622,12 +613,9 @@ private Task Export()
622613
{
623614
Log.Error("Error while exporting data as " + instance.FileType, ex);
624615

625-
var settings = AppearanceManager.MetroDialog;
626-
settings.AffirmativeButtonText = Strings.OK;
627-
628-
await _dialogCoordinator.ShowMessageAsync(window, Strings.Error,
629-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
630-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
616+
await DialogHelper.ShowMessageAsync(window, Strings.Error,
617+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
618+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
631619
}
632620

633621
SettingsManager.Current.DNSLookup_ExportFileType = instance.FileType;

‎Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ public class HostsFileEditorViewModel : ViewModelBase
2929

3030
private static readonly ILog Log = LogManager.GetLogger(typeof(HostsFileEditorViewModel));
3131

32-
/// <summary>
33-
/// The dialog coordinator instance.
34-
/// </summary>
35-
private readonly IDialogCoordinator _dialogCoordinator;
36-
3732
/// <summary>
3833
/// Indicates whether the view model is loading.
3934
/// </summary>
@@ -222,12 +217,10 @@ private set
222217
/// <summary>
223218
/// Initializes a new instance of the <see cref="HostsFileEditorViewModel"/> class.
224219
/// </summary>
225-
/// <param name="instance">The dialog coordinator instance.</param>
226-
public HostsFileEditorViewModel(IDialogCoordinator instance)
220+
public HostsFileEditorViewModel()
227221
{
228222
_isLoading = true;
229-
_dialogCoordinator = instance;
230-
223+
231224
// Result view + search
232225
ResultsView = CollectionViewSource.GetDefaultView(Results);
233226
ResultsView.Filter = o =>
@@ -322,12 +315,9 @@ private Task ExportAction()
322315
{
323316
Log.Error("Error while exporting data as " + instance.FileType, ex);
324317

325-
var settings = AppearanceManager.MetroDialog;
326-
settings.AffirmativeButtonText = Strings.OK;
327-
328-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
318+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
329319
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
330-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
320+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
331321
}
332322

333323
SettingsManager.Current.HostsFileEditor_ExportFileType = instance.FileType;
@@ -347,7 +337,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
347337

348338
ConfigurationManager.Current.IsChildWindowOpen = true;
349339

350-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
340+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
351341
}
352342

353343
/// <summary>

‎Source/NETworkManager/ViewModels/ListenersViewModel.cs‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System.Windows.Data;
2020
using System.Windows.Input;
2121
using System.Windows.Threading;
22+
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
2223

2324
namespace NETworkManager.ViewModels;
2425

@@ -32,13 +33,10 @@ public class ListenersViewModel : ViewModelBase
3233
/// <summary>
3334
/// Initializes a new instance of the <see cref="ListenersViewModel"/> class.
3435
/// </summary>
35-
/// <param name="instance">The dialog coordinator instance.</param>
36-
public ListenersViewModel(IDialogCoordinator instance)
36+
public ListenersViewModel()
3737
{
3838
_isLoading = true;
3939

40-
_dialogCoordinator = instance;
41-
4240
// Result view + search
4341
ResultsView = CollectionViewSource.GetDefaultView(Results);
4442

@@ -99,11 +97,6 @@ private async void AutoRefreshTimer_Tick(object sender, EventArgs e)
9997

10098
private static readonly ILog Log = LogManager.GetLogger(typeof(ListenersViewModel));
10199

102-
/// <summary>
103-
/// The dialog coordinator instance.
104-
/// </summary>
105-
private readonly IDialogCoordinator _dialogCoordinator;
106-
107100
/// <summary>
108101
/// Indicates whether the view model is loading.
109102
/// </summary>
@@ -402,12 +395,9 @@ private Task ExportAction()
402395
{
403396
Log.Error("Error while exporting data as " + instance.FileType, ex);
404397

405-
var settings = AppearanceManager.MetroDialog;
406-
settings.AffirmativeButtonText = Strings.OK;
407-
408-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
409-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
410-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
398+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
399+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
400+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
411401
}
412402

413403
SettingsManager.Current.Listeners_ExportFileType = instance.FileType;
@@ -426,7 +416,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
426416

427417
ConfigurationManager.Current.IsChildWindowOpen = true;
428418

429-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
419+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
430420
}
431421

432422
#endregion

‎Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using log4net;
22
using MahApps.Metro.Controls;
3-
using MahApps.Metro.Controls.Dialogs;
43
using MahApps.Metro.SimpleChildWindow;
54
using NETworkManager.Localization.Resources;
65
using NETworkManager.Models.Export;
@@ -32,11 +31,8 @@ public class LookupOUILookupViewModel : ViewModelBase
3231
/// <summary>
3332
/// Initializes a new instance of the <see cref="LookupOUILookupViewModel"/> class.
3433
/// </summary>
35-
/// <param name="instance">The dialog coordinator instance.</param>
36-
public LookupOUILookupViewModel(IDialogCoordinator instance)
34+
public LookupOUILookupViewModel()
3735
{
38-
_dialogCoordinator = instance;
39-
4036
// Search history
4137
SearchHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.Lookup_OUI_SearchHistory);
4238

@@ -77,11 +73,6 @@ private void AddSearchToHistory(string macAddressOrVendor)
7773
/// </summary>
7874
private static readonly ILog Log = LogManager.GetLogger(typeof(LookupOUILookupViewModel));
7975

80-
/// <summary>
81-
/// The dialog coordinator.
82-
/// </summary>
83-
private readonly IDialogCoordinator _dialogCoordinator;
84-
8576
/// <summary>
8677
/// Backing field for <see cref="Search"/>.
8778
/// </summary>
@@ -338,12 +329,9 @@ private Task ExportAction()
338329
{
339330
Log.Error("Error while exporting data as " + instance.FileType, ex);
340331

341-
var settings = AppearanceManager.MetroDialog;
342-
settings.AffirmativeButtonText = Strings.OK;
343-
344-
await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
345-
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
346-
Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
332+
await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
333+
Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
334+
Environment.NewLine + ex.Message, ChildWindowIcon.Error);
347335
}
348336

349337
SettingsManager.Current.Lookup_OUI_ExportFileType = instance.FileType;
@@ -363,7 +351,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
363351

364352
ConfigurationManager.Current.IsChildWindowOpen = true;
365353

366-
return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
354+
return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
367355
}
368356

369357
#endregion

0 commit comments

Comments
 (0)