Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Part 2 of the move to a single ProfileItem

Browse Source 
Mostly works now! Only bit still needing work is the Avtive profile detection to detect the non-surround profile when we return from surround. I think it's to do with the windows display number changing :(. I need to check that.
This commit is contained in:
Terry MacDonald 2021-09-07 22:08:54 +12:00
parent f8e9eecf81
commit fef3dbf1e0
3 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DisplayMagician/UIForms/DisplayProfileForm.cs
View File

@ -202,7 +202,7 @@ namespace DisplayMagician.UIForms
// if the item was removed from the list during this // if the item was removed from the list during this
// list refresh, then we select this profile only if it // list refresh, then we select this profile only if it
// is the currently used Profile // is the currently used Profile
if (ProfileRepository.IsActiveProfile(_selectedProfile)) if (profile.Equals(_selectedProfile))
newItem.Selected = true; newItem.Selected = true;
// Add it to the list! // Add it to the list!

11
DisplayMagicianShared/ProfileItem.cs
View File

@ -522,10 +522,13 @@ namespace DisplayMagicianShared
} }
} }
public virtual bool PerformPostLoadingTasks() /*public bool PerformPostLoadingTasks()
{ {
return false; // First thing we do is to set up the Screens
} //_screens = GetScreenPositions();
return true;
}*/
// ReSharper disable once FunctionComplexityOverflow // ReSharper disable once FunctionComplexityOverflow
@ -1474,7 +1477,6 @@ namespace DisplayMagicianShared
// Check the object fields // Check the object fields
// ProfileDisplayIdentifiers may be the same but in different order within the array, so we need to handle // ProfileDisplayIdentifiers may be the same but in different order within the array, so we need to handle
// that fact. // that fact.
int ourMatchedIds = 0;
return NVIDIADisplayConfig.Equals(other.NVIDIADisplayConfig) && return NVIDIADisplayConfig.Equals(other.NVIDIADisplayConfig) &&
//AMDDisplayConfig.Equals(other.AMDDisplayConfig) && //AMDDisplayConfig.Equals(other.AMDDisplayConfig) &&
WindowsDisplayConfig.Equals(other.WindowsDisplayConfig) && WindowsDisplayConfig.Equals(other.WindowsDisplayConfig) &&
@ -1489,6 +1491,7 @@ namespace DisplayMagicianShared
if (ReferenceEquals(this, obj)) return true; if (ReferenceEquals(this, obj)) return true;
// If different types then can't be true // If different types then can't be true
if (obj.GetType() == this.GetType()) return false; if (obj.GetType() == this.GetType()) return false;
if (!(obj is ProfileItem)) return false;
// Check the object fields as this must the same object as obj, and we need to test in more detail // Check the object fields as this must the same object as obj, and we need to test in more detail
return Equals((ProfileItem) obj); return Equals((ProfileItem) obj);
} }

39
DisplayMagicianShared/ProfileRepository.cs
View File

@ -706,41 +706,14 @@ namespace DisplayMagicianShared
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Finding the current profile in the Profile Repository"); SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Finding the current profile in the Profile Repository");
/*// Go through all the profiles and set up the needed structures (such as the Screens list) // Go through all the profiles and set up the needed structures (such as the Screens list)
// and check if the current profile is used // and check if the current profile is used
foreach (ProfileItem loadedProfile in _allProfiles) /*foreach (ProfileItem loadedProfile in _allProfiles)
{ {
if (loadedProfile.VideoMode == VIDEO_MODE.NVIDIA) SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is a NVIDIA Profile");
{ loadedProfile.PerformPostLoadingTasks();
// NVIDIA config! *//*if (ProfileRepository.IsActiveProfile(loadedProfile))
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is a NVIDIA Profile"); _currentProfile = loadedProfile;*//*
NVIDIAProfileItem nvidiaLoadedProfile = (NVIDIAProfileItem)loadedProfile;
nvidiaLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(nvidiaLoadedProfile))
_currentProfile = nvidiaLoadedProfile;
}
else if (loadedProfile is AMDProfileItem)
{
// AMD config!
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is an AMD Profile");
AMDProfileItem amdLoadedProfile = (AMDProfileItem) loadedProfile;
amdLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(amdLoadedProfile))
_currentProfile = amdLoadedProfile;
}
else if (loadedProfile is WinProfileItem)
{
// Windows CCD config!
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is a Windows Profile");
WinProfileItem winLoadedProfile = (WinProfileItem)loadedProfile;
winLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(winLoadedProfile))
_currentProfile = winLoadedProfile;
}
else
{
SharedLogger.logger.Error($"ProfileRepository/LoadProfiles: ERROR - Profile {loadedProfile.Name} is not a recognised profile!");
}
}*/ }*/
// Sort the profiles alphabetically // Sort the profiles alphabetically