diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2005-11-27 01:11:48 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2005-11-27 01:11:48 +0000 |
commit | 5c776da7788a20dec826bccfc66d62376587a7e2 (patch) | |
tree | 3183f9d57fb9639eff762e9debc1aab0aee5571f | |
parent | 78d7d5fbd3cfb62097f002e81ab35b02f99db806 (diff) |
fix widget name mismatches in glade file/source code
git-svn-id: svn://localhost/trunk/ardour2@126 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/glade/new_session_dialog.glade | 26 | ||||
-rw-r--r-- | gtk2_ardour/new_session_dialog.cc | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gtk2_ardour/glade/new_session_dialog.glade b/gtk2_ardour/glade/new_session_dialog.glade index 330475fbfa..e5df786ab8 100644 --- a/gtk2_ardour/glade/new_session_dialog.glade +++ b/gtk2_ardour/glade/new_session_dialog.glade @@ -272,10 +272,10 @@ </child> <child> - <widget class="GtkCheckButton" id="CreateControlTrack"> + <widget class="GtkCheckButton" id="CreateControlBus"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Create Control Track</property> + <property name="label" translatable="yes">Create Control Bus</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -338,10 +338,10 @@ </child> <child> - <widget class="GtkCheckButton" id="CreateMasterTrack"> + <widget class="GtkCheckButton" id="CreateMasterBus"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Create Master Track</property> + <property name="label" translatable="yes">Create Master Bus</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -369,7 +369,7 @@ <child> <widget class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="label" translatable="yes">Track Connection Options</property> + <property name="label" translatable="yes">Track/Bus connection options</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -426,10 +426,10 @@ <property name="spacing">0</property> <child> - <widget class="GtkCheckButton" id="ConnectTrackInputs"> + <widget class="GtkCheckButton" id="ConnectInputs"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Automatically connect track inputs</property> + <property name="label" translatable="yes">Automatically connect inputs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -569,10 +569,10 @@ <property name="spacing">0</property> <child> - <widget class="GtkCheckButton" id="ConnectTrackOutputs"> + <widget class="GtkCheckButton" id="ConnectOutputs"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Automatically connect track outputs</property> + <property name="label" translatable="yes">Automatically connect outputs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -652,7 +652,7 @@ <property name="spacing">0</property> <child> - <widget class="GtkRadioButton" id="ConnectToMasterTrack"> + <widget class="GtkRadioButton" id="ConnectOutsToMaster"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Connect to Master Bus</property> @@ -671,17 +671,17 @@ </child> <child> - <widget class="GtkRadioButton" id="ConnectToControlTrack"> + <widget class="GtkRadioButton" id="ConnectOutsToPhysical"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Connect to Control Bus</property> + <property name="label" translatable="yes">Connect to physical outputs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">ConnectToMasterTrack</property> + <property name="group">ConnectOutsToMaster</property> </widget> <packing> <property name="padding">0</property> diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 7bdd6d4e48..a19c19d50f 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -38,14 +38,14 @@ NewSessionDialog::NewSessionDialog(BaseObjectType* cobject, { // look up the widgets we care about. - xml->get_widget(X_("SessionName"), m_name); - xml->get_widget(X_("SessionFolder"), m_folder); - xml->get_widget(X_("SessionTemplate"), m_template); + xml->get_widget(X_("SessionNameEntry"), m_name); + xml->get_widget(X_("SessionFolderChooser"), m_folder); + xml->get_widget(X_("SessionTemplateChooser"), m_template); - xml->get_widget(X_("CreateMasterTrack"), m_create_master_track); + xml->get_widget(X_("CreateMasterBus"), m_create_master_track); xml->get_widget(X_("MasterChannelCount"), m_master_track_channel_count); - xml->get_widget(X_("CreateControlTrack"), m_create_control_track); + xml->get_widget(X_("CreateControlBus"), m_create_control_track); xml->get_widget(X_("ControlChannelCount"), m_control_track_channel_count); xml->get_widget(X_("ConnectInputs"), m_connect_inputs); |