fix main window title new file callback, add controller methods for s…

…aving properties to file
vsicurella · Jan 26, 2024 · e532408 · e532408
1 parent b4c8b30
commit e532408
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 13 deletions.
diff --git a/Source/LumatoneEditorState.cpp b/Source/LumatoneEditorState.cpp
@@ -14,6 +14,7 @@
 #include "./KeyEditComponent.h"
 
 #include "./lumatone_editor_library/device/lumatone_controller.h"
+#include "./lumatone_editor_library/listeners/editor_listener.h"
 
 juce::Array<juce::Identifier> GetLumatoneEditorProperty()
 {
@@ -283,6 +284,8 @@ bool LumatoneEditorState::Controller::performAction(LumatoneAction *action, bool
 // Open a SysEx mapping from the file specified in currentFile
 bool LumatoneEditorState::Controller::resetToCurrentFile()
 {
+    getEditorListeners()->call(&LumatoneEditor::EditorListener::newFileLoaded, editorState.getCurrentFile());
+
     if (editorState.getCurrentFile().getFullPathName().isEmpty())
     {
         // Replace with blank file
@@ -299,12 +302,6 @@ bool LumatoneEditorState::Controller::resetToCurrentFile()
 		editorState.getCurrentFile().readLines(stringArray);
 		LumatoneLayout keyMapping(stringArray);
 
-		// ((MainContentComponent*)(mainWindow->getContentComponent()))->setData(keyMapping);
-
-        // TODO FIX
-		// Window title
-		// updateMainTitle();
-
 		// Send configuration to controller, if connected
         editorState.setCompleteConfig(keyMapping);
 
@@ -330,7 +327,7 @@ bool LumatoneEditorState::Controller::resetToCurrentFile()
 bool LumatoneEditorState::Controller::setCurrentFile(File fileToOpen)
 {
     editorState.currentFile = fileToOpen;
-    // editorState.setPropertyExcludingListener(this, LumatoneEditorProperty::CurrentFile, editorState.currentFile.getFullPathName(), nullptr);
+    editorState.state.setPropertyExcludingListener(&editorState, LumatoneEditorProperty::CurrentFile, editorState.currentFile.getFullPathName(), nullptr);
     return resetToCurrentFile();
 }
 
@@ -387,17 +384,35 @@ bool LumatoneEditorState::Controller::savePropertiesFile() const
     return editorState.propertiesFile->saveIfNeeded();
 }
 
+void LumatoneEditorState::Controller::savePropertyBoolValue(const juce::Identifier &id, bool value)
+{
+    editorState.propertiesFile->setValue(id.toString(), juce::var(value));
+    savePropertiesFile();
+}
+
+void LumatoneEditorState::Controller::savePropertyIntValue(const juce::Identifier &id, int value)
+{
+    editorState.propertiesFile->setValue(id.toString(), juce::var(value));
+    savePropertiesFile();
+}
+
+void LumatoneEditorState::Controller::savePropertyStringValue(const juce::Identifier &id, juce::String value)
+{
+    editorState.propertiesFile->setValue(id.toString(), juce::var(value));
+    savePropertiesFile();
+}
+
 void LumatoneEditorState::Controller::setCalibrationMode(bool calibrationModeOn)
 {
     editorState.inCalibrationMode = calibrationModeOn;
     editorState.getLumatoneController()->setCalibratePitchModWheel(calibrationModeOn);
-    // writeBoolProperty(LumatoneEditorProperty::InCalibrationMode, calibrationModeOn, nullptr);
     editorState.setStateProperty(LumatoneEditorProperty::InCalibrationMode, editorState.inCalibrationMode);
+    savePropertyBoolValue(LumatoneEditorProperty::InCalibrationMode, calibrationModeOn);
 }
 
 void LumatoneEditorState::Controller::setDeveloperMode(bool developerModeOn)
 {
     editorState.inDeveloperMode = developerModeOn;
-    // writeBoolProperty(LumatoneEditorProperty::DeveloperModeOn, inDeveloperMode, undoManager);
     editorState.setStateProperty(LumatoneEditorProperty::DeveloperModeOn, editorState.inDeveloperMode);
+    savePropertyBoolValue(LumatoneEditorProperty::DeveloperModeOn, developerModeOn);
 }
diff --git a/Source/LumatoneEditorState.h b/Source/LumatoneEditorState.h
@@ -128,7 +128,7 @@ class LumatoneEditorState : public LumatoneApplicationState
 	juce::File                      currentFile;
 	std::shared_ptr<juce::RecentlyOpenedFilesList>	recentFiles;
 
-    std::shared_ptr<juce::PropertiesFile>   propertiesFile; // TODO move to state base?
+    std::shared_ptr<juce::PropertiesFile>   propertiesFile;
 
 //================================================================================
 public:
@@ -144,7 +144,7 @@ class LumatoneEditorState : public LumatoneApplicationState
         bool resetToCurrentFile();
         bool openRecentFile(int recentFileIndex);
 
-        virtual bool requestCompleteConfigFromDevice();
+        virtual bool requestCompleteConfigFromDevice() override;
 
         void addPalette(const LumatoneEditorColourPalette& newPalette);
         bool deletePaletteFile(juce::File pathToPalette);
@@ -158,6 +158,11 @@ class LumatoneEditorState : public LumatoneApplicationState
         juce::PropertiesFile* getPropertiesFile() const { return editorState.propertiesFile.get(); }
         bool savePropertiesFile() const;
 
+        // Sets a property in the juce::PropertyFile and saves it to file
+        void savePropertyBoolValue(const juce::Identifier& id, bool value);
+        void savePropertyIntValue(const  juce::Identifier& id, int value);
+        void savePropertyStringValue(const  juce::Identifier& id, juce::String value);
+
         void setHasChangesToSave(bool hasChanges) { editorState.setHasChangesToSave(hasChanges); }
         void setCalibrationMode(bool calibrationModeOn);
         void setDeveloperMode(bool developerModeOn);

diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
@@ -10,6 +10,8 @@
 #include "MainWindow.h"
 #include "MainComponent.h"
 
+#include "LumatoneMenu.h"
+
 #include "LumatoneEditorLookAndFeel.h"
 #include "./lumatone_editor_library/palettes/colour_palette_file.h"
 
@@ -52,12 +54,15 @@ MainWindow::MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationComm
     addKeyListener(commandManager->getKeyMappings());
     updateBounds();
 
+    addEditorListener(this);
+
     startTimer(2000);
 #endif
 }
 
 MainWindow::~MainWindow()
 {
+    removeEditorListener(this);
     removeKeyListener(commandManager->getKeyMappings());
 
 #if JUCE_MAC
@@ -183,7 +188,7 @@ void MainWindow::updateTitle()
 {
     juce::String windowTitle("Lumatone Editor");
 
-	if (!getCurrentFile().getFileName().isEmpty())
+	if (getCurrentFile().getFileName().isNotEmpty())
 		windowTitle << " - " << getCurrentFile().getFileName();
 
 	if (getHasChangesToSave())
@@ -192,6 +197,11 @@ void MainWindow::updateTitle()
 	setName(windowTitle);
 }
 
+void MainWindow::newFileLoaded(juce::File file)
+{
+    updateTitle();
+}
+
 void MainWindow::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier &property)
 {
     LumatoneEditorState::handleStatePropertyChange(stateIn, property);

diff --git a/Source/MainWindow.h b/Source/MainWindow.h
@@ -10,9 +10,18 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "LumatoneMenu.h"
 #include "LumatoneEditorState.h"
 
+#include "./lumatone_editor_library/listeners/editor_listener.h"
+
+namespace Lumatone
+{
+    namespace Menu
+    {
+        class MainMenuModel;
+    }
+}
+
 //==============================================================================
 /*
 This class implements the desktop window that contains an instance of
@@ -21,6 +30,7 @@ our MainContentComponent class.
 class MainWindow : public juce::DocumentWindow
                  , public LumatoneEditorState
                  , private LumatoneEditorState::Controller
+                 , private LumatoneEditor::EditorListener
                  , private juce::Timer
 {
 public:
@@ -61,6 +71,9 @@ class MainWindow : public juce::DocumentWindow
 
     void updateTitle();
 
+    // LumatoneEditor::EditorListener implementation
+    void newFileLoaded(juce::File file) override;
+
 private:
 
     void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier &property) override;

diff --git a/Source/lumatone_editor_library/listeners/editor_listener.h b/Source/lumatone_editor_library/listeners/editor_listener.h
@@ -20,6 +20,8 @@ class EditorListener
 
     virtual void selectionChanged(juce::Array<MappedLumatoneKey> selection) {}
 
+    virtual void newFileLoaded(juce::File file) {}
+
     //virtual void tableChanged(LumatoneConfigTable::TableType type, const juce::uint8* table, int tableSize) {}
 
     virtual void contextChanged(LumatoneContext* context) {}