diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-20 02:50:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-20 02:50:28 +0000 |
commit | 9062d7c731472bd9455bea829653653681ce4f17 (patch) | |
tree | 6e34f7248833fa23ba9252f1d1940339805d7539 | |
parent | 58c34fe805ddbe0d93c25a0eec1fe52106945743 (diff) |
small but major fix for Controllable state storage (do not create illegal XML nodes); set wmclass for plugin windows; use X_() for all wmclass names
git-svn-id: svn://localhost/ardour2/trunk@1234 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/crossfade_edit.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/export_dialog.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/location_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/meter_bridge.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/option_editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/plugin_ui.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/route_params_ui.cc | 2 | ||||
-rw-r--r-- | libs/pbd/controllable.cc | 4 | ||||
-rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 2 |
12 files changed, 15 insertions, 12 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 39dd6ac156..4875b8db89 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1701,7 +1701,7 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) msg.set_name (X_("CleanupDialog")); - msg.set_wmclass (_("existing_session"), "Ardour"); + msg.set_wmclass (X_("existing_session"), "Ardour"); msg.set_position (Gtk::WIN_POS_MOUSE); switch (msg.run()) { @@ -2041,7 +2041,7 @@ After cleanup, unused audio files will be moved to a \ checker.set_default_response (RESPONSE_CANCEL); checker.set_name (_("CleanupDialog")); - checker.set_wmclass (_("ardour_cleanup"), "Ardour"); + checker.set_wmclass (X_("ardour_cleanup"), "Ardour"); checker.set_position (Gtk::WIN_POS_MOUSE); switch (checker.run()) { diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 4271a35315..f6f26c76d5 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -96,7 +96,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m select_in_button (_("Fade In")), select_out_button (_("Fade Out")) { - set_wmclass ("ardour_automationedit", "Ardour"); + set_wmclass (X_("ardour_automationedit"), "Ardour"); set_name ("CrossfadeEditWindow"); set_position (Gtk::WIN_POS_MOUSE); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 27c2802180..37fc8ccdc7 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -708,7 +708,7 @@ Editor::Editor (AudioEngine& eng) set_default_icon_list (window_icons); } set_title (_("ardour: editor")); - set_wmclass (_("ardour_editor"), "Ardour"); + set_wmclass (X_("ardour_editor"), "Ardour"); add (vpacker); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 31f30e09a6..cf94233072 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -121,7 +121,7 @@ ExportDialog::ExportDialog(PublicEditor& e) export_cd_markers_allowed = true; set_title (_("ardour: export")); - set_wmclass (_("ardour_export"), "Ardour"); + set_wmclass (X_("ardour_export"), "Ardour"); set_name ("ExportWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 13dd95b47d..4eea862ea4 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -574,7 +574,7 @@ LocationUI::LocationUI () i_am_the_modifier = 0; set_title(_("ardour: locations")); - set_wmclass(_("ardour_locations"), "Ardour"); + set_wmclass(X_("ardour_locations"), "Ardour"); set_name ("LocationWindow"); diff --git a/gtk2_ardour/meter_bridge.cc b/gtk2_ardour/meter_bridge.cc index b871561563..0e88eff5e0 100644 --- a/gtk2_ardour/meter_bridge.cc +++ b/gtk2_ardour/meter_bridge.cc @@ -76,7 +76,7 @@ MeterBridge::MeterBridge () add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); set_name ("MeterBridgeWindow"); set_title (_("ardour: meter bridge")); - set_wmclass (_("ardour_meter_bridge"), "Ardour"); + set_wmclass (X_("ardour_meter_bridge"), "Ardour"); // set_policy (false, false, false); // no user resizing of any kind signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this))); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 85c0aaff41..f20171f9fb 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -204,7 +204,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) add (global_vpacker); set_name ("MixerWindow"); set_title (_("ardour: mixer")); - set_wmclass (_("ardour_mixer"), "Ardour"); + set_wmclass (X_("ardour_mixer"), "Ardour"); add_accel_group (ActionManager::ui_manager->get_accel_group()); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index ac3122d740..811c37937c 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -97,7 +97,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) set_default_size (300, 300); set_title (_("ardour: options editor")); - set_wmclass (_("ardour_option_editor"), "Ardour"); + set_wmclass (X_("ardour_option_editor"), "Ardour"); set_name ("OptionsWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 5c5719bb39..54d6393506 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -102,6 +102,7 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr set_position (Gtk::WIN_POS_MOUSE); set_name ("PluginEditor"); + set_wmclass (X_("ardour_plugin_editor"), "Ardour"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this))); diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 033537f842..14d9fa02cb 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -138,7 +138,7 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng) set_name ("RouteParamsWindow"); set_default_size (620,370); set_title (_("ardour: track/bus inspector")); - set_wmclass (_("ardour_route_parameters"), "Ardour"); + set_wmclass (X_("ardour_route_parameters"), "Ardour"); // events route_display.get_selection()->signal_changed().connect(mem_fun(*this, &RouteParams_UI::route_selected)); diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 2264a955ae..049ad0aa21 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -18,8 +18,10 @@ Controllable::Controllable (std::string name) XMLNode& Controllable::get_state () { - XMLNode* node = new XMLNode (_name); + XMLNode* node = new XMLNode (X_("controllable")); char buf[64]; + + node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at _id.print (buf, sizeof (buf)); node->add_property (X_("id"), buf); return *node; diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 8e8f707bab..83c5d9008d 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -230,7 +230,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node) controllables.clear (); - nlist = node.children(); + nlist = node.children(); // "controls" if (nlist.empty()) { return 0; |