diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 53ec867b6e..3c2cdcacca 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -216,7 +216,7 @@ You may select:\n \ trk_template_chooser.set_model (trk_template_model); trk_template_chooser.append_column (_("Template/Type"), track_template_columns.name); #ifdef MIXBUS - trk_template_chooser.append_column (_("Created With"), track_template_columns.created_with); + trk_template_chooser.append_column (_("Modified With"), track_template_columns.modified_with); #endif trk_template_chooser.set_headers_visible (true); trk_template_chooser.get_selection()->set_mode (SELECTION_SINGLE); @@ -925,7 +925,7 @@ AddRouteDialog::refill_channel_setups () row[track_template_columns.name] = (*i).first; row[track_template_columns.path] = ""; row[track_template_columns.description] = (*i).second; - row[track_template_columns.created_with] = ""; + row[track_template_columns.modified_with] = ""; if (!selected_default && !Profile->get_mixbus ()) { trk_template_chooser.get_selection()->select(row); @@ -949,7 +949,7 @@ AddRouteDialog::refill_channel_setups () row[track_template_columns.name] = (*s)->name; row[track_template_columns.path] = "urn:ardour:" + (*s)->path; row[track_template_columns.description] = (*s)->description; - row[track_template_columns.created_with] = _("{Factory Template}"); + row[track_template_columns.modified_with] = _("{Factory Template}"); if ((*s)->name == "Create Audio Tracks Interactively" && Profile->get_mixbus ()) { trk_template_chooser.get_selection()->select(row); @@ -966,7 +966,7 @@ AddRouteDialog::refill_channel_setups () row[track_template_columns.name] = x->name; row[track_template_columns.path] = x->path; row[track_template_columns.description] = x->description; - row[track_template_columns.created_with] = x->created_with; + row[track_template_columns.modified_with] = x->modified_with; } set_popdown_strings (channel_combo, channel_combo_strings); diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h index 351022c101..e5622db3ba 100644 --- a/gtk2_ardour/add_route_dialog.h +++ b/gtk2_ardour/add_route_dialog.h @@ -124,13 +124,13 @@ private: add (name); add (path); add (description); - add (created_with); + add (modified_with); } Gtk::TreeModelColumn name; Gtk::TreeModelColumn path; Gtk::TreeModelColumn description; - Gtk::TreeModelColumn created_with; + Gtk::TreeModelColumn modified_with; }; TrackTemplateColumns track_template_columns; diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 8ad6e2d388..af3232072a 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -375,7 +375,7 @@ SessionDialog::setup_recent_sessions () recent_session_display.append_column (_("Session Name"), recent_session_columns.visible_name); recent_session_display.append_column (_("Sample Rate"), recent_session_columns.sample_rate); #ifdef MIXBUS - recent_session_display.append_column (_("Created With"), recent_session_columns.created_with); + recent_session_display.append_column (_("Modified With"), recent_session_columns.modified_with); #else recent_session_display.append_column (_("File Resolution"), recent_session_columns.disk_format); #endif @@ -580,8 +580,8 @@ SessionDialog::populate_session_templates () row[session_template_columns.name] = (*s)->name; row[session_template_columns.path] = "urn:ardour:" + (*s)->path; row[session_template_columns.description] = (*s)->description; - row[session_template_columns.created_with_short] = _("{Factory Template}"); - row[session_template_columns.created_with_long] = _("{Factory Template}"); + row[session_template_columns.modified_with_short] = _("{Factory Template}"); + row[session_template_columns.modified_with_long] = _("{Factory Template}"); } /* Add Lua Action Scripts which can also be used for session-setup */ @@ -594,8 +594,8 @@ SessionDialog::populate_session_templates () row[session_template_columns.name] = (*s)->name; row[session_template_columns.path] = "urn:ardour:" + (*s)->path; row[session_template_columns.description] = (*s)->description; - row[session_template_columns.created_with_short] = _("{Factory Template}"); - row[session_template_columns.created_with_long] = _("{Factory Template}"); + row[session_template_columns.modified_with_short] = _("{Factory Template}"); + row[session_template_columns.modified_with_long] = _("{Factory Template}"); } @@ -608,8 +608,8 @@ SessionDialog::populate_session_templates () row[session_template_columns.name] = (*x).name; row[session_template_columns.path] = (*x).path; row[session_template_columns.description] = (*x).description; - row[session_template_columns.created_with_long] = (*x).created_with; - row[session_template_columns.created_with_short] = (*x).created_with.substr(0, (*x).created_with.find(" ")); + row[session_template_columns.modified_with_long] = (*x).modified_with; + row[session_template_columns.modified_with_short] = (*x).modified_with.substr(0, (*x).modified_with.find(" ")); } //Add an explicit 'Empty Template' item @@ -617,8 +617,8 @@ SessionDialog::populate_session_templates () row[session_template_columns.name] = (_("Empty Template")); row[session_template_columns.path] = string(); row[session_template_columns.description] = _("An empty session with factory default settings."); - row[session_template_columns.created_with_short] = _(""); - row[session_template_columns.created_with_long] = _(""); + row[session_template_columns.modified_with_short] = _(""); + row[session_template_columns.modified_with_long] = _(""); //auto-select the first item in the list Gtk::TreeModel::Row first = template_model->children()[0]; @@ -715,9 +715,9 @@ SessionDialog::setup_new_session_page () template_chooser.set_model (template_model); template_chooser.append_column (_("Template"), session_template_columns.name); #ifdef MIXBUS - template_chooser.append_column (_("Created With"), session_template_columns.created_with_short); + template_chooser.append_column (_("Modified With"), session_template_columns.modified_with_short); #endif - template_chooser.set_tooltip_column(4); // created_with_long + template_chooser.set_tooltip_column(4); // modified_with_long template_chooser.set_headers_visible (true); template_chooser.get_selection()->set_mode (SELECTION_SINGLE); template_chooser.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &SessionDialog::template_row_selected)); @@ -867,7 +867,7 @@ SessionDialog::redisplay_recent_sessions () row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname); } else { row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname + "\n" + string_compose (_("Last modified with: %1"), program_version)); - row[recent_session_columns.created_with] = program_version; + row[recent_session_columns.modified_with] = program_version; } ++session_snapshot_count; diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h index 9d4f08ed97..d5fe14af05 100644 --- a/gtk2_ardour/session_dialog.h +++ b/gtk2_ardour/session_dialog.h @@ -113,7 +113,7 @@ private: add (fullpath); add (sample_rate); add (disk_format); - add (created_with); + add (modified_with); add (time_modified); add (time_formatted); } @@ -122,7 +122,7 @@ private: Gtk::TreeModelColumn fullpath; Gtk::TreeModelColumn sample_rate; Gtk::TreeModelColumn disk_format; - Gtk::TreeModelColumn created_with; + Gtk::TreeModelColumn modified_with; Gtk::TreeModelColumn time_modified; Gtk::TreeModelColumn time_formatted; }; @@ -155,15 +155,15 @@ private: add (name); add (path); add (description); - add (created_with_short); - add (created_with_long); + add (modified_with_short); + add (modified_with_long); } Gtk::TreeModelColumn name; Gtk::TreeModelColumn path; Gtk::TreeModelColumn description; - Gtk::TreeModelColumn created_with_short; - Gtk::TreeModelColumn created_with_long; + Gtk::TreeModelColumn modified_with_short; + Gtk::TreeModelColumn modified_with_long; }; SessionTemplateColumns session_template_columns; diff --git a/libs/ardour/ardour/template_utils.h b/libs/ardour/ardour/template_utils.h index 07ba1d62ae..f556e2c068 100644 --- a/libs/ardour/ardour/template_utils.h +++ b/libs/ardour/ardour/template_utils.h @@ -38,7 +38,7 @@ namespace ARDOUR { std::string name; std::string path; std::string description; - std::string created_with; + std::string modified_with; }; LIBARDOUR_API void find_route_templates (std::vector& template_names); diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index ceeefb0e51..f6b6c59fbc 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -110,14 +110,14 @@ find_session_templates (vector& template_names, bool read_xml) XMLNode* root = tree.root(); - rti.created_with = _("(unknown)"); + rti.modified_with = _("(unknown)"); try { XMLNode *pv = root->child("ProgramVersion"); - string created_with; + string modified_with; if (pv != 0) { - pv->get_property (X_("created-with"), created_with); + pv->get_property (X_("modified-with"), modified_with); } - rti.created_with = created_with; + rti.modified_with = modified_with; } catch (XMLException &e) {} rti.description = _("No Description"); @@ -158,14 +158,14 @@ find_route_templates (vector& template_names) TemplateInfo rti; - rti.created_with = _("(unknown)"); + rti.modified_with = _("(unknown)"); try { XMLNode *pv = root->child("ProgramVersion"); - string created_with; + string modified_with; if (pv != 0) { - pv->get_property (X_("created-with"), created_with); + pv->get_property (X_("modified-with"), modified_with); } - rti.created_with = created_with; + rti.modified_with = modified_with; } catch (XMLException &e) {} rti.description = _("No Description");