diff options
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour-menus.xml | 1 | ||||
-rw-r--r-- | gtk2_ardour/export_dialog.cc | 48 | ||||
-rw-r--r-- | gtk2_ardour/export_dialog.h | 33 |
4 files changed, 58 insertions, 26 deletions
diff --git a/SConstruct b/SConstruct index d1470a9585..093b6f4085 100644 --- a/SConstruct +++ b/SConstruct @@ -54,10 +54,10 @@ class LibraryInfo(Environment): self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) - self.Replace(LIBS = list(Set(self.get('LIBS', [])))) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) #doing LINKFLAGS breaks -framework + #doing LIBS break link order dependency env = LibraryInfo (options = opts, diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml index 57c247853b..28b76e358a 100644 --- a/gtk2_ardour/ardour-menus.xml +++ b/gtk2_ardour/ardour-menus.xml @@ -1,5 +1,4 @@ <ui> - <menubar name='Main' action='MainMenu'> <menu name='Session' action='Session'> <menuitem action='New'/> diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 8074b12afd..59d0f02fad 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -95,14 +95,22 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r) editor (e), format_table (9, 2), format_frame (_("FORMAT")), - sample_rate_label (_("SAMPLE RATE")), - src_quality_label (_("CONVERSION QUALITY")), - dither_type_label (_("DITHER TYPE")), - cue_file_label (_("CD MARKER FILE TYPE")), channel_count_label (_("CHANNELS")), header_format_label (_("FILE TYPE")), bitdepth_format_label (_("SAMPLE FORMAT")), endian_format_label (_("SAMPLE ENDIANNESS")), + sample_rate_label (_("SAMPLE RATE")), + src_quality_label (_("CONVERSION QUALITY")), + dither_type_label (_("DITHER TYPE")), + cue_file_label (_("CD MARKER FILE TYPE")), + channel_count_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + header_format_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + bitdepth_format_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + endian_format_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + sample_rate_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + src_quality_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + dither_type_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), + cue_file_align(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0.0, 0.0), cuefile_only_checkbox (_("EXPORT CD MARKER FILE ONLY")), file_frame (_("EXPORT TO FILE")), file_browse_button (_("Browse")), @@ -311,29 +319,37 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r) format_table.set_row_spacings (5); if (!audio_region) { - format_table.attach (channel_count_label, 0, 1, 0, 1); - format_table.attach (channel_count_combo, 0, 1, 1, 2); + channel_count_align.add(channel_count_label); + format_table.attach (channel_count_align, 0, 1, 0, 1); + format_table.attach (channel_count_combo, 1, 2, 0, 1); } - format_table.attach (header_format_label, 1, 2, 0, 1); + header_format_align.add(header_format_label); + format_table.attach (header_format_align, 0, 1, 1, 2); format_table.attach (header_format_combo, 1, 2, 1, 2); - format_table.attach (bitdepth_format_label, 0, 1, 2, 3); - format_table.attach (bitdepth_format_combo, 0, 1, 3, 4); + bitdepth_format_align.add(bitdepth_format_label); + format_table.attach (bitdepth_format_align, 0, 1, 2, 3); + format_table.attach (bitdepth_format_combo, 1, 2, 2, 3); - format_table.attach (endian_format_label, 1, 2, 2, 3); + endian_format_align.add(endian_format_label); + format_table.attach (endian_format_align, 0, 1, 3, 4); format_table.attach (endian_format_combo, 1, 2, 3, 4); - format_table.attach (sample_rate_label, 0, 1, 4, 5); - format_table.attach (sample_rate_combo, 0, 1, 5, 6); + sample_rate_align.add(sample_rate_label); + format_table.attach (sample_rate_align, 0, 1, 4, 5); + format_table.attach (sample_rate_combo, 1, 2, 4, 5); - format_table.attach (src_quality_label, 1, 2, 4, 5); + src_quality_align.add(src_quality_label); + format_table.attach (src_quality_align, 0, 1, 5, 6); format_table.attach (src_quality_combo, 1, 2, 5, 6); - format_table.attach (dither_type_label, 0, 1, 6, 7); - format_table.attach (dither_type_combo, 0, 1, 7, 8); + dither_type_align.add(dither_type_label); + format_table.attach (dither_type_align, 0, 1, 6, 7); + format_table.attach (dither_type_combo, 1, 2, 6, 7); - format_table.attach (cue_file_label, 1, 2, 6, 7); + cue_file_align.add(cue_file_label); + format_table.attach (cue_file_align, 0, 1, 7, 8); format_table.attach (cue_file_combo, 1, 2, 7, 8); format_table.attach (cuefile_only_checkbox, 1, 2, 8, 9); diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 12532fafd4..597e2b3c21 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -20,6 +20,7 @@ #ifndef __ardour_export_dialog_h__ #define __ardour_export_dialog_h__ +#include <gtkmm/alignment.h> #include <gtkmm/box.h> #include <gtkmm/table.h> #include <gtkmm/frame.h> @@ -80,22 +81,38 @@ class ExportDialog : public ArdourDialog Gtk::Table format_table; Gtk::Frame format_frame; - Gtk::Label sample_rate_label; - Gtk::ComboBoxText sample_rate_combo; - Gtk::Label src_quality_label; - Gtk::ComboBoxText src_quality_combo; - Gtk::Label dither_type_label; - Gtk::ComboBoxText dither_type_combo; - Gtk::Label cue_file_label; - Gtk::ComboBoxText cue_file_combo; Gtk::Label channel_count_label; + Gtk::Alignment channel_count_align; Gtk::ComboBoxText channel_count_combo; + Gtk::Label header_format_label; + Gtk::Alignment header_format_align; Gtk::ComboBoxText header_format_combo; + Gtk::Label bitdepth_format_label; + Gtk::Alignment bitdepth_format_align; Gtk::ComboBoxText bitdepth_format_combo; + Gtk::Label endian_format_label; + Gtk::Alignment endian_format_align; Gtk::ComboBoxText endian_format_combo; + + Gtk::Label sample_rate_label; + Gtk::Alignment sample_rate_align; + Gtk::ComboBoxText sample_rate_combo; + + Gtk::Label src_quality_label; + Gtk::Alignment src_quality_align; + Gtk::ComboBoxText src_quality_combo; + + Gtk::Label dither_type_label; + Gtk::Alignment dither_type_align; + Gtk::ComboBoxText dither_type_combo; + + Gtk::Label cue_file_label; + Gtk::Alignment cue_file_align; + Gtk::ComboBoxText cue_file_combo; + Gtk::CheckButton cuefile_only_checkbox; Gtk::Frame file_frame; |