1.7.12

[New]
- Allow the user to set a default profile to be used when adding new applications #54

[Bug fixes]
- Profile selection wasn't possbile, if app name was too long.
- Duplicate priorities after removing an app

Author: Codectory

Source/Externals/CodectoryCore.UI.Wpf.dll

@@ -832,7 +832,7 @@
 
 
 
-        <local:EnumLocaleConverter x:Key="EnumLocaleConverter"/>
+        <corewpf:EnumLocaleConverter x:Key="EnumLocaleConverter"/>
         <corewpf:DialogService x:Key="DialogService" />
         <corewpf:DialogService x:Key="ProfileDialogService" />
         <corewpf:BitmapToBitmapImageConverter x:Key="BitmapToBitmapImageConverter"/>
@@ -875,6 +875,9 @@
         <DataTemplate DataType="{x:Type info:LogsStorage}">
             <views:AutoHDRLogsView></views:AutoHDRLogsView>
         </DataTemplate>
+        <DataTemplate x:Key="ProfileItemTemplate" DataType="Profile">
+            <TextBlock Text="{Binding Name }"/>
+        </DataTemplate>
     </Application.Resources>
 
 </Application>

Source/Externals/CodectoryCore.Windows.FileSystem.dll

@@ -193,7 +193,6 @@
     <Compile Include="Audio\AudioMasterChangedProvider.cs" />
     <Compile Include="Audio\VolumeProvider.cs" />
     <Compile Include="Displays\DisplayInterop.cs" />
-    <Compile Include="FastObservableCollection.cs" />
     <Compile Include="Globals.cs" />
     <Compile Include="Info\AutoHDRLicense.cs" />
     <Compile Include="Info\LogsStorage.cs" />
@@ -206,7 +205,6 @@
     <Compile Include="Info\AutoHDRInfo.cs" />
     <Compile Include="Info\Github\GitHubData.cs" />
     <Compile Include="Info\Github\GitHubIntegration.cs" />
-    <Compile Include="HDRProfileSettings.cs" />
     <Compile Include="Info\ReleaseEntry.cs" />
     <Compile Include="Profiles\Actions\IProfileAction.cs" />
     <Compile Include="Profiles\Actions\ListOfProfileActions.cs" />
@@ -219,7 +217,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Locale_Texts.resx</DependentUpon>
     </Compile>
-    <Compile Include="SortedObservableCollection.cs" />
     <Compile Include="Views\AudioActionView.xaml.cs">
       <DependentUpon>AudioActionView.xaml</DependentUpon>
     </Compile>
@@ -328,8 +325,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="EnumLocaleConverter.cs" />
-    <Compile Include="HDRActivationMode.cs" />
     <Compile Include="AutoHDRDaemon.cs" />
     <Compile Include="UserAppSettings.cs" />
     <Compile Include="Views\UserAppSettingsView.xaml.cs">

Source/Externals/CodectoryCore.Windows.dll

@@ -126,7 +126,7 @@ private void Initialize()
                     CheckForNewVersion();
                 InitializeDisplayManager();
                 InitializeAudioManager();
-                Globals.Instance.SaveSettings(); 
+                Globals.Instance.SaveSettings();
                 InitializeTrayMenuHelper();
                 CreateRelayCommands();
                 ShowView = !Settings.StartMinimizedToTray;
@@ -169,8 +169,8 @@ private void UpdateCurrentProfile(ApplicationItem application, ApplicationChange
 
                 if (profile == null)
                     return;
-                bool profileChanged =  Equals(profile, CurrentProfile);
-      
+                bool profileChanged = Equals(profile, CurrentProfile);
+
                 CurrentProfile = profile;
                 if (profileChanged)
                     Globals.Logs.Add($"Profile changed to {profile.Name}", false);
@@ -206,7 +206,7 @@ private void UpdateCurrentProfile(ApplicationItem application, ApplicationChange
                     CurrentProfile = null;
             }
         }
-        
+
         private void ActionLog(object sender, LogEntry entry)
         {
             Globals.Logs.AppendLogEntry(entry);
@@ -262,7 +262,7 @@ private void CreateRelayCommands()
             ActivateHDRCommand = new RelayCommand(DisplayManager.Instance.ActivateHDR);
             DeactivateHDRCommand = new RelayCommand(DisplayManager.Instance.DeactivateHDR);
             AddAssignmentCommand = new RelayCommand(AddAssignment);
-            EditApplicationCommand  = new RelayCommand<ApplicationProfileAssignment>(EditApplication);
+            EditApplicationCommand = new RelayCommand<ApplicationProfileAssignment>(EditApplication);
             RemoveAssignmentCommand = new RelayCommand<ApplicationProfileAssignment>(RemoveAssignment);
 
             MoveAssignmentUpCommand = new RelayCommand<ApplicationProfileAssignment>(MoveAssignmentUp);
@@ -307,6 +307,7 @@ private void LoadSettings()
         {
             Globals.Instance.LoadSettings();
             FixAssignments();
+            Globals.Instance.SaveSettings();
             Settings.ApplicationProfileAssignments.Sort(a => a.Position, ListSortDirection.Ascending);
             Settings.ApplicationProfileAssignments.CollectionChanged += ApplicationProfileAssigments_CollectionChanged;
             Settings.ApplicationProfiles.CollectionChanged += ApplicationProfiles_CollectionChanged;
@@ -317,9 +318,9 @@ private void LoadSettings()
             ApplicationProfileAssigments_CollectionChanged(
             Settings.ApplicationProfileAssignments, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Settings.ApplicationProfileAssignments.ToList()));
 
-            ApplicationProfiles_CollectionChanged( Settings.ApplicationProfiles, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Settings.ApplicationProfiles.ToList()));
+            ApplicationProfiles_CollectionChanged(Settings.ApplicationProfiles, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Settings.ApplicationProfiles.ToList()));
 
-            Monitors_CollectionChanged( Settings.Monitors, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Settings.Monitors.ToList()));
+            Monitors_CollectionChanged(Settings.Monitors, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, Settings.Monitors.ToList()));
 
 
             Globals.Logs.LogFileEnabled = Settings.CreateLogFile;
@@ -353,7 +354,7 @@ private void FixAssignments()
                         do
                         {
                             assignment.Position = assignment.Position - 1;
-                         } while (Settings.ApplicationProfileAssignments.Count(a => a.Position == assignment.Position) > 1);
+                        } while (Settings.ApplicationProfileAssignments.Count(a => a.Position == assignment.Position) > 1);
             }
         }
 
@@ -374,7 +375,7 @@ private void StartApplication(ApplicationItem application)
                 DisplayManager.Instance.ActivateHDR();
                 System.Threading.Thread.Sleep(2500);
                 application.StartApplication();
-               
+
             }
             catch (Exception ex)
             {
@@ -419,7 +420,7 @@ public void Start()
                 DisplayManager.Instance.StartMonitoring();
                 Globals.Logs.Add($"HDR Monitoring started", false);
                 Started = true;
-               // UpdateHDRModeBasedOnCurrentApplication();
+                // UpdateHDRModeBasedOnCurrentApplication();
             }
         }
 
@@ -451,7 +452,9 @@ private void AddAssignment()
             {
                 if (!Settings.ApplicationProfileAssignments.Any(pi => pi.Application.ApplicationFilePath == adder.ApplicationItem.ApplicationFilePath))
                 {
-                    ApplicationProfileAssignment.NewAssigment(adder.ApplicationItem);
+                   var assignment = ApplicationProfileAssignment.NewAssigment(adder.ApplicationItem);
+                    if (Settings.DefaultProfile != null)
+                        assignment.Profile = Settings.DefaultProfile;
                 }
                 Settings.ApplicationProfileAssignments.Sort(x => x.Position, System.ComponentModel.ListSortDirection.Ascending);
 
@@ -615,76 +618,86 @@ private void ProfileActions_CollectionChanged(object sender, NotifyCollectionCha
             Globals.Instance.SaveSettings();
         }
 
+        readonly object _lockAssignments = new object();
+
         private void ApplicationProfileAssigments_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            SortableObservableCollection<ApplicationProfileAssignment> collection = (SortableObservableCollection<ApplicationProfileAssignment>)sender;
-            switch (e.Action)
+            bool taken = Monitor.TryEnter(_lockAssignments);
+            if (!taken)
+                return;
+            try
             {
-                case NotifyCollectionChangedAction.Add:
-
-                    foreach (ApplicationProfileAssignment assignment in e.NewItems)
-                    {
+                SortableObservableCollection<ApplicationProfileAssignment> collection = (SortableObservableCollection<ApplicationProfileAssignment>)sender;
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
 
+                        foreach (ApplicationProfileAssignment assignment in e.NewItems)
+                        {
 
-                        Globals.Logs.Add($"Application added: {assignment.Application.ApplicationName}", false);
-                        assignment.PropertyChanged += SaveSettingsOnPropertyChanged;
-                        ApplicationWatcher.AddProcess(assignment.Application);
-                        assignment.Application.PropertyChanged += SaveSettingsOnPropertyChanged;
-                    }
-
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    foreach (ApplicationProfileAssignment assignment in e.OldItems)
-                    {
-                        Globals.Logs.Add($"Application removed: {assignment.Application.ApplicationName}", false);
-                        assignment.PropertyChanged -= SaveSettingsOnPropertyChanged;
 
+                            Globals.Logs.Add($"Application added: {assignment.Application.ApplicationName}", false);
+                            assignment.PropertyChanged += SaveSettingsOnPropertyChanged;
+                            ApplicationWatcher.AddProcess(assignment.Application);
+                            assignment.Application.PropertyChanged += SaveSettingsOnPropertyChanged;
+                        }
 
-                        int removedPosition = assignment.Position;
-                        foreach (ApplicationProfileAssignment a in collection)
+                        break;
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (ApplicationProfileAssignment assignment in e.OldItems)
                         {
-                            if (a.Position >= removedPosition)
-                                a.Position = a.Position - 1;
+                            Globals.Logs.Add($"Application removed: {assignment.Application.ApplicationName}", false);
+                            assignment.PropertyChanged -= SaveSettingsOnPropertyChanged;
+
+
+                            int removedPosition = assignment.Position;
+                            foreach (ApplicationProfileAssignment a in collection)
+                            {
+                                if (a.Position >= removedPosition)
+                                    a.Position = a.Position - 1;
+                            }
+                            ApplicationWatcher.RemoveProcess(assignment.Application);
+                            assignment.Application.PropertyChanged -= SaveSettingsOnPropertyChanged;
                         }
-                        ApplicationWatcher.RemoveProcess(assignment.Application);
-                        assignment.Application.PropertyChanged -= SaveSettingsOnPropertyChanged;
-                    }
 
-                    break;
-                case NotifyCollectionChangedAction.Move:
+                        break;
+                    case NotifyCollectionChangedAction.Move:
+                        int downFrom = e.NewStartingIndex;
+                        int upFrom = e.OldStartingIndex;
 
-                    int up, down, delta;
+                        if (e.OldStartingIndex == e.NewStartingIndex)
+                            break;
 
-                    if (e.OldStartingIndex < e.NewStartingIndex)
-                    {
-                        up = e.OldStartingIndex + 1;
-                        down = e.NewStartingIndex;
-                        delta = -1;
-                    }
-                    else
-                    {
-                        up = e.NewStartingIndex;
-                        down = e.OldStartingIndex - 1;
-                        delta = 1;
-                    }
 
-                    foreach (ApplicationProfileAssignment assingment in collection)
-                    {
-                        int position = assingment.Position;
-                        if (position == e.OldStartingIndex)
-                        {
-                            assingment.Position = e.NewStartingIndex;
-                        }
-                        else if (down <= position && position <= up)
+
+                        foreach (ApplicationProfileAssignment assingment in collection)
                         {
-                            assingment.Position = position + delta;
+                            int position = assingment.Position;
+                            if (position == e.OldStartingIndex)
+                            {
+                                assingment.Position = e.NewStartingIndex;
+                            }
+                            else if (e.OldStartingIndex > e.NewStartingIndex && position < e.OldStartingIndex && position >= e.NewStartingIndex)
+                            {
+                                assingment.Position = position + 1;
+                            }
+                            else if (e.OldStartingIndex < e.NewStartingIndex && position > e.OldStartingIndex && position <= e.NewStartingIndex)
+                            {
+                                assingment.Position = position - 1;
+                            }
                         }
-                    }
-                    break;
+
+                        break;
+                }
+                Globals.Instance.SaveSettings();
+            }
+            finally
+            {
+                if (taken)
+                    Monitor.Exit(_lockAssignments);
             }
-            Globals.Instance.SaveSettings();
         }
-       
+
 
 
         private void SaveSettingsOnPropertyChanged(object sender, PropertyChangedEventArgs e)