Changed defaults for the General Setter elements to Piston GrandOrgue…

…#1360
oleg68 · Feb 10, 2023 · 5dc11a9 · 5dc11a9
1 parent 3767c4b
commit 5dc11a9
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Changed defaults for the General Setter elements to Piston https://github.com/GrandOrgue/grandorgue/issues/1360
 - Added new fields ManualTuning and AutoTuningCorrection of Organ Settings https://github.com/GrandOrgue/grandorgue/issues/1333
 - Fixed duplicating packaged organs in the organ list https://github.com/GrandOrgue/grandorgue/issues/1367
 - Fixed displaying a popup window when a cache had been created with another GO version https://github.com/GrandOrgue/grandorgue/issues/1363

diff --git a/help/grandorgue.xml b/help/grandorgue.xml
@@ -7263,7 +7263,7 @@ GUI attributes of a button (displayed as button per default).
           <listitem>
             <para>
 Buttons for the setter generals. The section must contain the GUI
-attributes of a button (displayed as button per default).
+attributes of a button (displayed as piston per default).
      </para>
           </listitem>
         </varlistentry>
@@ -7272,7 +7272,7 @@ attributes of a button (displayed as button per default).
           <listitem>
             <para>
 Buttons for switching banks of the setter generals. The section must
-contain the GUI attributes of a button (displayed as button per
+contain the GUI attributes of a button (displayed as piston per
 default).
      </para>
           </listitem>

diff --git a/src/grandorgue/combinations/GOSetter.cpp b/src/grandorgue/combinations/GOSetter.cpp
@@ -163,59 +163,59 @@ const struct GOElementCreator::ButtonDefinitionEntry GOSetter::m_element_types[]
     {wxT("Full"), ID_SETTER_FULL, true, false, false},
     {wxT("Insert"), ID_SETTER_INSERT, true, true, false},
     {wxT("Delete"), ID_SETTER_DELETE, true, true, false},
-    {wxT("General01"), ID_SETTER_GENERAL00, true, true, false},
-    {wxT("General02"), ID_SETTER_GENERAL01, true, true, false},
-    {wxT("General03"), ID_SETTER_GENERAL02, true, true, false},
-    {wxT("General04"), ID_SETTER_GENERAL03, true, true, false},
-    {wxT("General05"), ID_SETTER_GENERAL04, true, true, false},
-    {wxT("General06"), ID_SETTER_GENERAL05, true, true, false},
-    {wxT("General07"), ID_SETTER_GENERAL06, true, true, false},
-    {wxT("General08"), ID_SETTER_GENERAL07, true, true, false},
-    {wxT("General09"), ID_SETTER_GENERAL08, true, true, false},
-    {wxT("General10"), ID_SETTER_GENERAL09, true, true, false},
-    {wxT("General11"), ID_SETTER_GENERAL10, true, true, false},
-    {wxT("General12"), ID_SETTER_GENERAL11, true, true, false},
-    {wxT("General13"), ID_SETTER_GENERAL12, true, true, false},
-    {wxT("General14"), ID_SETTER_GENERAL13, true, true, false},
-    {wxT("General15"), ID_SETTER_GENERAL14, true, true, false},
-    {wxT("General16"), ID_SETTER_GENERAL15, true, true, false},
-    {wxT("General17"), ID_SETTER_GENERAL16, true, true, false},
-    {wxT("General18"), ID_SETTER_GENERAL17, true, true, false},
-    {wxT("General19"), ID_SETTER_GENERAL18, true, true, false},
-    {wxT("General20"), ID_SETTER_GENERAL19, true, true, false},
-    {wxT("General21"), ID_SETTER_GENERAL20, true, true, false},
-    {wxT("General22"), ID_SETTER_GENERAL21, true, true, false},
-    {wxT("General23"), ID_SETTER_GENERAL22, true, true, false},
-    {wxT("General24"), ID_SETTER_GENERAL23, true, true, false},
-    {wxT("General25"), ID_SETTER_GENERAL24, true, true, false},
-    {wxT("General26"), ID_SETTER_GENERAL25, true, true, false},
-    {wxT("General27"), ID_SETTER_GENERAL26, true, true, false},
-    {wxT("General28"), ID_SETTER_GENERAL27, true, true, false},
-    {wxT("General29"), ID_SETTER_GENERAL28, true, true, false},
-    {wxT("General30"), ID_SETTER_GENERAL29, true, true, false},
-    {wxT("General31"), ID_SETTER_GENERAL30, true, true, false},
-    {wxT("General32"), ID_SETTER_GENERAL31, true, true, false},
-    {wxT("General33"), ID_SETTER_GENERAL32, true, true, false},
-    {wxT("General34"), ID_SETTER_GENERAL33, true, true, false},
-    {wxT("General35"), ID_SETTER_GENERAL34, true, true, false},
-    {wxT("General36"), ID_SETTER_GENERAL35, true, true, false},
-    {wxT("General37"), ID_SETTER_GENERAL36, true, true, false},
-    {wxT("General38"), ID_SETTER_GENERAL37, true, true, false},
-    {wxT("General39"), ID_SETTER_GENERAL38, true, true, false},
-    {wxT("General40"), ID_SETTER_GENERAL39, true, true, false},
-    {wxT("General41"), ID_SETTER_GENERAL40, true, true, false},
-    {wxT("General42"), ID_SETTER_GENERAL41, true, true, false},
-    {wxT("General43"), ID_SETTER_GENERAL42, true, true, false},
-    {wxT("General44"), ID_SETTER_GENERAL43, true, true, false},
-    {wxT("General45"), ID_SETTER_GENERAL44, true, true, false},
-    {wxT("General46"), ID_SETTER_GENERAL45, true, true, false},
-    {wxT("General47"), ID_SETTER_GENERAL46, true, true, false},
-    {wxT("General48"), ID_SETTER_GENERAL47, true, true, false},
-    {wxT("General49"), ID_SETTER_GENERAL48, true, true, false},
-    {wxT("General50"), ID_SETTER_GENERAL49, true, true, false},
-
-    {wxT("GeneralPrev"), ID_SETTER_GENERAL_PREV, true, true, false},
-    {wxT("GeneralNext"), ID_SETTER_GENERAL_NEXT, true, true, false},
+    {wxT("General01"), ID_SETTER_GENERAL00, true, true, true},
+    {wxT("General02"), ID_SETTER_GENERAL01, true, true, true},
+    {wxT("General03"), ID_SETTER_GENERAL02, true, true, true},
+    {wxT("General04"), ID_SETTER_GENERAL03, true, true, true},
+    {wxT("General05"), ID_SETTER_GENERAL04, true, true, true},
+    {wxT("General06"), ID_SETTER_GENERAL05, true, true, true},
+    {wxT("General07"), ID_SETTER_GENERAL06, true, true, true},
+    {wxT("General08"), ID_SETTER_GENERAL07, true, true, true},
+    {wxT("General09"), ID_SETTER_GENERAL08, true, true, true},
+    {wxT("General10"), ID_SETTER_GENERAL09, true, true, true},
+    {wxT("General11"), ID_SETTER_GENERAL10, true, true, true},
+    {wxT("General12"), ID_SETTER_GENERAL11, true, true, true},
+    {wxT("General13"), ID_SETTER_GENERAL12, true, true, true},
+    {wxT("General14"), ID_SETTER_GENERAL13, true, true, true},
+    {wxT("General15"), ID_SETTER_GENERAL14, true, true, true},
+    {wxT("General16"), ID_SETTER_GENERAL15, true, true, true},
+    {wxT("General17"), ID_SETTER_GENERAL16, true, true, true},
+    {wxT("General18"), ID_SETTER_GENERAL17, true, true, true},
+    {wxT("General19"), ID_SETTER_GENERAL18, true, true, true},
+    {wxT("General20"), ID_SETTER_GENERAL19, true, true, true},
+    {wxT("General21"), ID_SETTER_GENERAL20, true, true, true},
+    {wxT("General22"), ID_SETTER_GENERAL21, true, true, true},
+    {wxT("General23"), ID_SETTER_GENERAL22, true, true, true},
+    {wxT("General24"), ID_SETTER_GENERAL23, true, true, true},
+    {wxT("General25"), ID_SETTER_GENERAL24, true, true, true},
+    {wxT("General26"), ID_SETTER_GENERAL25, true, true, true},
+    {wxT("General27"), ID_SETTER_GENERAL26, true, true, true},
+    {wxT("General28"), ID_SETTER_GENERAL27, true, true, true},
+    {wxT("General29"), ID_SETTER_GENERAL28, true, true, true},
+    {wxT("General30"), ID_SETTER_GENERAL29, true, true, true},
+    {wxT("General31"), ID_SETTER_GENERAL30, true, true, true},
+    {wxT("General32"), ID_SETTER_GENERAL31, true, true, true},
+    {wxT("General33"), ID_SETTER_GENERAL32, true, true, true},
+    {wxT("General34"), ID_SETTER_GENERAL33, true, true, true},
+    {wxT("General35"), ID_SETTER_GENERAL34, true, true, true},
+    {wxT("General36"), ID_SETTER_GENERAL35, true, true, true},
+    {wxT("General37"), ID_SETTER_GENERAL36, true, true, true},
+    {wxT("General38"), ID_SETTER_GENERAL37, true, true, true},
+    {wxT("General39"), ID_SETTER_GENERAL38, true, true, true},
+    {wxT("General40"), ID_SETTER_GENERAL39, true, true, true},
+    {wxT("General41"), ID_SETTER_GENERAL40, true, true, true},
+    {wxT("General42"), ID_SETTER_GENERAL41, true, true, true},
+    {wxT("General43"), ID_SETTER_GENERAL42, true, true, true},
+    {wxT("General44"), ID_SETTER_GENERAL43, true, true, true},
+    {wxT("General45"), ID_SETTER_GENERAL44, true, true, true},
+    {wxT("General46"), ID_SETTER_GENERAL45, true, true, true},
+    {wxT("General47"), ID_SETTER_GENERAL46, true, true, true},
+    {wxT("General48"), ID_SETTER_GENERAL47, true, true, true},
+    {wxT("General49"), ID_SETTER_GENERAL48, true, true, true},
+    {wxT("General50"), ID_SETTER_GENERAL49, true, true, true},
+
+    {wxT("GeneralPrev"), ID_SETTER_GENERAL_PREV, true, true, true},
+    {wxT("GeneralNext"), ID_SETTER_GENERAL_NEXT, true, true, true},
 
     {wxT("PitchP1"), ID_SETTER_PITCH_P1, true, true, false},
     {wxT("PitchP10"), ID_SETTER_PITCH_P10, true, true, false},