From f230de56d33171a45588af91d31a3ea09c840933 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 12 May 2009 04:59:38 +0000 Subject: Fix internal node names. Update glade file. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1986 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginModel.cpp | 2 + src/engine/InternalController.cpp | 2 +- src/engine/InternalNote.cpp | 2 +- src/engine/InternalPlugin.hpp | 6 +-- src/engine/InternalTransport.cpp | 2 +- src/engine/InternalTrigger.cpp | 2 +- src/gui/ingen_gui.glade | 96 +++++++++++++++++++++++++++------------ 7 files changed, 74 insertions(+), 38 deletions(-) diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index f733087e..02d68330 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -49,6 +49,8 @@ PluginModel::PluginModel(const string& uri, const string& type_uri) _slv2_plugin = slv2_plugins_get_by_uri(_slv2_plugins, plugin_uri); slv2_value_free(plugin_uri); #endif + if (_type == Internal) + set_property("doap:name", Raul::Atom(uri.substr(uri.find_last_of("#") + 1).c_str())); } diff --git a/src/engine/InternalController.cpp b/src/engine/InternalController.cpp index e2dede41..7b1d6bc3 100644 --- a/src/engine/InternalController.cpp +++ b/src/engine/InternalController.cpp @@ -31,7 +31,7 @@ namespace Ingen { -static InternalPlugin controller_plugin(NS_INTERNALS "Controller", "controller", "Controller"); +static InternalPlugin controller_plugin(NS_INTERNALS "Controller", "controller"); ControllerNode::ControllerNode(const string& path, bool polyphonic, diff --git a/src/engine/InternalNote.cpp b/src/engine/InternalNote.cpp index f5b22c1a..0e5807a0 100644 --- a/src/engine/InternalNote.cpp +++ b/src/engine/InternalNote.cpp @@ -35,7 +35,7 @@ using namespace std; namespace Ingen { -static InternalPlugin note_plugin(NS_INTERNALS "Note", "note", "Note"); +static InternalPlugin note_plugin(NS_INTERNALS "Note", "note"); NoteNode::NoteNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size) : NodeBase(¬e_plugin, path, polyphonic, parent, srate, buffer_size) diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp index 1ada28a1..095899eb 100644 --- a/src/engine/InternalPlugin.hpp +++ b/src/engine/InternalPlugin.hpp @@ -47,11 +47,9 @@ class InternalPlugin : public PluginImpl { public: InternalPlugin(const std::string& uri, - const std::string& symbol, - const std::string& name) + const std::string& symbol) : PluginImpl(Plugin::Internal, uri) , _symbol(symbol) - , _name(name) {} NodeImpl* instantiate(const std::string& name, @@ -60,11 +58,9 @@ public: Engine& engine); const string symbol() const { return _symbol; } - const string name() const { return _name; } private: const string _symbol; - const string _name; }; diff --git a/src/engine/InternalTransport.cpp b/src/engine/InternalTransport.cpp index 90b8db28..9ef94ee8 100644 --- a/src/engine/InternalTransport.cpp +++ b/src/engine/InternalTransport.cpp @@ -26,7 +26,7 @@ namespace Ingen { -static InternalPlugin transport_plugin(NS_INTERNALS "Transport", "transport", "Transport"); +static InternalPlugin transport_plugin(NS_INTERNALS "Transport", "transport"); TransportNode::TransportNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size) : NodeBase(&transport_plugin, path, false, parent, srate, buffer_size) diff --git a/src/engine/InternalTrigger.cpp b/src/engine/InternalTrigger.cpp index 623b0bc2..abd205d1 100644 --- a/src/engine/InternalTrigger.cpp +++ b/src/engine/InternalTrigger.cpp @@ -30,7 +30,7 @@ using namespace std; namespace Ingen { -static InternalPlugin trigger_plugin(NS_INTERNALS "Trigger", "trigger", "Trigger"); +static InternalPlugin trigger_plugin(NS_INTERNALS "Trigger", "trigger"); TriggerNode::TriggerNode(const string& path, bool polyphonic, PatchImpl* parent, SampleRate srate, size_t buffer_size) : NodeBase(&trigger_plugin, path, false, parent, srate, buffer_size) diff --git a/src/gui/ingen_gui.glade b/src/gui/ingen_gui.glade index c5a2fb6e..6f47feee 100644 --- a/src/gui/ingen_gui.glade +++ b/src/gui/ingen_gui.glade @@ -25,9 +25,15 @@ True Load a patch into the current patch (merge with existing contents). True - True + False + + + True + gtk-open + + @@ -36,9 +42,15 @@ True Import a patch from a URI True - True + False + + + True + gtk-open + + @@ -62,9 +74,15 @@ True Save this patch to a specific file name True - True + False + + + True + gtk-save-as + + @@ -72,7 +90,7 @@ _Upload... True True - True + False @@ -82,7 +100,7 @@ _Draw... True True - True + False @@ -205,7 +223,7 @@ True Automatically arrange canvas True - True + False @@ -230,14 +248,14 @@ True View/Edit controls for this patch True - True + False - P_roperties... + gtk-properties True View/Edit properties for this patch True @@ -310,35 +328,53 @@ - _Engine... + _Engine True Connect to, Disconnect from, or Launch Engine True - True + False + + + True + gtk-execute + + - _Patch Tree... + _Patch Tree True View all patches in the engine as a heirarchial list True - True + False + + + True + gtk-index + + - _Messages... + _Messages True View error messages from the engine True - True + False + + + True + gtk-info + + @@ -358,7 +394,7 @@ Right-click the canvas to add objects True True - True + False @@ -366,7 +402,7 @@ Press 'e' to toggle edit mode True True - True + False @@ -1379,6 +1415,7 @@ True icons + 1 True @@ -1400,6 +1437,7 @@ True icons False + 1 True @@ -2729,7 +2767,7 @@ Contributors: _Input True True - True + False @@ -2768,7 +2806,7 @@ Contributors: _Output True True - True + False @@ -2808,7 +2846,7 @@ Contributors: True Load a plugin as a child of this patch True - True + False @@ -2818,7 +2856,7 @@ Contributors: True Load a patch as a child of this patch True - True + False @@ -2828,7 +2866,7 @@ Contributors: True Create a new (empty) patch as a child of this patch True - True + False @@ -3136,10 +3174,10 @@ Thank you for contributing. - _Properties... + gtk-properties True True - True + False @@ -3285,7 +3323,7 @@ Thank you for contributing. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Disconnect all connections True - True + False @@ -3295,7 +3333,7 @@ Thank you for contributing. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Rename this object True - True + False @@ -3334,7 +3372,7 @@ Thank you for contributing. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Learn from the next received event True - True + False @@ -3344,7 +3382,7 @@ Thank you for contributing. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Manipulate controls in a separate window True - True + False @@ -3354,7 +3392,7 @@ Thank you for contributing. GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Show this node's custom graphical interface in a separate window True - True + False @@ -3372,7 +3410,7 @@ Thank you for contributing. True Set all controls on this node to random values True - True + False -- cgit v1.2.1