--- gigedit/trunk/src/gigedit/Settings.h	2016/04/26 17:42:26	2891
+++ gigedit/trunk/src/gigedit/Settings.h	2020/01/10 14:22:25	3711
@@ -1,6 +1,6 @@
 /*
-    Copyright (c) 2014-2016 Christian Schoenebeck
-    
+    Copyright (c) 2014-2020 Christian Schoenebeck
+
     This file is part of "gigedit" and released under the terms of the
     GNU General Public License version 2.
 */
@@ -12,6 +12,7 @@
 #include <glibmm/object.h>
 #include <glibmm/property.h>
 #include <vector>
+#include "global.h"
 
 /**
  * Reflects, saves and restores all settings for the gigedit application.
@@ -36,7 +37,20 @@
      * All settings are grouped into these settings groups.
      */
     enum Group_t {
-        GLOBAL
+        GLOBAL,
+        MAIN_WINDOW,
+        SCRIPT_EDITOR,
+        DIMENSION_MANAGER,
+        SCRIPT_SLOTS,
+        COMBINE_INSTRUMENTS,
+        MIDI_RULES,
+        FILE_PROPS,
+        INSTR_PROPS,
+        SAMPLE_PROPS,
+        SAMPLE_REFS,
+        MACRO_EDITOR,
+        MACROS_SETUP,
+        MACROS,
     };
 
     /**
@@ -59,7 +73,7 @@
                 sigc::bind(
                     sigc::bind(
                         sigc::bind(
-                            sigc::mem_fun(m_settings, &Settings::onPropertyChanged),
+                            sigc::mem_fun(*m_settings, &Settings::onPropertyChanged),
                             m_group
                         ),
                         type
@@ -79,7 +93,7 @@
                 sigc::bind(
                     sigc::bind(
                         sigc::bind(
-                            sigc::mem_fun(m_settings, &Settings::onPropertyChanged),
+                            sigc::mem_fun(*m_settings, &Settings::onPropertyChanged),
                             m_group
                         ),
                         type
@@ -108,13 +122,93 @@
         Group_t m_group;
     };
 
+    // settings of "Global" group
     Property<bool> warnUserOnExtensions; ///< if enabled, the user shall he be warned if he is trying to use a gig format extension that will not work with Gigasampler/GigaStudio
     Property<bool> syncSamplerInstrumentSelection; ///< if enabled, the sampler's current instrument will automatically be switched whenever another instrument was selected in gigedit
     Property<bool> moveRootNoteWithRegionMoved; ///< if enabled, the root note(s) of regions are automatically moving when the user drags a region around at the virtual keyboard
+    Property<bool> autoRestoreWindowDimension;
+    Property<bool> saveWithTemporaryFile; ///< If enabled and the user selects "Save" from the main menu, then the file is first saved as separate temporary file and after the save operation completed the temporary file is moved over the original file.
+    Property<bool> showTooltips; ///< Whether tooltips specifically intended for newbies should be displayed throughout the application (default: yes).
+    Property<bool> instrumentDoubleClickOpensProps; ///< If enabled then double clicking on an instrument of the instruments list view will show the selected instrument's properties dialog.
+
+    // settings of "MainWindow" group
+    Property<int> mainWindowX;
+    Property<int> mainWindowY;
+    Property<int> mainWindowW;
+    Property<int> mainWindowH;
+
+    // settings of "ScriptEditor" group
+    Property<int> scriptEditorWindowX;
+    Property<int> scriptEditorWindowY;
+    Property<int> scriptEditorWindowW;
+    Property<int> scriptEditorWindowH;
+    Property<int> scriptEditorFontSize;
+
+    // settings of "DimensionManager" group
+    Property<int> dimensionManagerWindowX;
+    Property<int> dimensionManagerWindowY;
+    Property<int> dimensionManagerWindowW;
+    Property<int> dimensionManagerWindowH;
+
+    // settings of "ScriptSlots" group
+    Property<int> scriptSlotsWindowX;
+    Property<int> scriptSlotsWindowY;
+    Property<int> scriptSlotsWindowW;
+    Property<int> scriptSlotsWindowH;
+
+    // settings of "CombineInstruments" group
+    Property<int> combineInstrumentsWindowX;
+    Property<int> combineInstrumentsWindowY;
+    Property<int> combineInstrumentsWindowW;
+    Property<int> combineInstrumentsWindowH;
+
+    // settings of "MidiRules" group
+    Property<int> midiRulesWindowX;
+    Property<int> midiRulesWindowY;
+    Property<int> midiRulesWindowW;
+    Property<int> midiRulesWindowH;
+
+    // settings of "FileProps" group
+    Property<int> filePropsWindowX;
+    Property<int> filePropsWindowY;
+    Property<int> filePropsWindowW;
+    Property<int> filePropsWindowH;
+
+    // settings of "InstrProps" group
+    Property<int> instrPropsWindowX;
+    Property<int> instrPropsWindowY;
+    Property<int> instrPropsWindowW;
+    Property<int> instrPropsWindowH;
+
+    // settings of "SampleProps" group
+    Property<int> samplePropsWindowX;
+    Property<int> samplePropsWindowY;
+    Property<int> samplePropsWindowW;
+    Property<int> samplePropsWindowH;
+
+    // settings of "SampleRefs" group
+    Property<int> sampleRefsWindowX;
+    Property<int> sampleRefsWindowY;
+    Property<int> sampleRefsWindowW;
+    Property<int> sampleRefsWindowH;
+
+    // settings of "MacroEditor" group
+    Property<int> macroEditorWindowX;
+    Property<int> macroEditorWindowY;
+    Property<int> macroEditorWindowW;
+    Property<int> macroEditorWindowH;
+
+    // settings of "MacrosSetup" group
+    Property<int> macrosSetupWindowX;
+    Property<int> macrosSetupWindowY;
+    Property<int> macrosSetupWindowW;
+    Property<int> macrosSetupWindowH;
 
     static Settings* singleton();
     Settings();
     void load();
+    void loadMacros(std::vector<Serialization::Archive>& macros);
+    void saveMacros(const std::vector<Serialization::Archive>& macros);
 
 protected:
     void onPropertyChanged(Glib::PropertyBase* pProperty, RawValueType_t type, Group_t group);