From 682201731f28c627cf39592f4718a959862fa5f2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 23 Apr 2012 02:38:16 +0000 Subject: Remove vestigial edit mode stuff. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4253 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/client/PatchModel.hpp | 14 -------------- src/gui/PatchCanvas.cpp | 24 ------------------------ src/gui/PatchCanvas.hpp | 2 -- 3 files changed, 40 deletions(-) diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp index 4201e7f9..7416aec5 100644 --- a/ingen/client/PatchModel.hpp +++ b/ingen/client/PatchModel.hpp @@ -49,23 +49,11 @@ public: bool polyphonic() const; uint32_t internal_poly() const; - /** "editable" = arranging,connecting,adding,deleting,etc - * not editable (control mode) you can just change controllers (performing) - */ - bool get_editable() const { return _editable; } - void set_editable(bool e) const { - if (_editable != e) { - _editable = e; - const_cast(this)->signal_editable().emit(e); - } - } - // Signals INGEN_SIGNAL(new_node, void, SharedPtr); INGEN_SIGNAL(removed_node, void, SharedPtr); INGEN_SIGNAL(new_connection, void, SharedPtr); INGEN_SIGNAL(removed_connection, void, SharedPtr); - INGEN_SIGNAL(editable, void, bool); private: friend class ClientStore; @@ -73,7 +61,6 @@ private: PatchModel(Shared::URIs& uris, const Raul::Path& patch_path) : NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path) , _connections(new Connections()) - , _editable(true) { } @@ -86,7 +73,6 @@ private: const Ingen::Port* dst_port); SharedPtr _connections; - mutable bool _editable; }; } // namespace Client diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index dc5c8a49..1eb1413f 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -147,11 +147,6 @@ PatchCanvas::PatchCanvas(App& app, sigc::mem_fun(this, &PatchCanvas::menu_load_patch)); _menu_new_patch->signal_activate().connect( sigc::mem_fun(this, &PatchCanvas::menu_new_patch)); - _menu_edit->signal_activate().connect( - sigc::mem_fun(this, &PatchCanvas::menu_edit_toggled)); - - _patch->signal_editable().connect( - sigc::mem_fun(this, &PatchCanvas::patch_editable_changed)); } void @@ -590,12 +585,6 @@ PatchCanvas::on_event(GdkEvent* event) destroy_selection(); ret = true; break; - case GDK_e: - if (event->key.state == 0) { - _patch->set_editable(!_patch->get_editable()); - ret = true; - } - break; case GDK_Home: scroll_to(0, 0); break; @@ -884,18 +873,5 @@ PatchCanvas::menu_new_patch() _patch, get_initial_data(Resource::EXTERNAL)); } -void -PatchCanvas::menu_edit_toggled() -{ - _patch->set_editable(_menu_edit->get_active()); -} - -void -PatchCanvas::patch_editable_changed(bool editable) -{ - if (_menu_edit->get_active() != editable) - _menu_edit->set_active(editable); -} - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index db14c185..ab29863a 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -105,8 +105,6 @@ private: void menu_load_plugin(); void menu_new_patch(); void menu_load_patch(); - void menu_edit_toggled(); - void patch_editable_changed(bool editable); void load_plugin(WeakPtr plugin); void build_menus(); -- cgit v1.2.1