Modular settings with tabbed UI, improved custom path window interaction

Author: lindseydeng

CMakeLists.txt

@@ -106,7 +106,12 @@ target_sources(${PROJECT_NAME}
         src/HarpLogger.cpp
         src/errors.h
         src/utils.h
-
+        src/settings/SettingsBox.h       
+        src/settings/SettingsBox.cpp 
+        src/settings/GeneralSettingsTab.h
+        src/settings/GeneralSettingsTab.cpp
+        src/settings/AudioSettingsTab.h
+        src/settings/AudioSettingsTab.cpp
         src/gradio/GradioClient.cpp
         src/external/magic_enum.hpp
 

JUCE

@@ -60,19 +60,32 @@ class AppSettings
 
         return defaultValue;
     }
-    
-    /** Set a value of any type that can be converted to string */
+
+    // Set value specific for boolean type
+    static void setValue(const juce::String& keyName, bool value, bool saveImmediately = false)
+    {
+        if (auto* settings = getUserSettings())
+        {
+            settings->setValue(keyName, value ? "true" : "false");
+
+             if (saveImmediately)
+            settings->saveIfNeeded();
+    }
+}
+  
+ 
+   /** Set a value of any type that can be converted to string */
     template <typename ValueType>
     static void setValue(const juce::String& keyName, const ValueType& value, bool saveImmediately = false)
-    {
+    {   
         if (auto* settings = getUserSettings())
         {
             settings->setValue(keyName, juce::String(value));
-            
+
             if (saveImmediately)
                 settings->saveIfNeeded();
         }
-    }
+}
 
     /** Save settings to disk if needed */
     static void saveIfNeeded()

src/AppSettings.h

@@ -34,6 +34,8 @@
 
 #include "windows/AboutWindow.h"
 #include "AppSettings.h"
+#include "settings/SettingsBox.h"
+
 
 using namespace juce;
 
@@ -110,18 +112,24 @@ class MainComponent : public Component,
         saveAs = 0x2003,
         undo = 0x2004,
         redo = 0x2005,
-        login = 0x2006
-        // settings = 0x2007,
+        login = 0x2006,
+        settings = 0x2007 
     };
 
-    StringArray getMenuBarNames() override { return { "File" }; }
+    StringArray getMenuBarNames() override
+{
+    //DBG("getMenuBarNames() called");
+    return { "File" };
+}
 
     // In mac, we want the "about" command to be in the application menu ("HARP" tab)
     // For now, this is not used, as the extra commands appear grayed out
     std::unique_ptr<PopupMenu> getMacExtraMenu()
     {
         auto menu = std::make_unique<PopupMenu>();
         menu->addCommandItem(&commandManager, CommandIDs::about);
+        menu->addCommandItem(&commandManager, CommandIDs::settings);
+        menu->addCommandItem(&commandManager, CommandIDs::login);
         return menu;
     }
 
@@ -137,10 +145,14 @@ class MainComponent : public Component,
             menu.addCommandItem(&commandManager, CommandIDs::undo);
             menu.addCommandItem(&commandManager, CommandIDs::redo);
             menu.addSeparator();
-            // menu.addCommandItem (&commandManager, CommandIDs::settings);
-            // menu.addSeparator();
-            menu.addCommandItem(&commandManager, CommandIDs::login);
-            menu.addCommandItem(&commandManager, CommandIDs::about);
+            //menu.addCommandItem (&commandManager, CommandIDs::settings);
+            menu.addSeparator();
+            //menu.addCommandItem(&commandManager, CommandIDs::login);
+            //menu.addCommandItem(&commandManager, CommandIDs::about);
+        }
+        else
+        {
+            DBG("Unknown menu name: " << menuName);
         }
         return menu;
     }
@@ -158,7 +170,7 @@ class MainComponent : public Component,
         const CommandID ids[] = {
             CommandIDs::open, CommandIDs::save, CommandIDs::saveAs,
             CommandIDs::undo, CommandIDs::redo, CommandIDs::login,
-            CommandIDs::about
+            CommandIDs::about, CommandIDs::settings
         };
         commands.addArray(ids, numElementsInArray(ids));
     }
@@ -199,12 +211,16 @@ class MainComponent : public Component,
             case CommandIDs::about:
                 result.setInfo("About HARP", "Shows information about the application", "About", 0);
                 break;
+            case CommandIDs::settings:
+                result.setInfo("Preferences...", "Open the settings window", "Settings", 0);
+                break;
         }
     }
 
     // Callback for the save and saveAs commands
     bool perform(const InvocationInfo& info) override
     {
+        DBG("perform() called");
         switch (info.commandID)
         {
             case CommandIDs::open:
@@ -235,6 +251,10 @@ class MainComponent : public Component,
                 DBG("About command invoked");
                 showAboutDialog();
                 break;
+            case CommandIDs::settings:
+                DBG("Settings command invoked");
+                showSettingsDialog();  
+                break;
             default:
                 return false;
         }
@@ -733,6 +753,21 @@ class MainComponent : public Component,
                             MessageManager::callAsync([this, loadingError]
                                                       { loadModelButton.setEnabled(false); });
                         }
+                        if (loadingError.userMessage.containsIgnoreCase("sleeping"))
+                        {
+                             MessageManager::callAsync([this] {
+                            addCustomPathToDropdown(customPath, true); // mark as sleeping
+                            });
+                        }
+                        //NEW: reopen custom path dialog if sleeping or 404
+                        if (loadingError.type == ErrorType::InvalidURL || 
+                            loadingError.devMessage.contains("404") ||
+                            loadingError.userMessage.containsIgnoreCase("sleeping"))
+                        {
+                            MessageManager::callAsync([this] {
+                                openCustomPathDialog(customPath);
+                            });
+                        }
                     };
 
                     AlertWindow::showAsync(msgOpts, alertCallback);
@@ -756,6 +791,31 @@ class MainComponent : public Component,
             });
     }
 
+    void openCustomPathDialog(const std::string& prefillPath = "")
+    {
+        std::function<void(const juce::String&)> loadCallback =
+         [this](const juce::String& customPath2)
+        {
+             this->customPath = customPath2.toStdString();
+             loadModelButton.triggerClick(); // Trigger load
+         };
+
+        std::function<void()> cancelCallback = [this]()
+        {
+            if (lastLoadedModelItemIndex != -1)
+                 modelPathComboBox.setSelectedId(lastLoadedModelItemIndex + 1);
+            else if (lastSelectedItemIndex != -1)
+                 modelPathComboBox.setSelectedId(lastSelectedItemIndex + 1);
+            else
+                 resetModelPathComboBox();
+         };
+
+        CustomPathDialog* dialog = new CustomPathDialog(loadCallback, cancelCallback);
+        if (!prefillPath.empty())
+             dialog->setTextFieldValue(prefillPath); 
+        }
+
+
     void resetModelPathComboBox()
     {
         // cb: why do we resetUI inside a function named resetModelPathComboBox ?
@@ -784,6 +844,36 @@ class MainComponent : public Component,
         lastSelectedItemIndex = -1;
     }
 
+    // Adds a path to the model dropdown if it's not already present
+    void addCustomPathToDropdown(const std::string& path, bool wasSleeping = false)
+    {
+        juce::String displayStr(path);
+        if (wasSleeping)
+            displayStr += " (sleeping)";
+    
+        bool alreadyExists = false;
+        for (int i = 0; i < modelPathComboBox.getNumItems(); ++i)
+        {
+            if (modelPathComboBox.getItemText(i).startsWithIgnoreCase(path))
+            {
+                alreadyExists = true;
+                break;
+            }
+        }
+    
+        if (!alreadyExists)
+        {
+            int newID = modelPathComboBox.getNumItems() + 1;
+            modelPathComboBox.addItem(displayStr, newID);
+        }
+    
+        modelPathComboBox.setText(displayStr, juce::dontSendNotification);
+    }
+    
+    
+        
+
+
     void focusCallback()
     {
         // if (mediaDisplay->isFileLoaded())
@@ -825,6 +915,20 @@ class MainComponent : public Component,
         // }
     }
 
+    void showSettingsDialog()
+    {
+         DBG("Settings command invoked");
+
+        juce::DialogWindow::LaunchOptions options;
+        options.dialogTitle = "Settings";
+        options.content.setOwned(new SettingsBox());
+        options.useNativeTitleBar = true;
+        options.resizable = true;
+        options.escapeKeyTriggersCloseButton = true;
+        options.dialogBackgroundColour = juce::Colours::lightgrey;
+        options.launchAsync();
+    }
+
     void initMenuBar()
     {
         // init the menu bar
@@ -833,13 +937,17 @@ class MainComponent : public Component,
         setApplicationCommandManagerToWatch(&commandManager);
         // Register commands
         commandManager.registerAllCommandsForTarget(this);
+        commandManager.setFirstCommandTarget(this);
+
         // commandManager.setFirstCommandTarget(this);
         addKeyListener(commandManager.getKeyMappings());
 
 #if JUCE_MAC
         // Not used for now
-        // auto extraMenu = getMacExtraMenu();
-        MenuBarModel::setMacMainMenu(this);
+        //auto extraMenu = getMacExtraMenu();
+       // MenuBarModel::setMacMainMenu(this);
+       macExtraMenu = getMacExtraMenu();
+       MenuBarModel::setMacMainMenu(this, macExtraMenu.get());
 #endif
 
         menuBar->setVisible(true);
@@ -1116,6 +1224,7 @@ class MainComponent : public Component,
         // set to full screen
         // setFullScreen(true);
         resized();
+        
     }
 
     ~MainComponent() override
@@ -1478,8 +1587,7 @@ class MainComponent : public Component,
         menuBar->setBounds(
             area.removeFromTop(LookAndFeel::getDefaultLookAndFeel().getDefaultMenuBarHeight()));
 #endif
-
-        auto margin = 2; // Adjusted margin value for top and bottom spacing
+       auto margin = 2; // Adjusted margin value for top and bottom spacing
 
         // Create a FlexBox container
         juce::FlexBox flexBox;
@@ -1590,6 +1698,7 @@ class MainComponent : public Component,
     std::unique_ptr<ModelStatusTimer> mModelStatusTimer { nullptr };
 
     ComboBox modelPathComboBox;
+
     // Two usefull variables to keep track of the selected item in the modelPathComboBox
     // and the item index of the last loaded model
     // These are used to restore the selected item in the modelPathComboBox
@@ -1680,6 +1789,7 @@ class MainComponent : public Component,
 
     std::shared_ptr<fontawesome::IconHelper> fontawesomeHelper;
     std::shared_ptr<fontaudio::IconHelper> fontaudioHelper;
+    std::unique_ptr<PopupMenu> macExtraMenu;
 
     void play()
     {

src/MainComponent.h

@@ -18,7 +18,7 @@ inline Colour getUIColourIfAvailable(LookAndFeel_V4::ColourScheme::UIColour uiCo
     return fallback;
 }
 
-class CustomPathComponent : public Component
+class CustomPathComponent : public Component, public juce::TextEditor::Listener
 {
 public:
     CustomPathComponent(std::function<void(const String&)> onLoadCallback,
@@ -31,6 +31,8 @@ class CustomPathComponent : public Component
         customPathEditor.onTextChange = [this]()
         { loadButton.setEnabled(customPathEditor.getText().isNotEmpty()); };
 
+        customPathEditor.addListener(this); //listen for the enter key press
+
         // Set up the Load button
         addAndMakeVisible(loadButton);
         loadButton.setButtonText("Load");
@@ -69,9 +71,23 @@ class CustomPathComponent : public Component
         g.fillAll(getUIColourIfAvailable(LookAndFeel_V4::ColourScheme::UIColour::windowBackground));
     }
 
+    void textEditorReturnKeyPressed(juce::TextEditor&) override
+    {
+        if (loadButton.isEnabled())
+            loadButton.triggerClick();
+    }
+
+    void setTextFieldValue(const std::string& path)
+{
+    customPathEditor.setText(path, juce::dontSendNotification);
+    customPathEditor.selectAll(); 
+}
+
+
 private:
     TextEditor customPathEditor;
     TextButton loadButton, cancelButton;
+    CustomPathComponent* pathComponent = nullptr;
 };
 
 class CustomPathDialog : public DialogWindow
@@ -84,12 +100,18 @@ class CustomPathDialog : public DialogWindow
           m_onCancelCallback(onCancelCallback)
     {
         // Create the content component
-        auto* content =
-            new CustomPathComponent([this](const String& path) { loadButtonPressed(path); },
-                                    [this]() { cancelButtonPressed(); });
+        //auto* content =
+           // new CustomPathComponent([this](const String& path) { loadButtonPressed(path); },
+                                    //[this]() { cancelButtonPressed(); });
+         pathComponent = new CustomPathComponent(
+                                        [this](const String& path) { loadButtonPressed(path); },
+                                        [this]() { cancelButtonPressed(); });
+                                    
+        setContentOwned(pathComponent, true);
+                                    
 
         // Add custom content
-        setContentOwned(content, true);
+        //setContentOwned(content, true);
 
         // Other dialog window options
         setUsingNativeTitleBar(false);
@@ -131,7 +153,15 @@ class CustomPathDialog : public DialogWindow
         delete this;
     }
 
+    void setTextFieldValue(const std::string& path)
+    {
+        if (pathComponent != nullptr)
+            pathComponent->setTextFieldValue(path);
+    }
+
+
 private:
     std::function<void(const String&)> m_onLoadCallback;
     std::function<void()> m_onCancelCallback;
+    CustomPathComponent* pathComponent = nullptr;
 };