ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Export dialogue visual re-arrangement 

Make the export dialogue into a tabbed notebook with three tabs: "File
Format", "Timespan", and "Channels"/"Source".
This commit is contained in:
Colin Fletcher 2013-06-16 18:47:16 +01:00
parent 1d282f316f
commit ebd00236f8
3 changed files with 18 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/export_channel_selector.cc
View File

@ -458,15 +458,15 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * _ses
raw_button.set_label (string_compose (_("Region contents without fades nor region gain (channels: %1)"), region_chans));
raw_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
vbox.pack_start (raw_button);
vbox.pack_start (raw_button, false, false);
fades_button.set_label (string_compose (_("Region contents with fades and region gain (channels: %1)"), region_chans));
fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
vbox.pack_start (fades_button);
vbox.pack_start (fades_button, false, false);
processed_button.set_label (string_compose (_("Track output (channels: %1)"), track_chans));
processed_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
vbox.pack_start (processed_button);
vbox.pack_start (processed_button, false, false);
sync_with_manager();
vbox.show_all_children ();
@ -541,7 +541,7 @@ TrackExportChannelSelector::TrackExportChannelSelector (ARDOUR::Session * sessio
// Options
options_box.pack_start(region_contents_button);
options_box.pack_start(track_output_button);
main_layout.pack_start(options_box);
main_layout.pack_start(options_box, false, false);
// Track scroller
track_scroller.add (track_view);

68
gtk2_ardour/export_dialog.cc
View File

@ -140,69 +140,26 @@ ExportDialog::init ()
progress_widget.hide_all();
}
void
ExportDialog::expanded_changed ()
{
set_resizable(advanced->get_expanded());
}
void
ExportDialog::init_gui ()
{
Gtk::Alignment * preset_align = Gtk::manage (new Gtk::Alignment());
preset_align->add (*preset_selector);
preset_align->set_padding (0, 12, 0, 0);
get_vbox()->pack_start (*preset_align, false, false, 0);
Gtk::VPaned * advanced_paned = Gtk::manage (new Gtk::VPaned());
Gtk::VBox * file_format_selector = Gtk::manage (new Gtk::VBox());
file_format_selector->set_homogeneous (false);
file_format_selector->pack_start (*preset_align, false, false, 0);
file_format_selector->pack_start (*file_notebook, false, false, 0);
Gtk::VBox* timespan_vbox = Gtk::manage (new Gtk::VBox());
timespan_vbox->set_spacing (12);
timespan_vbox->set_border_width (12);
export_notebook.append_page (*file_format_selector, _("File format"));
export_notebook.append_page (*timespan_selector, _("Time Span"));
export_notebook.append_page (*channel_selector, _("Channels"));
get_vbox()->pack_start (export_notebook, true, true, 0);
get_vbox()->pack_end (warning_widget, false, false, 0);
get_vbox()->pack_end (progress_widget, false, false, 0);
Gtk::Alignment * timespan_align = Gtk::manage (new Gtk::Alignment());
timespan_label = Gtk::manage (new Gtk::Label (_("Time Span"), Gtk::ALIGN_LEFT));
timespan_align->add (*timespan_selector);
timespan_align->set_padding (0, 0, 18, 0);
timespan_vbox->pack_start (*timespan_label, false, false, 0);
timespan_vbox->pack_start (*timespan_align, true, true, 0);
advanced_paned->pack1(*timespan_vbox, true, false);
Gtk::VBox* channels_vbox = Gtk::manage (new Gtk::VBox());
channels_vbox->set_spacing (12);
channels_vbox->set_border_width (12);
Gtk::Alignment * channels_align = Gtk::manage (new Gtk::Alignment());
channels_label = Gtk::manage (new Gtk::Label (_("Channels"), Gtk::ALIGN_LEFT));
channels_align->add (*channel_selector);
channels_align->set_padding (0, 12, 18, 0);
channels_vbox->pack_start (*channels_label, false, false, 0);
channels_vbox->pack_start (*channels_align, true, true, 0);
advanced_paned->pack2(*channels_vbox, channel_selector_is_expandable(), false);
get_vbox()->pack_start (*file_notebook, false, false, 0);
get_vbox()->pack_start (warning_widget, false, false, 0);
get_vbox()->pack_start (progress_widget, false, false, 0);
advanced = Gtk::manage (new Gtk::Expander (_("Time span and channel options")));
advanced->property_expanded().signal_changed().connect(
sigc::mem_fun(*this, &ExportDialog::expanded_changed));
advanced->add (*advanced_paned);
if (channel_selector_is_expandable()) {
advanced_sizegroup = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_VERTICAL);
advanced_sizegroup->add_widget(*timespan_selector);
advanced_sizegroup->add_widget(*channel_selector);
}
get_vbox()->pack_start (*advanced, true, true);
Pango::AttrList bold;
Pango::Attribute b = Pango::Attribute::create_attr_weight (Pango::WEIGHT_BOLD);
bold.insert (b);
timespan_label->set_attributes (bold);
channels_label->set_attributes (bold);
}
void
@ -439,8 +396,7 @@ void
ExportRegionDialog::init_gui ()
{
ExportDialog::init_gui ();
channels_label->set_text (_("Source"));
export_notebook.set_tab_label_text(*export_notebook.get_nth_page(2), _("Source"));
}
void

15
gtk2_ardour/export_dialog.h
View File

@ -75,9 +75,6 @@ class ExportDialog : public ArdourDialog {
// Must initialize all the shared_ptrs below
virtual void init_components ();
// Override if the channel selector should not be grown
virtual bool channel_selector_is_expandable() { return true; }
boost::scoped_ptr<ExportPresetSelector> preset_selector;
boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
boost::scoped_ptr<ExportChannelSelector> channel_selector;
@ -86,15 +83,13 @@ class ExportDialog : public ArdourDialog {
Gtk::VBox warning_widget;
Gtk::VBox progress_widget;
Gtk::Label * timespan_label;
Gtk::Label * channels_label;
/*** GUI components ***/
Gtk::Notebook export_notebook;
private:
void init ();
void expanded_changed();
void notify_errors ();
void close_dialog ();
@ -112,10 +107,7 @@ class ExportDialog : public ArdourDialog {
PublicEditor & editor;
StatusPtr status;
/*** GUI components ***/
Glib::RefPtr<Gtk::SizeGroup> advanced_sizegroup;
Gtk::Expander * advanced;
/* Warning area */
@ -170,9 +162,6 @@ class ExportRegionDialog : public ExportDialog
public:
ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
protected:
virtual bool channel_selector_is_expandable() { return false; }
private:
void init_gui ();
void init_components ();