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

Fixed DisplayProfileForm profile selection logic

Browse Source 
Profile selection logic was running functions multiple
times which was resulting in a lot of extra delay
while using the DisplayProfileFOrm. These changes
streamline it and make it work a lot faster!
This commit is contained in:
terrymacdonald 2020-07-24 13:11:42 +12:00
parent e83a893640
commit f23ae340a7
5 changed files with 53 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HeliosPlus.Shared/ProfileItem.cs
View File

@ -96,7 +96,7 @@ namespace HeliosPlus.Shared
#endregion #endregion
public ProfileItem() public ProfileItem()
{ {
try /*try
{ {
NvAPIWrapper.NVIDIA.Initialize(); NvAPIWrapper.NVIDIA.Initialize();
} }
@ -104,7 +104,7 @@ namespace HeliosPlus.Shared
{ {
Console.WriteLine($"ShortcutItem/Instansiation exception: {ex.Message}: {ex.InnerException}"); Console.WriteLine($"ShortcutItem/Instansiation exception: {ex.Message}: {ex.InnerException}");
// ignored // ignored
} }*/
} }

12
HeliosPlus.Shared/ProfileRepository.cs
View File

@ -50,6 +50,18 @@ namespace HeliosPlus.Shared
#region Class Constructors #region Class Constructors
static ProfileRepository() static ProfileRepository()
{ {
// Initialise the the NVIDIA NvAPIWrapper
try
{
NvAPIWrapper.NVIDIA.Initialize();
}
catch (Exception ex)
{
Console.WriteLine($"ShortcutItem/Instansiation exception: {ex.Message}: {ex.InnerException}");
// ignored
}
// Load the Profiles from storage // Load the Profiles from storage
LoadProfiles(); LoadProfiles();
} }

6
HeliosPlus/ShortcutRepository.cs
View File

@ -679,7 +679,7 @@ namespace HeliosPlus
} }
private static bool ApplyProfile(ProfileItem profile) public static bool ApplyProfile(ProfileItem profile)
{ {
// If we're already on the wanted profile then no need to change! // If we're already on the wanted profile then no need to change!
if (ProfileRepository.IsActiveProfile(profile)) if (ProfileRepository.IsActiveProfile(profile))
@ -716,7 +716,7 @@ namespace HeliosPlus
} }
} }
public static void ApplyTopology(ProfileItem profile) private static void ApplyTopology(ProfileItem profile)
{ {
Debug.Print("ShortcutRepository.ApplyTopology()"); Debug.Print("ShortcutRepository.ApplyTopology()");
if (profile == null) if (profile == null)
@ -757,7 +757,7 @@ namespace HeliosPlus
} }
} }
public static void ApplyPathInfo(ProfileItem profile) private static void ApplyPathInfo(ProfileItem profile)
{ {
Debug.Print("ShortcutRepository.ApplyPathInfo()"); Debug.Print("ShortcutRepository.ApplyPathInfo()");
if (profile == null) if (profile == null)

153
HeliosPlus/UIForms/DisplayProfileForm.cs
View File

@ -33,6 +33,9 @@ namespace HeliosPlus.UIForms
private void Apply_Click(object sender, EventArgs e) private void Apply_Click(object sender, EventArgs e)
{ {
if (!(_selectedProfile is ProfileItem))
return;
if (!_selectedProfile.IsPossible) if (!_selectedProfile.IsPossible)
{ {
MessageBox.Show(this, Language.This_profile_is_currently_impossible_to_apply, MessageBox.Show(this, Language.This_profile_is_currently_impossible_to_apply,
@ -42,34 +45,8 @@ namespace HeliosPlus.UIForms
return; return;
} }
// Need to move this logic to the Shortcut Repository or the Profile Repository. // Apply the Profile
/*IDictionary<string, Action> actions = dv_profile.Profile.applyProfileActions(); ShortcutRepository.ApplyProfile(_selectedProfile);
IDictionary<string, string> messages = dv_profile.Profile.applyProfileMsgs();
List<string> sequence = dv_profile.Profile.applyProfileSequence();
if (new ApplyingChangesForm(
() => {
Task.Factory.StartNew(() =>
{
System.Threading.Thread.Sleep(2000);
actions[sequence[0]]();
}, TaskCreationOptions.LongRunning);
}, 3, 30, 5, messages[sequence[0]]
).ShowDialog(this) != DialogResult.Cancel)
{
for (int i = 1; i < sequence.Count; i++)
{
new ApplyingChangesForm(
() =>
{
Task.Factory.StartNew(() => actions[sequence[i]](), TaskCreationOptions.LongRunning);
}, 0, 30, 5, messages[sequence[i]]).ShowDialog(this);
}
// nothing to do
Console.WriteLine("Applying profile " + _selectedProfile.Name);
}
Activate();*/
} }
@ -83,6 +60,9 @@ namespace HeliosPlus.UIForms
private void Delete_Click(object sender, EventArgs e) private void Delete_Click(object sender, EventArgs e)
{ {
if (!(_selectedProfile is ProfileItem))
return;
if (MessageBox.Show($"Are you sure you want to delete the '{_selectedProfile.Name}' Display Profile?", $"Delete '{_selectedProfile.Name}' Display Profile?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No) if (MessageBox.Show($"Are you sure you want to delete the '{_selectedProfile.Name}' Display Profile?", $"Delete '{_selectedProfile.Name}' Display Profile?", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.No)
return; return;
@ -128,53 +108,28 @@ namespace HeliosPlus.UIForms
private void RefreshDisplayProfileUI() private void RefreshDisplayProfileUI()
{ {
ImageListViewItem newItem = null;
// Temporarily stop updating the saved_profiles listview // Temporarily stop updating the saved_profiles listview
// To stop the display showing all sorts of changes happening
ilv_saved_profiles.SuspendLayout(); ilv_saved_profiles.SuspendLayout();
if (ProfileRepository.ProfileCount > 0) // Empty the imageListView
ilv_saved_profiles.Items.Clear();
// Fill it back up with the Profiles we have
foreach (ProfileItem profile in ProfileRepository.AllProfiles)
{ {
ImageListViewItem newItem = null; // Create a new ImageListViewItem from the profile
bool foundCurrentProfileInLoadedProfiles = false; newItem = new ImageListViewItem(profile, profile.Name);
foreach (ProfileItem loadedProfile in ProfileRepository.AllProfiles)
{
bool thisLoadedProfileIsAlreadyHere = (from item in ilv_saved_profiles.Items where item.Text == loadedProfile.Name select item.Text).Any();
if (!thisLoadedProfileIsAlreadyHere)
{
//loadedProfile.SaveProfileImageToCache();
//newItem = new ImageListViewItem(loadedProfile.SavedProfileCacheFilename, loadedProfile.Name);
//newItem = new ImageListViewItem(loadedProfile, loadedProfile.Name);
newItem = new ImageListViewItem(loadedProfile, loadedProfile.Name);
//ilv_saved_profiles.Items.Add(newItem);
ilv_saved_profiles.Items.Add(newItem, _profileAdaptor);
}
if (ProfileRepository.CurrentProfile.Equals(loadedProfile)) // Select it if its the selectedProfile
{ if (_selectedProfile is ProfileItem && _selectedProfile.Equals(profile))
// We have already saved the selected profile! newItem.Selected = true;
// so we need to show the selected profile
ChangeSelectedProfile(loadedProfile);
foundCurrentProfileInLoadedProfiles = true;
}
}
// If we get to the end of the loaded profiles and haven't // Add it to the list!
// found a matching profile, then we need to show the current ilv_saved_profiles.Items.Add(newItem, _profileAdaptor);
// Profile
if (!foundCurrentProfileInLoadedProfiles)
ChangeSelectedProfile(ProfileRepository.CurrentProfile);
// Check if we were loading a profile to edit
// If so, select that instead of all that other stuff above!
if (_profileToLoad != null)
ChangeSelectedProfile(_profileToLoad);
}
else
{
// If there are no profiles at all then we are starting from scratch!
// Show the profile in the DV window
// Use the current profile name in the label and the save name
ChangeSelectedProfile(ProfileRepository.CurrentProfile);
} }
// Restart updating the saved_profiles listview // Restart updating the saved_profiles listview
@ -190,10 +145,10 @@ namespace HeliosPlus.UIForms
// alter their Windows Display settings then come back to our app // alter their Windows Display settings then come back to our app
// and the app will automatically recognise that things have changed. // and the app will automatically recognise that things have changed.
// Reload the profiles in case we swapped to another program to change it /*// Reload the profiles in case we swapped to another program to change it
ProfileRepository.UpdateCurrentProfile(); ProfileRepository.UpdateCurrentProfile();
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();*/
} }
private void DisplayProfileForm_Load(object sender, EventArgs e) private void DisplayProfileForm_Load(object sender, EventArgs e)
@ -202,6 +157,8 @@ namespace HeliosPlus.UIForms
//_savedProfiles = ProfileRepository.AllProfiles; //_savedProfiles = ProfileRepository.AllProfiles;
// Update the Current Profile // Update the Current Profile
ProfileRepository.UpdateCurrentProfile(); ProfileRepository.UpdateCurrentProfile();
// Change to the current selected Profile
ChangeSelectedProfile(ProfileRepository.GetActiveProfile());
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();
} }
@ -209,7 +166,6 @@ namespace HeliosPlus.UIForms
private void ChangeSelectedProfile(ProfileItem profile) private void ChangeSelectedProfile(ProfileItem profile)
{ {
// And we need to update the actual selected profile too! // And we need to update the actual selected profile too!
_selectedProfile = profile; _selectedProfile = profile;
@ -219,7 +175,7 @@ namespace HeliosPlus.UIForms
// And update the save/rename textbox // And update the save/rename textbox
txt_profile_save_name.Text = _selectedProfile.Name; txt_profile_save_name.Text = _selectedProfile.Name;
if (ProfileRepository.AllProfiles.Contains(_selectedProfile)) if (ProfileRepository.ContainsProfile(_selectedProfile))
{ {
// we already have the profile stored // we already have the profile stored
_saveOrRenameMode = "rename"; _saveOrRenameMode = "rename";
@ -232,7 +188,10 @@ namespace HeliosPlus.UIForms
else else
{ {
lbl_profile_shown_subtitle.Text = ""; lbl_profile_shown_subtitle.Text = "";
btn_apply.Visible = true; if (ProfileRepository.IsActiveProfile(_selectedProfile))
btn_apply.Visible = false;
else
btn_apply.Visible = true;
} }
} }
else else
@ -244,40 +203,8 @@ namespace HeliosPlus.UIForms
btn_apply.Visible = false; btn_apply.Visible = false;
} }
/*if (ProfileRepository.CurrentProfile.Equals(_selectedProfile))
{
if (ProfileRepository.AllProfiles.Contains(_selectedProfile))
{
_saveOrRenameMode = "rename";
btn_save_or_rename.Text = "Rename To";
lbl_profile_shown_subtitle.Text = "(Current Display Profile in use)";
}
else
{
_saveOrRenameMode = "save";
btn_save_or_rename.Text = "Save As";
lbl_profile_shown_subtitle.Text = "(Current Display Profile in use - UNSAVED)";
}
btn_apply.Visible = false;
}
else
{
_saveOrRenameMode = "rename";
btn_save_or_rename.Text = "Rename To";
if (!_selectedProfile.IsPossible)
{
lbl_profile_shown_subtitle.Text = "(Display Profile is not valid so cannot be used)";
btn_apply.Visible = false;
}
else
{
lbl_profile_shown_subtitle.Text = "";
btn_apply.Visible = true;
}
}*/
// Refresh the image list view // Refresh the image list view
RefreshImageListView(profile); //RefreshImageListView(profile);
// And finally show the profile in the display view // And finally show the profile in the display view
dv_profile.Profile = profile; dv_profile.Profile = profile;
@ -285,18 +212,6 @@ namespace HeliosPlus.UIForms
} }
private void RefreshImageListView(ProfileItem profile)
{
ilv_saved_profiles.ClearSelection();
IEnumerable<ImageListViewItem> matchingImageListViewItems = (from item in ilv_saved_profiles.Items where item.Text == profile.Name select item);
if (matchingImageListViewItems.Any())
{
matchingImageListViewItems.First().Selected = true;
matchingImageListViewItems.First().Focused = true;
}
}
private void btn_save_as_Click(object sender, EventArgs e) private void btn_save_as_Click(object sender, EventArgs e)
{ {
@ -408,6 +323,8 @@ namespace HeliosPlus.UIForms
{ {
// Reload the profiles in case we swapped to another program to change it // Reload the profiles in case we swapped to another program to change it
ProfileRepository.UpdateCurrentProfile(); ProfileRepository.UpdateCurrentProfile();
// Change to the current selected Profile
ChangeSelectedProfile(ProfileRepository.GetActiveProfile());
// Refresh the Profile UI // Refresh the Profile UI
RefreshDisplayProfileUI(); RefreshDisplayProfileUI();
} }

3
HeliosPlus/UIForms/ShortcutForm.cs
View File

@ -19,7 +19,6 @@ namespace HeliosPlus.UIForms
public partial class ShortcutForm : Form public partial class ShortcutForm : Form
{ {
List<SteamGame> _allSteamGames;
private ProfileAdaptor _profileAdaptor; private ProfileAdaptor _profileAdaptor;
//private List<ProfileItem> _loadedProfiles = new List<ProfileItem>(); //private List<ProfileItem> _loadedProfiles = new List<ProfileItem>();
private ProfileItem _profileToUse= null; private ProfileItem _profileToUse= null;
@ -827,7 +826,7 @@ namespace HeliosPlus.UIForms
if (lv_games.SelectedItems.Count > 0) if (lv_games.SelectedItems.Count > 0)
{ {
txt_game_name.Text = lv_games.SelectedItems[0].Text; txt_game_name.Text = lv_games.SelectedItems[0].Text;
foreach (SteamGame game in _allSteamGames) foreach (SteamGame game in SteamLibrary.AllInstalledGames)
{ {
if (game.GameName == txt_game_name.Text) if (game.GameName == txt_game_name.Text)
{ {