ApplicationProfileAssignemnt

Created new assignment feature

Author: Codectory

Source/Debug_Any/AutoHDR.exe

@@ -211,6 +211,12 @@
 
 
         <Style x:Key="DefaultCheckBox"  TargetType="{x:Type CheckBox}">
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="BorderBrush"  Value="{StaticResource DisabledAccentBrush}"></Setter>
+                </Trigger>
+            </Style.Triggers>
+
             <Setter Property="SnapsToDevicePixels"
           Value="true" />
             <Setter Property="OverridesDefaultStyle"
@@ -234,7 +240,7 @@
                                                 <SolidColorBrush Color="{DynamicResource GlyphColor}" />
                                             </Path.Stroke>
                                         </Path>
-                
+
                                     </Grid>
                                 </Border>
                             </BulletDecorator.Bullet>
@@ -255,10 +261,17 @@
                                                 Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
                                                 <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
                                             </ColorAnimationUsingKeyFrames>
-
                                         </Storyboard>
                                     </VisualState>
-                                    <VisualState x:Name="Disabled" />
+                                    <VisualState x:Name="Disabled">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
+                                                Storyboard.TargetProperty="(BorderBrush).(SolidColorBrush.Color)">
+                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledBorderDarkColor}" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+
                                 </VisualStateGroup>
                                 <VisualStateGroup x:Name="CheckStates">
                                     <VisualState x:Name="Checked">

Source/Debug_Any/de/AutoHDR.resources.dll

@@ -0,0 +1,92 @@
+using AutoHDR.Profiles;
+using CodectoryCore.UI.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoHDR
+{
+    public class ApplicationProfileAssignment : BaseViewModel
+    {
+        private int _position = -1;
+        private ApplicationItem _application = null;
+
+        private Profiles.Profile _profile = null;
+
+        private static SortableObservableCollection<ApplicationProfileAssignment> Assignments => Globals.Instance.Settings.ApplicationProfileAssignments;
+
+        public ApplicationItem Application { get => _application; set { _application = value; OnPropertyChanged(); }
+        }
+
+        public Profile Profile { get => _profile; set { _profile = value; OnPropertyChanged(); } }
+
+        public int Position { get => _position;  set { _position = value; OnPropertyChanged(); } }
+
+
+        private ApplicationProfileAssignment()
+        {
+
+        }
+
+        private ApplicationProfileAssignment(ApplicationItem application)
+        {
+            Application = application;
+        }
+
+        public void RemoveAssignment()
+        {
+            int removedPosition = Position;
+            foreach (ApplicationProfileAssignment a in Assignments)
+            {
+                if (a.Position >= removedPosition)
+                    a.Position = a.Position - 1;
+            }
+            Assignments.Remove(this);
+            Assignments.Sort(x => x.Position, System.ComponentModel.ListSortDirection.Ascending);
+
+        }
+
+        public void ChangePosition(bool up)
+        {
+            int newPosition = up ? Position - 1 : Position + 1;
+            if (Assignments.Any(x => x.Position == newPosition))
+            {
+                Assignments.First(x => x.Position == newPosition).Position = up ? newPosition + 1 : newPosition - 1;
+            }
+            Position = newPosition;
+            Assignments.Sort(x => x.Position, System.ComponentModel.ListSortDirection.Ascending);
+
+
+        }
+
+
+
+        public static ApplicationProfileAssignment NewAssigment(ApplicationItem application)
+        {
+            ApplicationProfileAssignment assigment = new ApplicationProfileAssignment(application);
+            assigment.Position = GetNextPosition();
+            Assignments.Add(assigment);
+            Assignments.Sort(x => x.Position, System.ComponentModel.ListSortDirection.Ascending);
+
+            return assigment;
+        }
+
+
+        private static int GetNextPosition()
+        {
+            int position = 0;
+            while (Assignments.Any(x => x.Position == position))
+            {
+                position++;
+            }
+            return position;
+        }
+
+
+
+    }
+    
+}

Source/HDRProfile/App.xaml

@@ -175,6 +175,7 @@
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="ApplicationChangedEventArgs.cs" />
+    <Compile Include="ApplicationProfileAssignment.cs" />
     <Compile Include="Globals.cs" />
     <Compile Include="Profiles\Actions\ActionEndResult.cs" />
     <Compile Include="Profiles\Actions\BaseProfileAction.cs" />
@@ -190,6 +191,7 @@
     <Compile Include="Profiles\Actions\ProfileActionAdder.cs" />
     <Compile Include="Profiles\Profile.cs" />
     <Compile Include="Profiles\ProfileMode.cs" />
+    <Compile Include="SortedObservableCollection.cs" />
     <Compile Include="Views\ApplicationActionView.xaml.cs">
       <DependentUpon>ApplicationActionView.xaml</DependentUpon>
     </Compile>

Source/HDRProfile/ApplicationProfileAssignment.cs

@@ -9,7 +9,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -41,8 +40,8 @@ public class AutoHDRDaemon : BaseViewModel
 
         public RelayCommand ActivateHDRCommand { get; private set; }
         public RelayCommand DeactivateHDRCommand { get; private set; }
-        public RelayCommand AddApplicationCommand { get; private set; }
-        public RelayCommand<ApplicationItem> RemoveApplicationCommand { get; private set; }
+        public RelayCommand AddAssignmentCommand { get; private set; }
+        public RelayCommand<ApplicationProfileAssignment> RemoveAssignmentCommand { get; private set; }
 
         public RelayCommand AddProfileCommand { get; private set; }
         public RelayCommand<Profile> RemoveProfileCommand { get; private set; }
@@ -224,8 +223,8 @@ private void CreateRelayCommands()
         {
             ActivateHDRCommand = new RelayCommand(MonitorManager.ActivateHDR);
             DeactivateHDRCommand = new RelayCommand(MonitorManager.DeactivateHDR);
-            AddApplicationCommand = new RelayCommand(AddAplication);
-            RemoveApplicationCommand = new RelayCommand<ApplicationItem>(RemoveApplication);
+            AddAssignmentCommand = new RelayCommand(AddAssignment);
+            RemoveAssignmentCommand = new RelayCommand<ApplicationProfileAssignment>(RemoveAssignment);
             AddProfileCommand = new RelayCommand(AddProfile);
             RemoveProfileCommand = new RelayCommand<Profile>(RemoveProfile);
 
@@ -265,12 +264,12 @@ private void LoadSettings()
         {
             Globals.Instance.LoadSettings();
 
-            Settings.ApplicationItems.CollectionChanged += ApplicationItems_CollectionChanged;
+            Settings.ApplicationProfileAssignments.CollectionChanged += ApplicationProfileAssigments_CollectionChanged;
             Settings.PropertyChanged += Settings_PropertyChanged;
-            foreach (var application in Settings.ApplicationItems)
+            foreach (var assignment in Settings.ApplicationProfileAssignments)
             {
-                ApplicationWatcher.AddProcess(application);
-                application.PropertyChanged += ApplicationItem_PropertyChanged;
+                ApplicationWatcher.AddProcess(assignment.Application);
+                assignment.Application.PropertyChanged += ApplicationItem_PropertyChanged;
             }
             Tools.Logs.Add("Settings loaded", false);
         }
@@ -384,27 +383,27 @@ public void Stop()
 
         #region Process handling
 
-        private void ApplicationItems_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void ApplicationProfileAssigments_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             lock (_accessLock)
             {
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        foreach (var applicationItem in e.NewItems)
+                        foreach (var assignment in e.NewItems)
                         {
-                            Tools.Logs.Add($"Application added: {((ApplicationItem)applicationItem).ApplicationName}", false);
-                            ApplicationWatcher.AddProcess(((ApplicationItem)applicationItem));
-                            ((ApplicationItem)applicationItem).PropertyChanged += ApplicationItem_PropertyChanged;
+                            Tools.Logs.Add($"Application added: {((ApplicationProfileAssignment)assignment).Application.ApplicationName}", false);
+                            ApplicationWatcher.AddProcess(((ApplicationProfileAssignment)assignment).Application);
+                            ((ApplicationProfileAssignment)assignment).PropertyChanged += ApplicationItem_PropertyChanged;
                         }
 
                         break;
                     case NotifyCollectionChangedAction.Remove:
-                        foreach (var applicationItem in e.OldItems)
+                        foreach (var assignment in e.OldItems)
                         {
-                            Tools.Logs.Add($"Application removed: {((ApplicationItem)applicationItem).ApplicationName}", false);
-                            ApplicationWatcher.RemoveProcess(((ApplicationItem)applicationItem));
-                            ((ApplicationItem)applicationItem).PropertyChanged -= ApplicationItem_PropertyChanged;
+                            Tools.Logs.Add($"Application removed: {((ApplicationProfileAssignment)assignment).Application.ApplicationName}", false);
+                            ApplicationWatcher.RemoveProcess(((ApplicationProfileAssignment)assignment).Application);
+                            ((ApplicationProfileAssignment)assignment).PropertyChanged -= ApplicationItem_PropertyChanged;
 
                         }
                         break;
@@ -425,23 +424,25 @@ private void ApplicationItem_PropertyChanged(object sender, PropertyChangedEvent
             SaveSettings();
         }
 
-        private void AddAplication()
+        private void AddAssignment()
         {
             ApplicationAdder adder = new ApplicationAdder();
             adder.DialogService = DialogService;
             adder.OKClicked += (o, e) =>
             {
-                if (!Settings.ApplicationItems.Any(pi => pi.ApplicationFilePath == adder.ApplicationItem.ApplicationFilePath))
-                    Settings.ApplicationItems.Add(adder.ApplicationItem);
+                if (!Settings.ApplicationProfileAssignments.Any(pi => pi.Application.ApplicationFilePath == adder.ApplicationItem.ApplicationFilePath))
+                {
+                    ApplicationProfileAssignment.NewAssigment(adder.ApplicationItem);
+                }
             };
             if (DialogService != null)
                 DialogService.ShowDialogModal(adder, new System.Drawing.Size(640, 450));
         }
 
 
-        private void RemoveApplication(ApplicationItem process)
+        private void RemoveAssignment(ApplicationProfileAssignment process)
         {
-            Settings.ApplicationItems.Remove(process);
+            Settings.ApplicationProfileAssignments.Remove(process);
 
         }
 

Source/HDRProfile/AutoHDR.csproj

@@ -19,9 +19,12 @@ public  class Globals : BaseViewModel
 
         private UserAppSettings _settings;
         public UserAppSettings Settings { get => _settings; set { _settings = value; OnPropertyChanged(); } }
+        private bool _settingsLoadedOnce = false;
 
         public void SaveSettings()
         {
+            if (!_settingsLoadedOnce)
+                return;
             Tools.Logs.Add("Saving settings..", false);
             try
             {
@@ -43,17 +46,20 @@ public void LoadSettings()
                 {
                     Tools.Logs.Add("Loading settings...", false);
                     Settings = UserAppSettings.ReadSettings(SettingsPath);
+                    _settingsLoadedOnce = true;
                 }
                 else if (File.Exists(SettingsPathCompatible))
                 {
                     Tools.Logs.Add("Loading settings...", false);
                     Settings = UserAppSettings.Convert(HDRProfileSettings.ReadSettings(SettingsPathCompatible));
+                    _settingsLoadedOnce = true;
                     File.Delete(SettingsPathCompatible);
                 }
                 else
                 {
                     Tools.Logs.Add("Creating settings file", false);
                     Settings = new UserAppSettings();
+                    _settingsLoadedOnce = true;
                     SaveSettings();
                 }
             }

Source/HDRProfile/AutoHDRDaemon.cs

@@ -58,6 +58,7 @@ public Profile()
 
         private void Profile_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
+
             Globals.Instance.SaveSettings();
         }
 
@@ -171,5 +172,10 @@ public void RemoveProfileAction(ProfileActionListType listType, IProfileAction p
             }
 
         }
+
+        public override string ToString()
+        {
+            return Name;
+        }
     }
 }

Source/HDRProfile/Globals.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutoHDR
+{
+    public class SortableObservableCollection<T> : ObservableCollection<T>
+    {
+        public SortableObservableCollection(List<T> list)
+           : base(list)
+        {
+        }
+
+        public SortableObservableCollection(IEnumerable<T> collection)
+           : base(collection)
+        {
+        }
+
+        public void Sort<TKey>(Func<T, TKey> keySelector, System.ComponentModel.ListSortDirection direction)
+        {
+            switch (direction)
+            {
+                case System.ComponentModel.ListSortDirection.Ascending:
+                    {
+                        ApplySort(Items.OrderBy(keySelector));
+                        break;
+                    }
+                case System.ComponentModel.ListSortDirection.Descending:
+                    {
+                        ApplySort(Items.OrderByDescending(keySelector));
+                        break;
+                    }
+            }
+        }
+
+        public void Sort<TKey>(Func<T, TKey> keySelector, IComparer<TKey> comparer)
+        {
+            ApplySort(Items.OrderBy(keySelector, comparer));
+        }
+
+        private void ApplySort(IEnumerable<T> sortedItems)
+        {
+            var sortedItemsList = sortedItems.ToList();
+
+            foreach (var item in sortedItemsList)
+            {
+                Move(IndexOf(item), sortedItemsList.IndexOf(item));
+            }
+        }
+    }
+}