Skip to content

Commit 6573d76

Browse files
BornToBeRootBornToBeRoot
authored
Chore: Use .NET 7 syntax (BornToBeRoot#2003)
* Chore: Use .NET 7 syntax * Chore: Make readonly * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax * Chore: Use .NET 7 syntax
1 parent 1b29bb4 commit 6573d76

541 files changed

Lines changed: 39480 additions & 40040 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/NETworkManager.Controls/MultiSelectDataGrid.cs‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
using System.Windows;
33
using System.Windows.Controls;
44

5-
namespace NETworkManager.Controls
5+
namespace NETworkManager.Controls;
6+
7+
public class MultiSelectDataGrid : DataGrid
68
{
7-
public class MultiSelectDataGrid : DataGrid
9+
public MultiSelectDataGrid()
810
{
9-
public MultiSelectDataGrid()
10-
{
11-
SelectionChanged += DataGridMultiItemSelect_SelectionChanged;
12-
}
13-
14-
private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
15-
{
16-
SelectedItemsList = SelectedItems;
17-
}
11+
SelectionChanged += DataGridMultiItemSelect_SelectionChanged;
12+
}
1813

19-
public IList SelectedItemsList
20-
{
21-
get => (IList)GetValue(SelectedItemsListProperty);
22-
set => SetValue(SelectedItemsListProperty, value);
23-
}
14+
private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
15+
{
16+
SelectedItemsList = SelectedItems;
17+
}
2418

25-
public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectDataGrid), new PropertyMetadata(null));
19+
public IList SelectedItemsList
20+
{
21+
get => (IList)GetValue(SelectedItemsListProperty);
22+
set => SetValue(SelectedItemsListProperty, value);
2623
}
24+
25+
public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectDataGrid), new PropertyMetadata(null));
2726
}

‎Source/NETworkManager.Controls/MultiSelectScrollingDataGrid.cs‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,38 @@
33
using System.Windows;
44
using System.Windows.Controls;
55

6-
namespace NETworkManager.Controls
6+
namespace NETworkManager.Controls;
7+
8+
public class MultiSelectScrollingDataGrid : DataGrid
79
{
8-
public class MultiSelectScrollingDataGrid : DataGrid
10+
public MultiSelectScrollingDataGrid()
911
{
10-
public MultiSelectScrollingDataGrid()
11-
{
12-
SelectionChanged += DataGridMultiItemSelect_SelectionChanged;
13-
}
12+
SelectionChanged += DataGridMultiItemSelect_SelectionChanged;
13+
}
1414

15-
private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
16-
{
17-
SelectedItemsList = SelectedItems;
18-
}
15+
private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
16+
{
17+
SelectedItemsList = SelectedItems;
18+
}
1919

20-
public IList SelectedItemsList
21-
{
22-
get => (IList)GetValue(SelectedItemsListProperty);
23-
set => SetValue(SelectedItemsListProperty, value);
24-
}
20+
public IList SelectedItemsList
21+
{
22+
get => (IList)GetValue(SelectedItemsListProperty);
23+
set => SetValue(SelectedItemsListProperty, value);
24+
}
2525

26-
public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectScrollingDataGrid), new PropertyMetadata(null));
26+
public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectScrollingDataGrid), new PropertyMetadata(null));
2727

28-
protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
29-
{
30-
if (e.NewItems == null)
31-
return;
28+
protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
29+
{
30+
if (e.NewItems == null)
31+
return;
3232

33-
var newItemCount = e.NewItems.Count;
33+
var newItemCount = e.NewItems.Count;
3434

35-
if (newItemCount > 0)
36-
ScrollIntoView(e.NewItems[newItemCount - 1]);
35+
if (newItemCount > 0)
36+
ScrollIntoView(e.NewItems[newItemCount - 1]);
3737

38-
base.OnItemsChanged(e);
39-
}
38+
base.OnItemsChanged(e);
4039
}
4140
}

‎Source/NETworkManager.Controls/ObservableSetCollection.cs‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,40 @@
22
using System.Collections.ObjectModel;
33

44

5-
namespace NETworkManager.Controls
6-
{
7-
public class ObservableSetCollection<T> : ObservableCollection<T>
8-
{
9-
public ObservableSetCollection()
10-
{
5+
namespace NETworkManager.Controls;
116

12-
}
7+
public class ObservableSetCollection<T> : ObservableCollection<T>
8+
{
9+
public ObservableSetCollection()
10+
{
1311

14-
public ObservableSetCollection(List<T> list) : base(list)
15-
{
12+
}
1613

17-
}
14+
public ObservableSetCollection(List<T> list) : base(list)
15+
{
1816

19-
public ObservableSetCollection(IEnumerable<T> collection) : base(collection)
20-
{
17+
}
2118

22-
}
19+
public ObservableSetCollection(IEnumerable<T> collection) : base(collection)
20+
{
2321

24-
protected override void InsertItem(int index, T item)
25-
{
26-
if (Contains(item))
27-
return; // Item already exists
22+
}
2823

29-
base.InsertItem(index, item);
30-
}
24+
protected override void InsertItem(int index, T item)
25+
{
26+
if (Contains(item))
27+
return; // Item already exists
28+
29+
base.InsertItem(index, item);
30+
}
3131

32-
protected override void SetItem(int index, T item)
33-
{
34-
int i = IndexOf(item);
32+
protected override void SetItem(int index, T item)
33+
{
34+
int i = IndexOf(item);
3535

36-
if (i >= 0 && i != index)
37-
return; // Item already exists
36+
if (i >= 0 && i != index)
37+
return; // Item already exists
3838

39-
base.SetItem(index, item);
40-
}
39+
base.SetItem(index, item);
4140
}
4241
}

‎Source/NETworkManager.Converters/AccentToStringConverter.cs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,40 @@
44
using NETworkManager.Localization.Translators;
55
using NETworkManager.Models.Appearance;
66

7-
namespace NETworkManager.Converters
7+
namespace NETworkManager.Converters;
8+
9+
/// <summary>
10+
/// Convert <see cref="AccentColorInfo"/> to translated <see cref="string"/> or wise versa.
11+
/// </summary>
12+
public sealed class AccentToStringConverter : IValueConverter
813
{
14+
915
/// <summary>
10-
/// Convert <see cref="AccentColorInfo"/> to translated <see cref="string"/> or wise versa.
16+
/// Convert <see cref="AccentColorInfo"/> to translated <see cref="string"/>.
1117
/// </summary>
12-
public sealed class AccentToStringConverter : IValueConverter
18+
/// <param name="value">Object from type <see cref="AccentColorInfo"/>.</param>
19+
/// <param name="targetType"></param>
20+
/// <param name="parameter"></param>
21+
/// <param name="culture"></param>
22+
/// <returns>Translated <see cref="AccentColorInfo"/>.</returns>
23+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
1324
{
25+
if (!(value is string accent))
26+
return "-/-";
1427

15-
/// <summary>
16-
/// Convert <see cref="AccentColorInfo"/> to translated <see cref="string"/>.
17-
/// </summary>
18-
/// <param name="value">Object from type <see cref="AccentColorInfo"/>.</param>
19-
/// <param name="targetType"></param>
20-
/// <param name="parameter"></param>
21-
/// <param name="culture"></param>
22-
/// <returns>Translated <see cref="AccentColorInfo"/>.</returns>
23-
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
24-
{
25-
if (!(value is string accent))
26-
return "-/-";
27-
28-
return AccentTranslator.GetInstance().Translate(accent);
29-
}
28+
return AccentTranslator.GetInstance().Translate(accent);
29+
}
3030

31-
/// <summary>
32-
/// !!! Method not implemented !!!
33-
/// </summary>
34-
/// <param name="value"></param>
35-
/// <param name="targetType"></param>
36-
/// <param name="parameter"></param>
37-
/// <param name="culture"></param>
38-
/// <returns></returns>
39-
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
40-
{
41-
throw new NotImplementedException();
42-
}
31+
/// <summary>
32+
/// !!! Method not implemented !!!
33+
/// </summary>
34+
/// <param name="value"></param>
35+
/// <param name="targetType"></param>
36+
/// <param name="parameter"></param>
37+
/// <param name="culture"></param>
38+
/// <returns></returns>
39+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
40+
{
41+
throw new NotImplementedException();
4342
}
4443
}

‎Source/NETworkManager.Converters/ApplicationNameToIconConverter.cs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,39 @@
44
using System.Windows.Data;
55
using NETworkManager.Models;
66

7-
namespace NETworkManager.Converters
7+
namespace NETworkManager.Converters;
8+
9+
/// <summary>
10+
/// Convert <see cref="ApplicationName"/> to icon (<see cref="Canvas"/>) or wise versa.
11+
/// </summary>
12+
public sealed class ApplicationNameToIconConverter : IValueConverter
813
{
914
/// <summary>
10-
/// Convert <see cref="ApplicationName"/> to icon (<see cref="Canvas"/>) or wise versa.
15+
/// Convert <see cref="ApplicationName"/> to icon (<see cref="Canvas"/>).
1116
/// </summary>
12-
public sealed class ApplicationNameToIconConverter : IValueConverter
17+
/// <param name="value">Object from type <see cref="ApplicationName"/>.</param>
18+
/// <param name="targetType"></param>
19+
/// <param name="parameter"></param>
20+
/// <param name="culture"></param>
21+
/// <returns>Icon (cref="Canvas"/>).</returns>
22+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
1323
{
14-
/// <summary>
15-
/// Convert <see cref="ApplicationName"/> to icon (<see cref="Canvas"/>).
16-
/// </summary>
17-
/// <param name="value">Object from type <see cref="ApplicationName"/>.</param>
18-
/// <param name="targetType"></param>
19-
/// <param name="parameter"></param>
20-
/// <param name="culture"></param>
21-
/// <returns>Icon (cref="Canvas"/>).</returns>
22-
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
23-
{
24-
if (!(value is ApplicationName name))
25-
return null;
24+
if (!(value is ApplicationName name))
25+
return null;
2626

27-
return ApplicationManager.GetIcon(name);
28-
}
29-
30-
/// <summary>
31-
/// !!! Method not implemented !!!
32-
/// </summary>
33-
/// <param name="value"></param>
34-
/// <param name="targetType"></param>
35-
/// <param name="parameter"></param>
36-
/// <param name="culture"></param>
37-
/// <returns></returns>
38-
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
39-
{
40-
throw new NotImplementedException();
41-
}
27+
return ApplicationManager.GetIcon(name);
28+
}
29+
30+
/// <summary>
31+
/// !!! Method not implemented !!!
32+
/// </summary>
33+
/// <param name="value"></param>
34+
/// <param name="targetType"></param>
35+
/// <param name="parameter"></param>
36+
/// <param name="culture"></param>
37+
/// <returns></returns>
38+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
39+
{
40+
throw new NotImplementedException();
4241
}
4342
}

‎Source/NETworkManager.Converters/ApplicationNameToTranslatedStringConverter.cs‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,39 @@
44
using System.Globalization;
55
using System.Windows.Data;
66

7-
namespace NETworkManager.Converters
7+
namespace NETworkManager.Converters;
8+
9+
/// <summary>
10+
/// Convert <see cref="ApplicationName"/> to translated <see cref="string"/> or wise versa.
11+
/// </summary>
12+
public sealed class ApplicationNameToTranslatedStringConverter : IValueConverter
813
{
914
/// <summary>
10-
/// Convert <see cref="ApplicationName"/> to translated <see cref="string"/> or wise versa.
15+
/// Convert <see cref="ApplicationName"/> to translated <see cref="string"/>.
1116
/// </summary>
12-
public sealed class ApplicationNameToTranslatedStringConverter : IValueConverter
17+
/// <param name="value">Object from type <see cref="ApplicationName"/>.</param>
18+
/// <param name="targetType"></param>
19+
/// <param name="parameter"></param>
20+
/// <param name="culture"></param>
21+
/// <returns>Translated <see cref="ApplicationName"/>.</returns>
22+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
1323
{
14-
/// <summary>
15-
/// Convert <see cref="ApplicationName"/> to translated <see cref="string"/>.
16-
/// </summary>
17-
/// <param name="value">Object from type <see cref="ApplicationName"/>.</param>
18-
/// <param name="targetType"></param>
19-
/// <param name="parameter"></param>
20-
/// <param name="culture"></param>
21-
/// <returns>Translated <see cref="ApplicationName"/>.</returns>
22-
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
23-
{
24-
if (!(value is ApplicationName name))
25-
return "-/-";
24+
if (!(value is ApplicationName name))
25+
return "-/-";
2626

27-
return ApplicationNameTranslator.GetInstance().Translate(name);
28-
}
29-
30-
/// <summary>
31-
/// !!! Method not implemented !!!
32-
/// </summary>
33-
/// <param name="value"></param>
34-
/// <param name="targetType"></param>
35-
/// <param name="parameter"></param>
36-
/// <param name="culture"></param>
37-
/// <returns></returns>
38-
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
39-
{
40-
throw new NotImplementedException();
41-
}
27+
return ApplicationNameTranslator.GetInstance().Translate(name);
28+
}
29+
30+
/// <summary>
31+
/// !!! Method not implemented !!!
32+
/// </summary>
33+
/// <param name="value"></param>
34+
/// <param name="targetType"></param>
35+
/// <param name="parameter"></param>
36+
/// <param name="culture"></param>
37+
/// <returns></returns>
38+
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
39+
{
40+
throw new NotImplementedException();
4241
}
4342
}

0 commit comments

Comments
 (0)