fix(ui): update Quick Key Settings, refine Quick Load Preset logic, fix SoundBoard sync and Manage Projects button

Author: DEVCodeWithAI

Resources/Languages/lang_en.json

@@ -13,14 +13,21 @@
     },
     "presetbar": {
         "presetRunning": "Preset Running:",
-        "quickChoice": "Quick Choice:",
+        "quickChoice": "Quick Load:",
         "load": "Load",
         "noPresetLoaded": "No Preset Loaded",
+        "saveTitle": "Save Preset",
+        "saveMessage": "A preset is currently loaded. How would you like to save?",
+        "saveOverwrite": "Save (Overwrite)",
+        "saveAsNew": "Save As New...",
         "overwriteTitle": "Overwrite Preset",
         "overwriteMessage": "A preset named '{{presetName}}' already exists. Do you want to overwrite it?",
         "saveAsTitle": "Save Preset As...",
         "yes": "Yes",
-        "no": "No"
+        "no": "No",
+        "emptySlot": "Slot",
+        "assignPreset": "Assign Preset to this Slot",
+        "clearSlot": "Clear this Slot"
     },
     "tracks": {
         "vocal": "VOCAL",
@@ -177,6 +184,10 @@
         "delete": "Delete",
         "deleteConfirmTitle": "Confirm Deletion",
         "deleteConfirmMessage": "Are you sure you want to permanently delete the project '{{projectName}}' and all its audio files?"
+    },
+    "fxChain": {
+        "send": "Send:",
+        "return": "Return:"
     },
 	"lock": {
         "unlockTitle": "Unlock System",

Resources/Languages/lang_vi.json

@@ -13,14 +13,21 @@
     },
     "presetbar": {
         "presetRunning": "Preset đang chạy:",
-        "quickChoice": "Chọn nhanh:",
+        "quickChoice": "Tải Nhanh:",
         "load": "Tải",
         "noPresetLoaded": "Chưa tải Preset",
+        "saveTitle": "Lưu Preset",
+        "saveMessage": "Một preset đang được tải. Bạn muốn lưu như thế nào?",
+        "saveOverwrite": "Lưu (Ghi đè)",
+        "saveAsNew": "Lưu với tên mới...",
         "overwriteTitle": "Ghi đè Preset",
         "overwriteMessage": "Một preset có tên '{{presetName}}' đã tồn tại. Bạn có muốn ghi đè lên nó không?",
         "saveAsTitle": "Lưu Preset với tên...",
         "yes": "Đồng ý",
-        "no": "Không"
+        "no": "Không",
+        "emptySlot": "Ô",
+        "assignPreset": "Gán Preset vào ô này",
+        "clearSlot": "Xóa gán ở ô này"
     },
     "tracks": {
         "vocal": "GIỌNG HÁT",
@@ -177,6 +184,10 @@
         "delete": "Xóa",
         "deleteConfirmTitle": "Xác Nhận Xóa",
         "deleteConfirmMessage": "Bạn có chắc chắn muốn xóa vĩnh viễn project '{{projectName}}' và toàn bộ các file audio bên trong không?"
+    },
+	"fxChain": {
+        "send": "Gửi đi:",
+        "return": "Nhận về:"
     },
 	"lock": {
         "unlockTitle": "Mở khóa Hệ thống",

Source/Data/AppState.cpp

@@ -5,6 +5,7 @@
 #include "../GUI/Layout/TrackComponent.h"
 #include "../GUI/Layout/MasterUtilityComponent.h"
 #include "../GUI/Layout/PresetBarComponent.h"
+// <<< FIX: Include the full definition for MenubarComponent >>>
 #include "../GUI/Layout/MenubarComponent.h"
 #include "juce_audio_devices/juce_audio_devices.h"
 #include <juce_cryptography/juce_cryptography.h>
@@ -23,6 +24,7 @@ namespace SessionIds
     const juce::Identifier ACTIVE_PRESET("ACTIVE_PRESET");
     const juce::Identifier presetName("name");
     const juce::Identifier OPEN_WINDOWS("OPEN_WINDOWS");
+    const juce::Identifier QUICK_PRESETS("QUICK_PRESETS");
 }
 
 namespace WindowStateIds
@@ -39,6 +41,9 @@ AppState& AppState::getInstance()
 AppState::AppState()
 {
     currentPresetName = LanguageManager::getInstance().get("presetbar.noPresetLoaded");
+    // <<< MODIFIED: Initialize for 5 quick preset slots >>>
+    for (int i = 0; i < numQuickSlots; ++i)
+        quickPresetSlots.add({});
 }
 
 AppState::~AppState() {}
@@ -91,6 +96,7 @@ juce::File AppState::getSessionFile() const
 
 void AppState::saveState(MainComponent& mainComponent)
 {
+    // ... (code to save other settings is unchanged) ...
     auto& deviceManager = mainComponent.getAudioDeviceManager();
     auto& audioEngine = mainComponent.getAudioEngine();
 
@@ -112,6 +118,13 @@ void AppState::saveState(MainComponent& mainComponent)
     auto* presetStateXml = sessionXml->createNewChildElement(SessionIds::ACTIVE_PRESET);
     presetStateXml->setAttribute(SessionIds::presetName, getCurrentPresetName());
 
+    // <<< MODIFIED: Save 5 quick preset assignments >>>
+    auto* quickPresetsXml = sessionXml->createNewChildElement(SessionIds::QUICK_PRESETS);
+    for (int i = 0; i < quickPresetSlots.size(); ++i)
+    {
+        quickPresetsXml->setAttribute("slot" + juce::String(i), quickPresetSlots[i]);
+    }
+
     auto* openWindowsStateXml = sessionXml->createNewChildElement(SessionIds::OPEN_WINDOWS);
     auto vocalWindowsState = mainComponent.getVocalTrack().getOpenWindowsState();
     if (vocalWindowsState.getNumChildren() > 0)
@@ -154,32 +167,40 @@ void AppState::loadPostDeviceState(MainComponent& mainComponent)
 
     if (auto xml = juce::parseXML(sessionFile))
     {
+        // ... (loading routing state is unchanged) ...
         auto* routingStateXml = xml->getChildByName(SessionIds::ROUTING);
         if (routingStateXml != nullptr)
         {
             auto vocalInputName = routingStateXml->getStringAttribute(SessionIds::VOCAL_INPUT);
             auto musicInputName = routingStateXml->getStringAttribute(SessionIds::MUSIC_INPUT);
             auto appOutputName = routingStateXml->getStringAttribute(SessionIds::APP_OUTPUT);
 
-            // Cập nhật AudioEngine (không đổi)
             mainComponent.getAudioEngine().setVocalInputChannelByName(vocalInputName);
             mainComponent.getAudioEngine().setMusicInputChannelByName(musicInputName);
             mainComponent.getAudioEngine().setSelectedOutputChannelsByName(appOutputName);
 
-            // Cập nhật giao diện thông qua các component mới
             if (auto* vocalSelector = mainComponent.getVocalTrack().getChannelSelector())
                 vocalSelector->setSelectedChannelByName(vocalInputName);
 
             if (auto* musicSelector = mainComponent.getMusicTrack().getChannelSelector())
                 musicSelector->setSelectedChannelByName(musicInputName);
 
-            // <<< SỬA: Cách cập nhật MenubarComponent >>>
             if (auto* menubar = mainComponent.getMenubarComponent())
                 if (auto* outputSelector = menubar->getOutputSelector())
                     outputSelector->setSelectedChannelByName(appOutputName);
         }
 
-        // ... (phần còn lại của hàm không đổi) ...
+        // <<< MODIFIED: Load 5 quick preset assignments >>>
+        auto* quickPresetsXml = xml->getChildByName(SessionIds::QUICK_PRESETS);
+        if (quickPresetsXml != nullptr)
+        {
+            for (int i = 0; i < quickPresetSlots.size(); ++i)
+            {
+                quickPresetSlots.set(i, quickPresetsXml->getStringAttribute("slot" + juce::String(i), {}));
+            }
+        }
+
+        // ... (loading active preset and open windows is unchanged) ...
         auto* presetStateXml = xml->getChildByName(SessionIds::ACTIVE_PRESET);
         if (presetStateXml != nullptr)
         {
@@ -258,4 +279,29 @@ void AppState::loadLockState(bool isLocked, const juce::String& passwordHash)
     systemLocked = isLocked;
     lockPasswordHash = passwordHash;
     sendChangeMessage();
+}
+
+// <<< ADDED: Implementation for Quick Preset Slot Management >>>
+void AppState::assignQuickPreset(int slotIndex, const juce::String& presetName)
+{
+    if (juce::isPositiveAndBelow(slotIndex, quickPresetSlots.size()))
+    {
+        if (quickPresetSlots[slotIndex] != presetName)
+        {
+            quickPresetSlots.set(slotIndex, presetName);
+            sendChangeMessage(); // Notify listeners (like PresetBarComponent)
+        }
+    }
+}
+
+juce::String AppState::getQuickPresetName(int slotIndex) const
+{
+    if (juce::isPositiveAndBelow(slotIndex, quickPresetSlots.size()))
+        return quickPresetSlots[slotIndex];
+    return {};
+}
+
+int AppState::getNumQuickPresetSlots() const
+{
+    return numQuickSlots;
 }

Source/Data/AppState.h

@@ -7,6 +7,9 @@ class MainComponent;
 class AppState : public juce::ChangeBroadcaster
 {
 public:
+    // <<< ADDED: A constant for the number of slots >>>
+    static constexpr int numQuickSlots = 5;
+
     static AppState& getInstance();
 
     void setPresetDirty(bool dirty);
@@ -16,19 +19,10 @@ class AppState : public juce::ChangeBroadcaster
     void markAsSaved(const juce::String& newName);
 
     // --- CÁC HÀM CHO TÍNH NĂNG KHÓA ---
-    /** Locks the system with a given password. The password should be plain text. */
     void setSystemLocked(bool shouldBeLocked, const juce::String& password = {});
-
-    /** Unlocks the system if the provided password is correct. */
     bool unlockSystem(const juce::String& passwordAttempt);
-
-    /** Checks if the system is currently locked. */
     bool isSystemLocked() const;
-
-    /** Returns the MD5 hash of the current lock password. */
     juce::String getPasswordHash() const;
-
-    /** Loads lock state from a preset file. */
     void loadLockState(bool isLocked, const juce::String& passwordHash);
 
 
@@ -38,16 +32,25 @@ class AppState : public juce::ChangeBroadcaster
     void loadPostDeviceState(MainComponent& mainComponent);
     juce::File getSessionFile() const;
 
+    // <<< MODIFIED: Updated comments and consistency >>>
+    /** Assigns a preset name to a quick load slot. */
+    void assignQuickPreset(int slotIndex, const juce::String& presetName);
+    /** Gets the name of the preset assigned to a slot. */
+    juce::String getQuickPresetName(int slotIndex) const;
+    /** Gets the number of available quick slots. */
+    int getNumQuickPresetSlots() const;
+
 private:
     AppState();
     ~AppState() override;
 
     bool dirty = false;
     juce::String currentPresetName;
 
-    // --- BIẾN THÀNH VIÊN CHO TÍNH NĂNG KHÓA ---
     std::atomic<bool> systemLocked{ false };
     juce::String lockPasswordHash;
 
+    juce::StringArray quickPresetSlots;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AppState)
 };

Source/GUI/Components/ProjectManagerComponent.cpp

@@ -32,7 +32,6 @@ ProjectManagerComponent::ProjectManagerComponent(AudioEngine& engine) : audioEng
     addAndMakeVisible(stopProjectButton);
     stopProjectButton.onClick = [this] { stopProject(); };
 
-    // <<< THÊM: Khởi tạo và cấu hình các label >>>
     addAndMakeVisible(loadedProjectTitleLabel);
     loadedProjectTitleLabel.setFont(IdolUIHelpers::createRegularFont(14.0f));
     loadedProjectTitleLabel.setColour(juce::Label::textColourId, juce::Colours::lightgrey);
@@ -49,7 +48,7 @@ ProjectManagerComponent::ProjectManagerComponent(AudioEngine& engine) : audioEng
 
 ProjectManagerComponent::~ProjectManagerComponent()
 {
-    // unique_ptr will handle deletion automatically.
+    // unique_ptr handles the destruction automatically
     LanguageManager::getInstance().removeChangeListener(this);
     audioEngine.getProjectState().removeListener(this);
 }
@@ -62,23 +61,19 @@ void ProjectManagerComponent::paint(juce::Graphics& g)
     g.drawRoundedRectangle(getLocalBounds().toFloat(), 5.0f, 1.0f);
 }
 
-// <<< SỬA: Thêm static_cast<int> để loại bỏ cảnh báo >>>
 void ProjectManagerComponent::resized()
 {
     auto bounds = getLocalBounds().reduced(10);
 
-    // Chia thành 2 cột: trái cho thông tin, phải cho các nút
-    auto rightArea = bounds.removeFromRight(450); // Dành không gian rộng hơn cho các nút
+    auto rightArea = bounds.removeFromRight(450);
     auto leftArea = bounds;
 
-    // Layout cho cột trái
     loadedProjectTitleLabel.setBounds(leftArea.removeFromTop(leftArea.getHeight() / 2));
     loadedProjectLabel.setBounds(leftArea);
 
-    // Layout cho cột phải (4 nút trên cùng một hàng)
     juce::FlexBox fb;
-    fb.justifyContent = juce::FlexBox::JustifyContent::flexEnd; // Căn lề phải
-    fb.alignItems = juce::FlexBox::AlignItems::stretch; // Các nút cao bằng nhau
+    fb.justifyContent = juce::FlexBox::JustifyContent::flexEnd;
+    fb.alignItems = juce::FlexBox::AlignItems::stretch;
 
     const float gap = 10.0f;
 
@@ -106,20 +101,17 @@ void ProjectManagerComponent::valueTreePropertyChanged(juce::ValueTree& tree, co
         bool isPlaying = tree.getProperty(ProjectStateIDs::isPlaying);
         juce::String projectName = tree.getProperty(ProjectStateIDs::name).toString();
 
-        // Label "Loaded:" luôn hiển thị
         loadedProjectTitleLabel.setText(lang.get("projectManager.loaded"), juce::dontSendNotification);
 
         if (projectName.isNotEmpty())
         {
-            // Nếu có project, hiển thị tên và cập nhật các nút
             loadedProjectLabel.setText(projectName, juce::dontSendNotification);
             playProjectButton.setEnabled(!isPlaying);
             stopProjectButton.setEnabled(isPlaying);
             recordProjectButton.setEnabled(false);
         }
         else
         {
-            // Nếu không có project, hiển thị placeholder và cập nhật các nút
             loadedProjectLabel.setText(lang.get("projectManager.noProjectLoaded"), juce::dontSendNotification);
             playProjectButton.setEnabled(false);
             stopProjectButton.setEnabled(false);
@@ -140,7 +132,6 @@ void ProjectManagerComponent::updateTexts()
     playProjectButton.setButtonText(lang.get("projectManager.play"));
     stopProjectButton.setButtonText(lang.get("projectManager.stop"));
 
-    // <<< SỬA: Cập nhật lại cả hai label khi đổi ngôn ngữ >>>
     valueTreePropertyChanged(audioEngine.getProjectState(), {});
 }
 
@@ -194,24 +185,24 @@ void ProjectManagerComponent::stopProject()
     audioEngine.stopLoadedProject();
 }
 
-// <<< MODIFIED: Now uses unique_ptr and a callback for lifecycle management >>>
+// <<< MODIFIED: This now correctly manages the window lifecycle >>>
 void ProjectManagerComponent::manageProjects()
 {
     if (projectListWindow == nullptr)
     {
+        // Create the window and give it a callback to run on close.
+        // The callback safely resets this component's unique_ptr.
         projectListWindow = std::make_unique<ProjectListWindow>(
             "Projects",
             audioEngine,
             [this](const juce::File& projectJsonFile) {
                 audioEngine.loadProject(projectJsonFile);
             },
-            [this] { // on close callback
+            [this] { // on window close
                 projectListWindow.reset();
             }
         );
     }
-    else
-    {
-        projectListWindow->toFront(true);
-    }
+
+    projectListWindow->toFront(true);
 }

Source/GUI/Components/ProjectManagerComponent.h

@@ -29,7 +29,7 @@ class ProjectManagerComponent : public juce::Component,
 
     AudioEngine& audioEngine;
 
-    // <<< MODIFIED: Changed from SafePointer to unique_ptr for ownership >>>
+    // <<< MODIFIED: Changed from SafePointer to unique_ptr for robust ownership >>>
     std::unique_ptr<ProjectListWindow> projectListWindow;
 
     juce::Label loadedProjectTitleLabel;