Move arrange to menu.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4964 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 22 insertions, 19 deletions

diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 0b31c90..1b2b1f5 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -62,6 +62,7 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine)
 	xml->get_widget("save_menuitem", _menu_file_save);
 	xml->get_widget("save_as_menuitem", _menu_file_save_as);
 	xml->get_widget("quit_menuitem", _menu_file_quit);
+	xml->get_widget("arrange_menuitem", _menu_view_arrange);
 	xml->get_widget("import_midi_menuitem", _menu_import_midi);
 	xml->get_widget("export_midi_menuitem", _menu_export_midi);
 	xml->get_widget("export_graphviz_menuitem", _menu_export_graphviz);
@@ -79,7 +80,6 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine)
 	xml->get_widget("play_but", _play_button);
 	xml->get_widget("zoom_normal_but", _zoom_normal_button);
 	xml->get_widget("zoom_full_but", _zoom_full_button);
-	xml->get_widget("arrange_but", _arrange_button);
 	xml->get_widget("chain_but", _chain_button);
 	xml->get_widget("fan_but", _fan_button);
 	xml->get_widget("load_target_but", _load_target_button);
@@ -114,9 +114,6 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine)
 	_zoom_full_button->signal_clicked().connect(
 		sigc::mem_fun(_canvas.get(), &MachinaCanvas::zoom_full));
 
-	_arrange_button->signal_clicked().connect(
-		sigc::mem_fun(this, &MachinaGUI::arrange));
-
 	_chain_button->signal_toggled().connect(
 		sigc::mem_fun(this, &MachinaGUI::chain_toggled));
 	_fan_button->signal_toggled().connect(
@@ -130,6 +127,8 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine)
 		sigc::mem_fun(this, &MachinaGUI::menu_file_save_as));
 	_menu_file_quit->signal_activate().connect(
 		sigc::mem_fun(this, &MachinaGUI::menu_file_quit));
+	_menu_view_arrange->signal_activate().connect(
+		sigc::mem_fun(this, &MachinaGUI::arrange));
 	_menu_import_midi->signal_activate().connect(
 		sigc::mem_fun(this, &MachinaGUI::menu_import_midi));
 	_menu_export_midi->signal_activate().connect(
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp
index a4e3908..061cc8a 100644
--- a/src/gui/MachinaGUI.hpp
+++ b/src/gui/MachinaGUI.hpp
@@ -141,6 +141,7 @@ protected:
 	Gtk::MenuItem*         _menu_file_save;
 	Gtk::MenuItem*         _menu_file_save_as;
 	Gtk::MenuItem*         _menu_file_quit;
+	Gtk::MenuItem*         _menu_view_arrange;
 	Gtk::MenuItem*         _menu_import_midi;
 	Gtk::MenuItem*         _menu_export_midi;
 	Gtk::MenuItem*         _menu_export_graphviz;
@@ -160,7 +161,6 @@ protected:
 	Gtk::ToggleToolButton* _play_button;
 	Gtk::ToolButton*       _zoom_normal_button;
 	Gtk::ToolButton*       _zoom_full_button;
-	Gtk::ToolButton*       _arrange_button;
 	Gtk::RadioButton*      _chain_button;
 	Gtk::RadioButton*      _fan_button;
 	Gtk::ToolButton*       _load_target_button;
diff --git a/src/gui/machina.ui b/src/gui/machina.ui
index ccf85ad..eeea2f4 100644
--- a/src/gui/machina.ui
+++ b/src/gui/machina.ui
@@ -247,7 +247,7 @@ press stop or play and the new nodes will be added to the machine.
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="G" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_export_graphviz_menuitem_activate" swapped="no"/>
                       </object>
                     </child>
@@ -305,6 +305,23 @@ press stop or play and the new nodes will be added to the machine.
                         <signal name="activate" handler="on_toolbar2_activate" swapped="no"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="arrange_menuitem">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Arrange</property>
+                        <property name="use_underline">True</property>
+                        <accelerator key="g" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -597,19 +614,6 @@ press stop or play and the new nodes will be added to the machine.
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="arrange_but">
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Arrange canvas</property>
-                    <property name="stock_id">gtk-refresh</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkSeparatorToolItem" id="separatortoolitem5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>