+ Added skill profiles

panthernet · panthernet · commit 0de9312e3013 · 2022-02-13T14:43:22.000+03:00
+ Fixed select key values
diff --git a/D2RSO/Classes/Data/SkillDataItem.cs b/D2RSO/Classes/Data/SkillDataItem.cs
@@ -21,6 +21,11 @@ public class SkillDataItem: INotifyPropertyChanged
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// Profile id for this skill item
+        /// </summary>
+        public int ProfileId { get; set; }
+
         /// <summary>
         /// File path for the image icon
         /// </summary>
@@ -43,7 +48,7 @@ public string IconFileName
         /// <summary>
         /// Stores key to select skill in game
         /// </summary>
-        public string SelectKey { get; set; }
+        public DataClass.KeyEntry SelectKey { get; set; }
         /// <summary>
         /// Stores key to activate skill in game
         /// </summary>
@@ -55,7 +60,7 @@ public string IconFileName
         public bool SkillKeyPressed()
         {
             //initial state with no select key
-            if (_state == 0 && string.IsNullOrEmpty(SelectKey))
+            if (_state == 0 && SelectKey == null)
                 return true;
             //already pressed select
             if (_state == 1)
diff --git a/D2RSO/Classes/Data/TrackerProfile.cs b/D2RSO/Classes/Data/TrackerProfile.cs
@@ -0,0 +1,8 @@
+﻿namespace D2RSO.Classes.Data
+{
+    public class TrackerProfile
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/D2RSO/Classes/DataClass.cs b/D2RSO/Classes/DataClass.cs
@@ -20,6 +20,8 @@ public class KeyEntry
             public string Name { get; set; }
             public string Code { get; set; }
 
+            public KeyEntry() {}
+
             public KeyEntry(string key)
             {
                 Name = Code = key;
diff --git a/D2RSO/Classes/SettingsClass.cs b/D2RSO/Classes/SettingsClass.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using D2RSO.Classes.Data;
 using Newtonsoft.Json;
@@ -36,11 +37,21 @@ public bool IsTrackerVertical
             set { _isTrackerVertical = value; OnPropertyChanged(); }
         }
 
+        /// <summary>
+        /// Last selected profile Id to load profile when the app starts
+        /// </summary>
+        public int LastSelectedProfileId { get; set; }
+
         /// <summary>
         /// Skills data collection
         /// </summary>
         public ObservableCollection<SkillDataItem> SkillItems { get; set; } = new();
 
+        /// <summary>
+        /// Skill profiles collection
+        /// </summary>
+        public ObservableCollection<TrackerProfile> Profiles { get; set; } = new();
+
         /// <summary>
         /// Tracker window X position coordinate
         /// </summary>
@@ -97,16 +108,21 @@ public void Save()
         /// <param name="filePath">File path</param>
         public static SettingsClass Load(string filePath)
         {
+            SettingsClass result;
             try
             {
-                return File.Exists(filePath)
+                result = File.Exists(filePath)
                     ? JsonConvert.DeserializeObject<SettingsClass>(File.ReadAllText(filePath))
                     : new SettingsClass();
             }
             catch
             {
-                return new SettingsClass();
+                result = new SettingsClass();
             }
+
+            if (!result.Profiles.Any()) result.Profiles.Add(new TrackerProfile {Id = 0, Name = "Default"});
+
+            return result;
         }
 
         /// <summary>
diff --git a/D2RSO/Classes/SimpleAsyncCommand.cs b/D2RSO/Classes/SimpleAsyncCommand.cs
@@ -0,0 +1,63 @@
+﻿using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace D2RSO.Classes
+{
+    public sealed class SimpleAsyncCommand : ICommand
+    {
+        public Func<object, Task<bool>> CanExecuteDelegate { get; set; }
+        public Func<object, bool> CanExecuteDelegateEx { get; set; }
+        public Func<object, Task> ExecuteDelegate { get; set; }
+
+        public SimpleAsyncCommand(Func<object, Task<bool>> can, Func<object, Task> ex)
+        {
+            CanExecuteDelegate = can;
+            ExecuteDelegate = ex;
+        }
+
+        public SimpleAsyncCommand(Func<object, bool> can, Func<object, Task> ex)
+        {
+            CanExecuteDelegateEx = can;
+            ExecuteDelegate = ex;
+        }
+
+        #region ICommand Members
+
+        public bool CanExecute()
+        {
+            return CanExecute(null);
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            if(CanExecuteDelegateEx != null)
+                return CanExecuteDelegateEx(parameter);
+
+            return CanExecuteDelegate == null || CanExecuteDelegate(parameter).GetAwaiter().GetResult();
+        }
+
+        public event EventHandler Executed;
+
+        public event EventHandler CanExecuteChanged
+        {
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
+        }
+
+        public void Execute()
+        {
+            Execute(null);
+        }
+
+        public void Execute(object parameter)
+        {
+            if (ExecuteDelegate == null) return;
+            ExecuteDelegate(parameter).GetAwaiter().GetResult();
+            if (Executed != null)
+                Executed(this, null);
+        }
+
+        #endregion
+    }
+}
diff --git a/D2RSO/Classes/SimpleCommand.cs b/D2RSO/Classes/SimpleCommand.cs
@@ -0,0 +1,52 @@
+﻿using System;
+using System.Windows.Input;
+
+namespace D2RSO.Classes
+{
+    public sealed class SimpleCommand : ICommand
+    {
+        public Predicate<object> CanExecuteDelegate { get; set; }
+        public Action<object> ExecuteDelegate { get; set; }
+
+        public SimpleCommand(Predicate<object> can, Action<object> ex)
+        {
+            CanExecuteDelegate = can;
+            ExecuteDelegate = ex;
+        }
+
+        #region ICommand Members
+
+        public bool CanExecute()
+        {
+            return CanExecute(null);
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return CanExecuteDelegate == null || CanExecuteDelegate(parameter);
+        }
+
+        public event EventHandler Executed;
+
+        public event EventHandler CanExecuteChanged
+        {
+            add => CommandManager.RequerySuggested += value;
+            remove => CommandManager.RequerySuggested -= value;
+        }
+
+        public void Execute()
+        {
+            Execute(null);
+        }
+
+        public void Execute(object parameter)
+        {
+            if (ExecuteDelegate == null) return;
+            ExecuteDelegate(parameter);
+            if (Executed != null)
+                Executed(this, null);
+        }
+
+        #endregion
+    }
+}
diff --git a/D2RSO/Controls/OptionsDialog.xaml b/D2RSO/Controls/OptionsDialog.xaml
@@ -22,13 +22,19 @@
 				<RowDefinition Height="Auto"/>
 				<RowDefinition Height="Auto"/>
 				<RowDefinition Height="Auto"/>
+				<RowDefinition Height="Auto"/>
 			</Grid.RowDefinitions>
 			<CheckBox Content="Insert tracker icons on the left" IsChecked="{Binding Source={x:Static d2Rso:App.Settings}, Path=IsTrackerInsertToLeft}" Grid.Row="0" Margin="5" ToolTip="Insert new icons from the left edge instead of adding to the right"/>
 			<CheckBox Content="Vertical tracker" IsChecked="{Binding Source={x:Static d2Rso:App.Settings}, Path=IsTrackerVertical}" Grid.Row="1" Margin="5" ToolTip="Position icons vertically instead of horizontally"/>
 			<CheckBox Content="Show digits in tracker" IsChecked="{Binding Source={x:Static d2Rso:App.Settings}, Path=ShowDigitsInTracker}" Grid.Row="2" Margin="5" ToolTip="Show or hide timer digits beside the icon"/>
 			<CheckBox Content="Start tracking on app launch" IsChecked="{Binding Source={x:Static d2Rso:App.Settings}, Path=StartTrackerOnAppRun}" Grid.Row="3" Margin="5" ToolTip="Show or hide timer digits beside the icon"/>
 
-			<StackPanel Orientation="Horizontal" Grid.Row="4">
+			<StackPanel Orientation="Horizontal"  Grid.Row="4">
+				<Label HorizontalAlignment="Center" Content="Tracker Size"/>
+				<Slider Minimum="5" Maximum="19" Value="10" Interval="1" Margin="3" ValueChanged="Scaler_OnValueChanged" Width="130" x:Name="TrackerSlider"/>
+			</StackPanel>
+
+			<StackPanel Orientation="Horizontal" Grid.Row="5">
 				<Label Content="Enable reddish icon (sec)" VerticalAlignment="Center" ToolTip="Icon becomes red when specified number of seconds left on the timer"/>
 				<TextBox Text="{Binding Source={x:Static d2Rso:App.Settings}, Path=RedTrackerOverlaySec, Mode=TwoWay}" Width="50" Margin="5"/>
 			</StackPanel>
diff --git a/D2RSO/Controls/OptionsDialog.xaml.cs b/D2RSO/Controls/OptionsDialog.xaml.cs
@@ -1,7 +1,5 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
-using MahApps.Metro.Controls;
-using MahApps.Metro.Controls.Dialogs;
 
 namespace D2RSO.Controls
 {
@@ -13,6 +11,14 @@ public partial class OptionsDialog : UserControl
         public OptionsDialog()
         {
             InitializeComponent();
+
+            TrackerSlider.Value = App.Settings.FormScaleX * 10;
+        }
+
+        private void Scaler_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            App.Settings.FormScaleX = e.NewValue / 10;
+            App.Settings.FormScaleY = e.NewValue / 10;
         }
     }
 }
diff --git a/D2RSO/MainWindow.xaml b/D2RSO/MainWindow.xaml
@@ -9,9 +9,9 @@
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance local:MainWindow}"
         WindowStartupLocation="CenterScreen"
-        ResizeMode="NoResize"
+        ResizeMode="CanResize"
         GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
-        Title="D2R Skill Overlay" Height="450" Width="440">
+        Title="D2R Skill Overlay" Height="450" Width="450" MinWidth="450" MinHeight="400">
 	<mah:MetroWindow.RightWindowCommands>
 		<mah:WindowCommands>
 			<Button Content="Get help" Click="SupportButton_OnClick"/>
@@ -35,6 +35,8 @@
 
 	<Grid>
         <Grid.RowDefinitions>
+			<RowDefinition Height="Auto"/>
+			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="Auto"/>
 			<RowDefinition Height="*"/>
 			<RowDefinition Height="Auto"/>
@@ -50,12 +52,12 @@
 
 
 		<StackPanel Orientation="Horizontal">
-			<Button Margin="5" Height="35" Width="35" Background="{StaticResource MahApps.Brushes.Window.Background}"
-			        Padding="3" Click="AddSkillButton_OnClick" IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-			        ToolTip="Add new skill">
+			<!--<Button Margin="5" Height="35" Width="35" Background="{StaticResource MahApps.Brushes.Window.Background}"
+			        Padding="3" IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+			        ToolTip="Add new skill" Command="{Binding AddSkillCommand}">
 				<Path Data="M19,6H22V8H19V11H17V8H14V6H17V3H19V6M17,17V14H19V19H3V6H11V8H5V17H17Z" Fill="{StaticResource MahApps.Brushes.IdealForeground}"
 				      Stretch="Uniform"/>
-			</Button>
+			</Button>-->
 			<Button Margin="5" Height="35" Width="35" Background="{StaticResource MahApps.Brushes.Window.Background}"
 			        Padding="3" Click="EyeButton_OnClick" IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
 			        ToolTip="Show/Hide overlay preview">
@@ -95,10 +97,10 @@
 					</Path.Style>
 				</Path>
 			</Button>
-			<StackPanel Orientation="Vertical">
+			<!--<StackPanel Orientation="Vertical">
 				<Label HorizontalAlignment="Center" Content="Tracker Size"/>
 				<Slider Minimum="5" Maximum="19" Value="10" Interval="1" Margin="3" ValueChanged="Scaler_OnValueChanged" Width="130" x:Name="TrackerSlider"/>
-			</StackPanel>
+			</StackPanel>-->
 		</StackPanel>
 
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
@@ -117,8 +119,31 @@
 			</Button>
 		</StackPanel>
 
-		<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-			<ItemsControl  Margin="5" ItemsSource="{Binding Source={x:Static local:App.Settings}, Path=SkillItems , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay }" Background="Transparent"
+		<DockPanel Grid.Row="1" IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}">
+			<Label HorizontalAlignment="Center" Content="Profile" DockPanel.Dock="Left"/>
+			<Button Margin="3" Height="25" Width="25" Background="{StaticResource MahApps.Brushes.Window.Background}"
+			        Padding="3" ToolTip="Remove profile" Command="{Binding RemoveProfileCommand}" DockPanel.Dock="Right">
+				<Path Data="M14.12,10.47L12,12.59L9.87,10.47L8.46,11.88L10.59,14L8.47,16.12L9.88,17.53L12,15.41L14.12,17.53L15.53,16.12L13.41,14L15.53,11.88L14.12,10.47M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8,9H16V19H8V9Z" Fill="{StaticResource MahApps.Brushes.IdealForeground}"
+				      Stretch="Uniform"/>
+			</Button>
+
+			<Button Margin="3" Height="25" Width="25" Background="{StaticResource MahApps.Brushes.Window.Background}"
+			        Padding="3" ToolTip="Add new profile" Command="{Binding AddProfileCommand}" DockPanel.Dock="Right">
+				<Path Data="M12 12H14V10H16V12H18V14H16V16H14V14H12V12M22 8V18C22 19.11 21.11 20 20 20H4C2.89 20 2 19.11 2 18V6C2 4.89 2.89 4 4 4H10L12 6H20C21.11 6 22 6.89 22 8M20 8H4V18H20V8Z" Fill="{StaticResource MahApps.Brushes.IdealForeground}"
+				      Stretch="Uniform"/>
+			</Button>
+			<ComboBox Margin="3" DisplayMemberPath="Name" SelectedValuePath="Id" IsEditable="False"
+			          SelectedItem="{Binding Profile, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+			          ItemsSource="{Binding Source={x:Static local:App.Settings}, Path=Profiles , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+		</DockPanel>
+
+		<Button Content="Add new Skill" Grid.Row="2" Width="150" Height="25"
+		        Margin="3" Background="{StaticResource MahApps.Brushes.Window.Background}"
+		        Padding="3" IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+		        ToolTip="Add new skill" Command="{Binding AddSkillCommand}"></Button>
+
+		<ScrollViewer Grid.Row="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+			<ItemsControl  Margin="5" ItemsSource="{Binding SelectedSkillItems, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay }" Background="Transparent"
 		               IsEnabled="{Binding IsNotPlaying, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}">
 				<ItemsControl.ItemTemplate>
 					<DataTemplate>
@@ -158,7 +183,7 @@
 										<RowDefinition Height="Auto"/>
 									</Grid.RowDefinitions>
 									<Label Content="Select Key" Margin="5"/>
-									<ComboBox Grid.Row="1" SelectedItem="{Binding SelectKey, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" ItemsSource="{Binding Source={x:Static local:App.Data}, Path=AvailableKeys}" />
+									<ComboBox Grid.Row="1" SelectedItem="{Binding SelectKey, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" ItemsSource="{Binding Source={x:Static local:App.Data}, Path=AvailableKeys}" DisplayMemberPath="Name" SelectedValuePath="Code" />
 								</Grid>
 								<Grid>
 									<Grid.RowDefinitions>
@@ -194,7 +219,7 @@
 			</ItemsControl>
 		</ScrollViewer>
 
-		<Border Grid.Row="2" BorderBrush="{StaticResource MahApps.Brushes.AccentBase}" BorderThickness="0,1,0,0">
+		<Border Grid.Row="4" BorderBrush="{StaticResource MahApps.Brushes.AccentBase}" BorderThickness="0,1,0,0">
 			<StackPanel Orientation="Vertical">
 				<TextBlock HorizontalAlignment="Center" Padding="0">Open-source project by <Hyperlink NavigateUri="https://github.com/panthernet" Click="Hyperlink_OnClick">panthernet software</Hyperlink></TextBlock>
 				<Label Padding="1,0,1,1" HorizontalAlignment="Center" Content="Diablo II: Resurrected is a registred trademark of © BLIZZARD ENTERTAINMENT, INC." FontSize="8"/>
diff --git a/D2RSO/MainWindow.xaml.cs b/D2RSO/MainWindow.xaml.cs
diff --git a/D2RSO/version.txt b/D2RSO/version.txt

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public class KeyEntry`
`20`	`20`	`public string Name { get; set; }`
`21`	`21`	`public string Code { get; set; }`
`22`	`22`
	`23`	`+ public KeyEntry() {}`
	`24`	`+`
`23`	`25`	`public KeyEntry(string key)`
`24`	`26`	`{`
`25`	`27`	`Name = Code = key;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System.Windows;`
`2`	`2`	`using System.Windows.Controls;`
`3`		`-using MahApps.Metro.Controls;`
`4`		`-using MahApps.Metro.Controls.Dialogs;`
`5`	`3`
`6`	`4`	`namespace D2RSO.Controls`
`7`	`5`	`{`
`@@ -13,6 +11,14 @@ public partial class OptionsDialog : UserControl`
`13`	`11`	`public OptionsDialog()`
`14`	`12`	`{`
`15`	`13`	`InitializeComponent();`
	`14`	`+`
	`15`	`+ TrackerSlider.Value = App.Settings.FormScaleX * 10;`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ private void Scaler_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)`
	`19`	`+ {`
	`20`	`+ App.Settings.FormScaleX = e.NewValue / 10;`
	`21`	`+ App.Settings.FormScaleY = e.NewValue / 10;`
`16`	`22`	`}`
`17`	`23`	`}`
`18`	`24`	`}`