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

Changed shortcut cancellation logic

Browse Source
This commit is contained in:
Terry MacDonald 2021-03-28 20:25:01 +13:00
parent b062331c3d
commit 965f73377b
4 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DisplayMagician/Program.cs
View File

@ -25,6 +25,13 @@ namespace DisplayMagician {
Uplay
}
public enum ApplyProfileResult
{
Successful,
Cancelled,
Error
}
internal static class Program
{
internal static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DisplayMagician");
@ -501,7 +508,7 @@ namespace DisplayMagician {
}
// ApplyProfile lives here so that the UI works.
public static bool ApplyProfile(ProfileItem profile)
public static ApplyProfileResult ApplyProfile(ProfileItem profile)
{
logger.Debug($"Program/ApplyProfile: Starting");
@ -511,7 +518,7 @@ namespace DisplayMagician {
if (!profile.IsPossible)
{
logger.Debug($"Program/ApplyProfile: The supplied profile {profile.Name} isn't currently possible to use, so we can't apply it. This means a display that existed before has been removed, or moved.");
return false;
return ApplyProfileResult.Error;
}
@ -519,7 +526,7 @@ namespace DisplayMagician {
if (profile.UUID == ProfileRepository.GetActiveProfile().UUID)
{
logger.Debug($"Program/ApplyProfile: The supplied profile {profile.Name} is currently in use, so we don't need to apply it.");
return false;
return ApplyProfileResult.Successful;
}
try
@ -552,7 +559,7 @@ namespace DisplayMagician {
if (timeoutForm.ShowDialog() == DialogResult.Cancel)
{
return false;
return ApplyProfileResult.Cancelled;
}
// We only want to do the topology change if the profile we're on now
@ -612,7 +619,7 @@ namespace DisplayMagician {
if (!applyTopologyTask.IsCompleted)
{
logger.Debug($"Program/ApplyProfile: Failed to complete applying or removing the NVIDIA Surround profile");
return false;
return ApplyProfileResult.Error;
}
}
@ -645,7 +652,7 @@ namespace DisplayMagician {
logger.Debug($"Program/ApplyProfile: Applying Profile PathInfo stage failed to complete");
if (!applyPathInfoTask.IsCompleted)
return false;
return ApplyProfileResult.Error;
}
catch (Exception ex)
@ -653,13 +660,13 @@ namespace DisplayMagician {
Console.WriteLine($"ProfileRepository/ApplyTopology exception: {ex.Message}: {ex.StackTrace} - {ex.InnerException}");
{
logger.Debug($"Program/ApplyProfile: Failed to complete changing the Windows Display layout");
return false;
return ApplyProfileResult.Error;
}
}
ProfileRepository.UpdateActiveProfile();
return true;
return ApplyProfileResult.Successful;
}
public static bool LoadGamesInBackground()

26
DisplayMagician/ShortcutRepository.cs
View File

@ -604,11 +604,20 @@ namespace DisplayMagician
{
logger.Info($"ShortcutRepository/RunShortcut: Changing to the {rollbackProfile.Name} profile.");
// Apply the Profile!
if (!Program.ApplyProfile(shortcutToUse.ProfileToUse))
ApplyProfileResult result = Program.ApplyProfile(shortcutToUse.ProfileToUse);
if (result == ApplyProfileResult.Error)
{
Console.WriteLine($"ERROR - Cannot apply '{shortcutToUse.ProfileToUse.Name}' Display Profile");
logger.Error($"ShortcutRepository/RunShortcut: Cannot apply '{shortcutToUse.ProfileToUse.Name}' Display Profile");
return;
}
else if (result == ApplyProfileResult.Cancelled)
{
Console.WriteLine($"ERROR - User cancelled applying '{shortcutToUse.ProfileToUse.Name}' Display Profile");
logger.Error($"ShortcutRepository/RunShortcut: User cancelled applying '{shortcutToUse.ProfileToUse.Name}' Display Profile");
return;
}
}
// record the old audio device
@ -1393,12 +1402,21 @@ namespace DisplayMagician
{
logger.Debug($"ShortcutRepository/RunShortcut: Rolling back display profile to {rollbackProfile.Name}");
//if (!ProfileRepository.ApplyProfile(rollbackProfile))
if (!Program.ApplyProfile(rollbackProfile))
ApplyProfileResult result = Program.ApplyProfile(rollbackProfile);
if (result == ApplyProfileResult.Error)
{
Console.WriteLine($"ERROR - Cannot revert back to '{rollbackProfile.Name}' Display Profile");
logger.Error($"ShortcutRepository/RunShortcut: Rolling back display profile to {rollbackProfile.Name}");
logger.Error($"ShortcutRepository/RunShortcut: Error rolling back display profile to {rollbackProfile.Name}");
return;
}
else if (result == ApplyProfileResult.Cancelled)
{
Console.WriteLine($"ERROR - User cancelled revert back to '{rollbackProfile.Name}' Display Profile");
logger.Error($"ShortcutRepository/RunShortcut: User cancelled rolling back display profile to {rollbackProfile.Name}");
return;
}
}
}

2
DisplayMagician/UIForms/DisplayProfileForm.cs
View File

@ -51,7 +51,7 @@ namespace DisplayMagician.UIForms
}
// Apply the Profile
if (Program.ApplyProfile(_selectedProfile))
if (Program.ApplyProfile(_selectedProfile) == ApplyProfileResult.Successful)
{
ChangeSelectedProfile(_selectedProfile);
}

1
DisplayMagicianShared/ProfileRepository.cs
View File

@ -16,6 +16,7 @@ using NvAPIWrapper.Native.GPU;
namespace DisplayMagicianShared
{
public static class ProfileRepository
{
#region Class Variables