From 2b7f487f515929099744c69afe22f85c332b2f20 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 Jan 2010 05:55:01 +0000 Subject: Use ingen-ui for prefix instead of ingenuity. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2388 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/LoadPluginWindow.cpp | 4 ++-- src/gui/LoadSubpatchWindow.cpp | 4 ++-- src/gui/NodeModule.cpp | 12 ++++++------ src/gui/PatchCanvas.cpp | 8 ++++---- src/gui/PatchPortModule.cpp | 12 ++++++------ src/gui/ingen_gui.gladep | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/gui') diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index daa8e88a..07605f3c 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -350,9 +350,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) _node_name_entry->set_text(generate_module_name(plugin, _plugin_name_offset + 1)); // Cascade next node - Atom& x = _initial_data.find("ingenuity:canvas-x")->second; + Atom& x = _initial_data.find("ingen-ui:canvas-x")->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find("ingenuity:canvas-y")->second; + Atom& y = _initial_data.find("ingen-ui:canvas-y")->second; y = Atom(y.get_float() + 20.0f); } } diff --git a/src/gui/LoadSubpatchWindow.cpp b/src/gui/LoadSubpatchWindow.cpp index 82edc3a2..b2066ff6 100644 --- a/src/gui/LoadSubpatchWindow.cpp +++ b/src/gui/LoadSubpatchWindow.cpp @@ -165,9 +165,9 @@ LoadSubpatchWindow::ok_clicked() std::list uris = get_uris(); for (std::list::iterator i = uris.begin(); i != uris.end(); ++i) { // Cascade - Atom& x = _initial_data.find("ingenuity:canvas-x")->second; + Atom& x = _initial_data.find("ingen-ui:canvas-x")->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find("ingenuity:canvas-y")->second; + Atom& y = _initial_data.find("ingen-ui:canvas-y")->second; y = Atom(y.get_float() + 20.0f); App::instance().loader()->load_patch(false, *i, Path("/"), diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index de479c54..69b8eb55 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -379,14 +379,14 @@ NodeModule::store_location() const float x = static_cast(property_x()); const float y = static_cast(property_y()); - const Atom& existing_x = _node->get_property("ingenuity:canvas-x"); - const Atom& existing_y = _node->get_property("ingenuity:canvas-y"); + const Atom& existing_x = _node->get_property("ingen-ui:canvas-x"); + const Atom& existing_y = _node->get_property("ingen-ui:canvas-y"); if (existing_x.type() != Atom::FLOAT || existing_y.type() != Atom::FLOAT || existing_x.get_float() != x || existing_y.get_float() != y) { Shared::Resource::Properties props; - props.insert(make_pair("ingenuity:canvas-x", Atom(x))); - props.insert(make_pair("ingenuity:canvas-y", Atom(y))); + props.insert(make_pair("ingen-ui:canvas-x", Atom(x))); + props.insert(make_pair("ingen-ui:canvas-y", Atom(y))); App::instance().engine()->put(_node->path(), props); } } @@ -397,9 +397,9 @@ NodeModule::set_property(const URI& key, const Atom& value) { switch (value.type()) { case Atom::FLOAT: - if (key.str() == "ingenuity:canvas-x") { + if (key.str() == "ingen-ui:canvas-x") { move_to(value.get_float(), property_y()); - } else if (key.str() == "ingenuity:canvas-y") { + } else if (key.str() == "ingen-ui:canvas-y") { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 2d389e4e..c56c965a 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -685,10 +685,10 @@ PatchCanvas::paste() for (Store::iterator i = clipboard.begin(); i != clipboard.end(); ++i) { if (_patch->path().is_root() && i->first.is_root()) continue; - GraphObject::Properties::iterator x = i->second->properties().find("ingenuity:canvas-x"); + GraphObject::Properties::iterator x = i->second->properties().find("ingen-ui:canvas-x"); if (x != i->second->properties().end()) x->second = x->second.get_float() + (20.0f * _paste_count); - GraphObject::Properties::iterator y = i->second->properties().find("ingenuity:canvas-y"); + GraphObject::Properties::iterator y = i->second->properties().find("ingen-ui:canvas-y"); if (y != i->second->properties().end()) y->second = y->second.get_float() + (20.0f * _paste_count); if (i->first.parent().is_root()) { @@ -794,8 +794,8 @@ GraphObject::Properties PatchCanvas::get_initial_data() { GraphObject::Properties result; - result.insert(make_pair("ingenuity:canvas-x", Atom((float)_last_click_x))); - result.insert(make_pair("ingenuity:canvas-y", Atom((float)_last_click_y))); + result.insert(make_pair("ingen-ui:canvas-x", Atom((float)_last_click_x))); + result.insert(make_pair("ingen-ui:canvas-y", Atom((float)_last_click_y))); return result; } diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 1147e4c9..236a6250 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -97,14 +97,14 @@ PatchPortModule::store_location() const float x = static_cast(property_x()); const float y = static_cast(property_y()); - const Atom& existing_x = _model->get_property("ingenuity:canvas-x"); - const Atom& existing_y = _model->get_property("ingenuity:canvas-y"); + const Atom& existing_x = _model->get_property("ingen-ui:canvas-x"); + const Atom& existing_y = _model->get_property("ingen-ui:canvas-y"); if (existing_x.type() != Atom::FLOAT || existing_y.type() != Atom::FLOAT || existing_x.get_float() != x || existing_y.get_float() != y) { Shared::Resource::Properties props; - props.insert(make_pair("ingenuity:canvas-x", Atom(x))); - props.insert(make_pair("ingenuity:canvas-y", Atom(y))); + props.insert(make_pair("ingen-ui:canvas-x", Atom(x))); + props.insert(make_pair("ingen-ui:canvas-y", Atom(y))); App::instance().engine()->put(_model->meta_uri(), props); } } @@ -138,9 +138,9 @@ PatchPortModule::set_property(const URI& key, const Atom& value) { switch (value.type()) { case Atom::FLOAT: - if (key.str() == "ingenuity:canvas-x") { + if (key.str() == "ingen-ui:canvas-x") { move_to(value.get_float(), property_y()); - } else if (key.str() == "ingenuity:canvas-y") { + } else if (key.str() == "ingen-ui:canvas-y") { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/ingen_gui.gladep b/src/gui/ingen_gui.gladep index 7cd9c6ce..184ff460 100644 --- a/src/gui/ingen_gui.gladep +++ b/src/gui/ingen_gui.gladep @@ -2,8 +2,8 @@ - Ingenuity - ingenuity + Ingen + ingen C++ FALSE -- cgit v1.2.1