More Export GUI tweaks....

git-svn-id: svn://localhost/ardour2/branches/3.0@3926 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 21 insertions, 4 deletions

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index 1f4310f367..372ab67565 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -1215,7 +1215,7 @@ class "GtkButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
-widget "PaddedButton" style:highest "padded_button"
+widget "*PaddedButton" style:highest "padded_button"
 widget "*FirstActionMessage" style:highest "first_action_message"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index 139f6cd286..bb464b31ff 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -1214,7 +1214,7 @@ class "GtkButton" style:highest "ardour_button"
 class "GtkArrow" style:highest "tearoff_arrow"
 class "GtkProgressBar" style:highest "ardour_progressbars"
 
-widget "PaddedButton" style:highest "padded_button"
+widget "*PaddedButton" style:highest "padded_button"
 widget "*FirstActionMessage" style:highest "first_action_message"
 widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
 widget "*MarkerText" style:highest "marker_text"
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 6ea5f82952..c533e4489e 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -139,14 +139,14 @@ ExportDialog::init_gui ()
 	get_vbox()->pack_start (*preset_align, false, false, 0);
 	
 	Gtk::Alignment * timespan_align = Gtk::manage (new Gtk::Alignment());
-	Gtk::Label * timespan_label = Gtk::manage (new Gtk::Label (_("Time Span"), Gtk::ALIGN_LEFT));
+	timespan_label = Gtk::manage (new Gtk::Label (_("Time Span"), Gtk::ALIGN_LEFT));
 	timespan_align->add (*timespan_selector);
 	timespan_align->set_padding (0, 12, 18, 0);
 	get_vbox()->pack_start (*timespan_label, false, false, 0);
 	get_vbox()->pack_start (*timespan_align, false, false, 0);
 	
 	Gtk::Alignment * channels_align = Gtk::manage (new Gtk::Alignment());
-	Gtk::Label * channels_label = Gtk::manage (new Gtk::Label (_("Channels"), Gtk::ALIGN_LEFT));
+	channels_label = Gtk::manage (new Gtk::Label (_("Channels"), Gtk::ALIGN_LEFT));
 	channels_align->add (*channel_selector);
 	channels_align->set_padding (0, 12, 18, 0);
 	get_vbox()->pack_start (*channels_label, false, false, 0);
@@ -388,6 +388,14 @@ ExportRegionDialog::ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegi
 {}
 
 void
+ExportRegionDialog::init_gui ()
+{
+	ExportDialog::init_gui ();
+	
+	channels_label->set_text (_("Source"));
+}
+
+void
 ExportRegionDialog::init_components ()
 {
 	Glib::ustring loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 0de6c6ffac..0528c514b6 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -82,6 +82,9 @@ class ExportDialog : public ArdourDialog {
 	
 	Gtk::VBox                                 warning_widget;
 	Gtk::VBox                                 progress_widget;
+	
+	Gtk::Label *                              timespan_label;
+	Gtk::Label *                              channels_label;
 
   private:
 
@@ -161,6 +164,7 @@ class ExportRegionDialog : public ExportDialog
 	ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
 
   private:
+	void init_gui ();
 	void init_components ();
 	
 	ARDOUR::AudioRegion const & region;
diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index 3bcb6045ac..66eb389956 100644
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -56,6 +56,8 @@ ExportFilenameSelector::ExportFilenameSelector () :
 	path_hbox.pack_start (path_entry, true, true, 3);
 	path_hbox.pack_start (browse_button, false, false, 3);
 	
+	date_format_combo.set_name ("PaddedButton");
+	time_format_combo.set_name ("PaddedButton");
 	browse_button.set_name ("PaddedButton");
 	
 	label_sizegroup = Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL);
diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index 6032b495de..676373e5c3 100644
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -38,6 +38,7 @@ ExportFormatSelector::ExportFormatSelector () :
 	pack_start (remove_button, false, false, 3);
 	pack_start (new_button, false, false, 3);
 
+	format_combo.set_name ("PaddedButton");
 	edit_button.set_name ("PaddedButton");
 	remove_button.set_name ("PaddedButton");
 	new_button.set_name ("PaddedButton");
diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index c9b5f0e918..69d3aa7111 100644
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -40,6 +40,7 @@ ExportPresetSelector::ExportPresetSelector () :
 	pack_start (remove_button, false, false, 6);
 	pack_start (new_button, false, false, 0);
 	
+	entry.set_name ("PaddedButton");
 	save_button.set_name ("PaddedButton");
 	remove_button.set_name ("PaddedButton");
 	new_button.set_name ("PaddedButton");
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 5f9ccfb0c6..29d21b25cb 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -60,6 +60,7 @@ ExportTimespanSelector::ExportTimespanSelector () :
 	
 	time_format_list = Gtk::ListStore::create (time_format_cols);
 	time_format_combo.set_model (time_format_list);
+	time_format_combo.set_name ("PaddedButton");
 	
 	iter = time_format_list->append();
 	row = *iter;