From e1fd01fb8b7899ff257de69ad05583e29d0dd1e0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 22 Apr 2012 16:55:03 +0000 Subject: Remove edit mode. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4232 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/PatchBox.cpp | 18 ------------------ src/gui/PatchBox.hpp | 3 --- src/gui/PatchView.cpp | 28 ---------------------------- src/gui/PatchView.hpp | 5 ----- src/gui/ingen_gui.ui | 46 ---------------------------------------------- 5 files changed, 100 deletions(-) diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp index 11921fa6..820c2a7b 100644 --- a/src/gui/PatchBox.cpp +++ b/src/gui/PatchBox.cpp @@ -77,7 +77,6 @@ PatchBox::PatchBox(BaseObjectType* cobject, xml->get_widget("patch_save_menuitem", _menu_save); xml->get_widget("patch_save_as_menuitem", _menu_save_as); xml->get_widget("patch_draw_menuitem", _menu_draw); - xml->get_widget("patch_edit_controls_menuitem", _menu_edit_controls); xml->get_widget("patch_cut_menuitem", _menu_cut); xml->get_widget("patch_copy_menuitem", _menu_copy); xml->get_widget("patch_paste_menuitem", _menu_paste); @@ -111,8 +110,6 @@ PatchBox::PatchBox(BaseObjectType* cobject, sigc::mem_fun(this, &PatchBox::event_save_as)); _menu_draw->signal_activate().connect( sigc::mem_fun(this, &PatchBox::event_draw)); - _menu_edit_controls->signal_activate().connect( - sigc::mem_fun(this, &PatchBox::event_edit_controls)); _menu_copy->signal_activate().connect( sigc::mem_fun(this, &PatchBox::event_copy)); _menu_paste->signal_activate().connect( @@ -273,8 +270,6 @@ PatchBox::set_patch(SharedPtr patch, sigc::mem_fun(this, &PatchBox::patch_port_added)); removed_port_connection = patch->signal_removed_port().connect( sigc::mem_fun(this, &PatchBox::patch_port_removed)); - removed_port_connection = patch->signal_editable().connect( - sigc::mem_fun(this, &PatchBox::editable_changed)); show(); _alignment->show_all(); @@ -399,12 +394,6 @@ PatchBox::object_left(const ObjectModel* model) _status_bar->pop(STATUS_CONTEXT_HOVER); } -void -PatchBox::editable_changed(bool editable) -{ - _menu_edit_controls->set_active(editable); -} - void PatchBox::event_show_engine() { @@ -605,13 +594,6 @@ PatchBox::event_draw() } } -void -PatchBox::event_edit_controls() -{ - if (_view) - _view->set_editable(_menu_edit_controls->get_active()); -} - void PatchBox::event_copy() { diff --git a/src/gui/PatchBox.hpp b/src/gui/PatchBox.hpp index 7a7bf04e..17855261 100644 --- a/src/gui/PatchBox.hpp +++ b/src/gui/PatchBox.hpp @@ -80,7 +80,6 @@ private: void patch_port_added(SharedPtr port); void patch_port_removed(SharedPtr port); void show_status(const ObjectModel* model); - void editable_changed(bool editable); int message_dialog(const Glib::ustring& message, const Glib::ustring& secondary_text, @@ -91,7 +90,6 @@ private: void event_save(); void event_save_as(); void event_draw(); - void event_edit_controls(); void event_copy(); void event_paste(); void event_delete(); @@ -124,7 +122,6 @@ private: Gtk::MenuItem* _menu_save; Gtk::MenuItem* _menu_save_as; Gtk::MenuItem* _menu_draw; - Gtk::CheckMenuItem* _menu_edit_controls; Gtk::MenuItem* _menu_cut; Gtk::MenuItem* _menu_copy; Gtk::MenuItem* _menu_paste; diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp index 346aaed7..605bef6b 100644 --- a/src/gui/PatchView.cpp +++ b/src/gui/PatchView.cpp @@ -52,7 +52,6 @@ PatchView::PatchView(BaseObjectType* cobject, xml->get_widget("patch_view_save_but", _save_but); xml->get_widget("patch_view_zoom_full_but", _zoom_full_but); xml->get_widget("patch_view_zoom_normal_but", _zoom_normal_but); - xml->get_widget("patch_view_edit_mode_but", _edit_mode_but); xml->get_widget("patch_view_scrolledwindow", _canvas_scrolledwindow); _toolbar->set_toolbar_style(Gtk::TOOLBAR_ICONS); @@ -101,12 +100,6 @@ PatchView::set_patch(SharedPtr patch) _zoom_full_but->signal_clicked().connect( sigc::mem_fun(_canvas.get(), &PatchCanvas::zoom_full)); - patch->signal_editable().connect(sigc::mem_fun( - *this, &PatchView::on_editable_sig)); - - _edit_mode_but->signal_toggled().connect(sigc::mem_fun( - *this, &PatchView::editable_toggled)); - _poly_spin->signal_value_changed().connect( sigc::mem_fun(*this, &PatchView::poly_changed)); @@ -132,27 +125,6 @@ PatchView::create(App& app, SharedPtr patch) return SharedPtr(result); } -void -PatchView::on_editable_sig(bool editable) -{ - _edit_mode_but->set_active(editable); - _canvas->set_locked(!editable); -} - -void -PatchView::editable_toggled() -{ - const bool editable = _edit_mode_but->get_active(); - set_editable(editable); -} - -void -PatchView::set_editable(bool editable) -{ - _patch->set_editable(editable); - _canvas->set_locked(!editable); -} - #if 0 void PatchView::canvas_item_entered(Gnome::Canvas::Item* item) diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 4509b63d..c9ce938a 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -63,8 +63,6 @@ public: SharedPtr patch() const { return _patch; } Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; } - void set_editable(bool editable); - static SharedPtr create(App& app, SharedPtr patch); sigc::signal signal_object_entered; @@ -77,8 +75,6 @@ private: void poly_changed(); void clear_clicked(); void refresh_clicked(); - void on_editable_sig(bool locked); - void editable_toggled(); #if 0 void canvas_item_entered(Gnome::Canvas::Item* item); @@ -102,7 +98,6 @@ private: Gtk::ToolButton* _save_but; Gtk::ToolButton* _zoom_normal_but; Gtk::ToolButton* _zoom_full_but; - Gtk::ToggleToolButton* _edit_mode_but; Gtk::ToolItem* _breadcrumb_container; bool _enable_signal; diff --git a/src/gui/ingen_gui.ui b/src/gui/ingen_gui.ui index 93844a42..74f09bf8 100644 --- a/src/gui/ingen_gui.ui +++ b/src/gui/ingen_gui.ui @@ -1664,17 +1664,6 @@ Contributors: False - - - True - False - False - _Edit connections - True - True - - - True @@ -1969,16 +1958,6 @@ Contributors: False - - - Press 'e' to toggle edit mode - True - False - False - True - False - - True @@ -2739,31 +2718,6 @@ Contributors: True - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - Edit - gtk-connect - True - - - False - True - - False -- cgit v1.2.1