--- gigedit/trunk/src/gigedit/Settings.h	2016/05/18 10:10:25	2918
+++ 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.
@@ -45,7 +46,11 @@
         MIDI_RULES,
         FILE_PROPS,
         INSTR_PROPS,
+        SAMPLE_PROPS,
         SAMPLE_REFS,
+        MACRO_EDITOR,
+        MACROS_SETUP,
+        MACROS,
     };
 
     /**
@@ -68,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
@@ -88,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
@@ -122,6 +127,9 @@
     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;
@@ -134,6 +142,7 @@
     Property<int> scriptEditorWindowY;
     Property<int> scriptEditorWindowW;
     Property<int> scriptEditorWindowH;
+    Property<int> scriptEditorFontSize;
 
     // settings of "DimensionManager" group
     Property<int> dimensionManagerWindowX;
@@ -171,15 +180,35 @@
     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);