Option to only show relevant settings

n00mkrad · Nov 26, 2024 · 6e4cc8d · 6e4cc8d
1 parent a09b290
commit 6e4cc8d
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 58 deletions.
diff --git a/CodeLegacy/Data/Implementations.cs b/CodeLegacy/Data/Implementations.cs
@@ -121,7 +121,6 @@ public static AiInfo GetAi(string aiName)
             return NetworksAll[0];
         }
 
-        // New: Use enums
         public static AiInfo GetAi(Ai ai)
         {
             if (AiLookup.TryGetValue(ai, out AiInfo aiObj))

diff --git a/CodeLegacy/Extensions/ExtensionMethods.cs b/CodeLegacy/Extensions/ExtensionMethods.cs
@@ -62,6 +62,9 @@ public static bool GetBool(this string str)
         {
             try
             {
+                if (str.IsEmpty())
+                    return false;
+
                 return bool.Parse(str);
             }
             catch

diff --git a/CodeLegacy/Forms/CustomForm.cs b/CodeLegacy/Forms/CustomForm.cs
@@ -8,12 +8,30 @@ namespace Flowframes.Forms
     public class CustomForm : Form
     {
         public Control FocusedControl { get { return this.GetControls().Where(c => c.Focused).FirstOrDefault(); } }
+        public List<Control> AllControls => GetAllControls(this);
 
         public bool AllowTextboxTab { get; set; } = true;
         public bool AllowEscClose { get; set; } = true;
 
         private List<Control> _tabOrderedControls;
 
+        private static List<Control> GetAllControls(Control parent)
+        {
+            var controls = new List<Control>();
+
+            foreach (Control ctrl in parent.Controls)
+            {
+                controls.Add(ctrl);
+
+                if (ctrl.HasChildren)
+                {
+                    controls.AddRange(GetAllControls(ctrl));
+                }
+            }
+
+            return controls;
+        }
+
         public void TabOrderInit(List<Control> tabOrderedControls, int defaultFocusIndex = 0)
         {
             _tabOrderedControls = tabOrderedControls;

diff --git a/CodeLegacy/Forms/Main/Form1.cs b/CodeLegacy/Forms/Main/Form1.cs
@@ -60,9 +60,9 @@ public Form1()
             }
         }
 
-        private async void Form1_Load(object sender, EventArgs e)
+        private void Form1_Load(object sender, EventArgs e)
         {
-            CheckForIllegalCrossThreadCalls = false;
+            CheckForIllegalCrossThreadCalls = Debugger.IsAttached;
             AutoScaleMode = AutoScaleMode.None;
         }
 

diff --git a/CodeLegacy/Forms/SettingsForm.Designer.cs b/CodeLegacy/Forms/SettingsForm.Designer.cs
diff --git a/CodeLegacy/Forms/SettingsForm.cs b/CodeLegacy/Forms/SettingsForm.cs
@@ -14,28 +14,32 @@
 
 namespace Flowframes.Forms
 {
-    public partial class SettingsForm : Form
+    public partial class SettingsForm : CustomForm
     {
-        bool initialized = false;
+        private bool _initialized = false;
+        private AiInfo _currentAi = null;
 
-        public SettingsForm(int index = 0)
+        public SettingsForm(int tabIndex = 0, AiInfo currentAi = null)
         {
             AutoScaleMode = AutoScaleMode.None;
             InitializeComponent();
-            settingsTabList.SelectedIndex = index;
+
+            _currentAi = currentAi == null ? Program.mainForm.GetAi() : currentAi;
+            settingsTabList.SelectedIndex = tabIndex;
         }
 
         private void SettingsForm_Load(object sender, EventArgs e)
         {
             MinimumSize = new Size(Width, Height);
             MaximumSize = new Size(Width, (Height * 1.5f).RoundToInt());
             mpdecimateMode.FillFromEnum<Enums.Interpolation.MpDecimateSens>(useKeyNames: true);
+            onlyShowRelevantSettings.Click += (s, ea) => SetVisibility();
 
             InitGpus();
             InitServers();
             LoadSettings();
             AddTooltipClickFunction();
-            initialized = true;
+            _initialized = true;
             Task.Run(() => CheckModelCacheSize());
         }
 
@@ -105,6 +109,7 @@ void SaveSettings()
             ncnnGpus.Text = ncnnGpus.Text.Replace(" ", "");
 
             // General
+            ConfigParser.SaveGuiElement(onlyShowRelevantSettings);
             ConfigParser.SaveComboxIndex(processingMode);
             ConfigParser.SaveGuiElement(maxVidHeight, ConfigParser.StringMode.Int);
             ConfigParser.SaveComboxIndex(tempFolderLoc);
@@ -150,6 +155,7 @@ void SaveSettings()
 
         void LoadSettings()
         {
+            ConfigParser.LoadGuiElement(onlyShowRelevantSettings);
             // General
             ConfigParser.LoadComboxIndex(processingMode);
             ConfigParser.LoadGuiElement(maxVidHeight);
@@ -196,6 +202,8 @@ void LoadSettings()
 
         private void SetVisibility()
         {
+            bool onlyRelevant = onlyShowRelevantSettings.Checked;
+
             // Dev options
             List<Control> devOptions = new List<Control> { panKeepTempFolder, };
             devOptions.ForEach(c => c.SetVisible(Program.Debug));
@@ -205,37 +213,27 @@ private void SetVisibility()
             legacyUntestedOptions.ForEach(c => c.SetVisible(Program.Debug));
 
             // AutoEnc options
-            bool autoEncEnabled = autoEncMode.SelectedIndex != 0;
+            bool autoEncPossible = !_currentAi.Piped;
+            autoEncMode.Visible = !(onlyRelevant && !autoEncPossible);
+            bool autoEncEnabled = autoEncMode.Visible && autoEncMode.SelectedIndex != 0;
             List<Control> autoEncOptions = new List<Control> { panAutoEncBackups, panAutoEncLowSpaceMode };
             autoEncOptions.ForEach(c => c.SetVisible(autoEncEnabled));
             panAutoEncInSbsMode.SetVisible(autoEncEnabled && panProcessingStyle.Visible);
 
             var availAis = Implementations.NetworksAvailable;
-            panTorchGpus.SetVisible(NvApi.NvGpus.Count > 0 && Python.IsPytorchReady());
-            panNcnnGpus.SetVisible(VulkanUtils.VkDevices.Count > 0);
-            panRifeCudaHalfPrec.SetVisible(NvApi.NvGpus.Count > 0 && availAis.Contains(Implementations.rifeCuda));
-        }
-
-        private static List<Control> GetAllControls(Control parent)
-        {
-            var controls = new List<Control>();
-
-            foreach (Control ctrl in parent.Controls)
-            {
-                controls.Add(ctrl);
-
-                if (ctrl.HasChildren)
-                {
-                    controls.AddRange(GetAllControls(ctrl));
-                }
-            }
-
-            return controls;
+            bool showTorchSettings = !(onlyRelevant && _currentAi.Backend != AiInfo.AiBackend.Pytorch);
+            panTorchGpus.SetVisible(showTorchSettings && NvApi.NvGpus.Count > 0 && Python.IsPytorchReady());
+            bool showNcnnSettings = !(onlyRelevant && _currentAi.Backend != AiInfo.AiBackend.Ncnn);
+            panNcnnGpus.SetVisible(showNcnnSettings && VulkanUtils.VkDevices.Count > 0);
+            bool showRifeCudaSettings = !(onlyRelevant && _currentAi != Implementations.rifeCuda);
+            panRifeCudaHalfPrec.SetVisible(showRifeCudaSettings && NvApi.NvGpus.Count > 0 && availAis.Contains(Implementations.rifeCuda));
+            bool showDainNcnnSettings = !(onlyRelevant && _currentAi != Implementations.dainNcnn);
+            new List<Control> { panTitleDainNcnn, panDainNcnnTileSize }.ForEach(c => c.SetVisible(showDainNcnnSettings && availAis.Contains(Implementations.dainNcnn)));
         }
 
         private void AddTooltipClickFunction()
         {
-            foreach (Control control in GetAllControls(this))
+            foreach (Control control in AllControls)
             {
                 if(!(control is PictureBox))
                     continue;
@@ -283,7 +281,7 @@ private void custOutDirBrowseBtn_Click(object sender, EventArgs e)
 
         private void cmdDebugMode_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (initialized && cmdDebugMode.SelectedIndex == 2)
+            if (_initialized && cmdDebugMode.SelectedIndex == 2)
                 UiUtils.ShowMessageBox("If you enable this, you need to close the CMD window manually after the process has finished, otherwise processing will be paused!", UiUtils.MessageType.Warning);
         }
 

diff --git a/CodeLegacy/IO/Config.cs b/CodeLegacy/IO/Config.cs
@@ -259,6 +259,7 @@ private static string WriteDefaultValIfExists(string keyStr, Type type)
                 return WriteDefault(keyStr, "");
             }
 
+            if (key == Key.onlyShowRelevantSettings) return WriteDefault(key, true);
             if (key == Key.disablePreview)        return WriteDefault(key, true);
             if (key == Key.maxVidHeight)          return WriteDefault(key, "2160");
             if (key == Key.clearLogOnInput)       return WriteDefault(key, true);
@@ -368,6 +369,7 @@ public enum Key
             mpdecimateMode,
             ncnnGpus,
             ncnnThreads,
+            onlyShowRelevantSettings,
             opusBitrate,
             processingMode,
             rifeCudaBufferSize,
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,9 @@ public static bool GetBool(this string str) @@
             {
                 try
                 {
+                    if (str.IsEmpty())
+                        return false;
                     return bool.Parse(str);
                 }
                 catch
@@ Expand Down @@