User Interaction pref shows the push points modifier in the 'beginning a drag' row.

	- it is currently dual use (move both ends of a range marker
 	  during drag / push control points at the beginning of a drag).
	  this may have to be separated, but as it is called the push
	  points modifier, it belongs here.

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 4d34b629231aaec0beb44baf843e021d6f01e754..27828657e981ca2fdcec420980808425d994d417 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -562,6 +562,28 @@ public:
                t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
                t->attach (_constraint_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
+               ++row;
+               col = 1;
+
+               /* push points */
+               set_popdown_strings (_push_points_combo, dumb);
+               _push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
+
+               Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
+               for (int x = 0; modifiers[x].name; ++x) {
+                       if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
+                               _push_points_combo.set_active_text (S_(modifiers[x].name));
+                               break;
+                       }
+               }
+
+               l = manage (left_aligned_label (_("Push points using:")));
+               l->set_name ("OptionsLabel");
+
+               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+               t->attach (_push_points_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
                ++row;
 
                l = manage (left_aligned_label (_("When Beginning a Trim:")));
@@ -770,28 +792,6 @@ public:
                t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
                t->attach (_fine_adjust_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
 
-               ++row;
-               col = 1;
-
-               /* push points */
-               set_popdown_strings (_push_points_combo, dumb);
-               _push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
-
-               Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
-               for (int x = 0; modifiers[x].name; ++x) {
-                       if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
-                               _push_points_combo.set_active_text (S_(modifiers[x].name));
-                               break;
-                       }
-               }
-
-               l = manage (left_aligned_label (_("Push points using:")));
-               l->set_name ("OptionsLabel");
-
-               t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
-               t->attach (_push_points_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
-
                _box->pack_start (*t, false, false);
        }