X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_timespan_selector.cc;h=9a294aff1baa35312b962778d39074a894a08b68;hb=7745a373940a0bcabd618b5b66c6b8916045ea9e;hp=52e1a0af97a1da765b79560b88adb48d585a314b;hpb=69388aff817ba041f321645e3d8b00179e975533;p=ardour.git diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 52e1a0af97..9a294aff1b 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -20,9 +20,6 @@ #include "export_timespan_selector.h" -#include "ardour_ui.h" - -#include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/types.h" #include "ardour/session.h" @@ -51,6 +48,22 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi option_hbox.pack_start (time_format_label, false, false, 0); option_hbox.pack_start (time_format_combo, false, false, 6); + Gtk::Button* b = Gtk::manage (new Gtk::Button (_("Select All"))); + b->signal_clicked().connect ( + sigc::bind ( + sigc::mem_fun (*this, &ExportTimespanSelector::set_selection_state_of_all_timespans), true + ) + ); + option_hbox.pack_start (*b, false, false, 6); + + b = Gtk::manage (new Gtk::Button (_("Deselect All"))); + b->signal_clicked().connect ( + sigc::bind ( + sigc::mem_fun (*this, &ExportTimespanSelector::set_selection_state_of_all_timespans), false + ) + ); + option_hbox.pack_start (*b, false, false, 6); + range_scroller.add (range_view); pack_start (option_hbox, false, false, 0); @@ -65,7 +78,6 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi 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; @@ -90,6 +102,9 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi /* Range view */ range_list = Gtk::ListStore::create (range_cols); + // order by location start times + range_list->set_sort_column(range_cols.location, Gtk::SORT_ASCENDING); + range_list->set_sort_func(range_cols.location, sigc::mem_fun(*this, &ExportTimespanSelector::location_sorter)); range_view.set_model (range_list); range_view.set_headers_visible (true); } @@ -99,15 +114,29 @@ ExportTimespanSelector::~ExportTimespanSelector () } +int +ExportTimespanSelector::location_sorter(Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b) +{ + Location *l1 = (*a)[range_cols.location]; + Location *l2 = (*b)[range_cols.location]; + const Location *ls = _session->locations()->session_range_location(); + + // always sort session range first + if (l1 == ls) + return -1; + if (l2 == ls) + return +1; + + return l1->start() - l2->start(); +} + void ExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc) { - TimespanPtr span = _session->get_export_handler()->add_timespan(); + ExportTimespanPtr span = _session->get_export_handler()->add_timespan(); std::string id; - if (loc == state->session_range.get()) { - id = "session"; - } else if (loc == state->selection_range.get()) { + if (loc == state->selection_range.get()) { id = "selection"; } else { id = loc->id().to_s(); @@ -180,9 +209,6 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons start = to_string (start_frame, std::dec); end = to_string (end_frame, std::dec); break; - - case AudioClock::Off: - break; } // label += _("from "); @@ -208,7 +234,7 @@ ExportTimespanSelector::construct_length (ARDOUR::Location const * location) con } std::stringstream s; - + switch (state->time_format) { case AudioClock::BBT: s << bbt_str (location->length ()); @@ -225,13 +251,10 @@ ExportTimespanSelector::construct_length (ARDOUR::Location const * location) con case AudioClock::MinSec: s << ms_str (location->length ()); break; - + case AudioClock::Frames: s << location->length (); break; - - case AudioClock::Off: - break; } return s.str (); @@ -298,7 +321,7 @@ ExportTimespanSelector::ms_str (framecnt_t frames) const mins = (int) floor (left / (_session->frame_rate() * 60.0f)); left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f); secs = (int) floor (left / (float) _session->frame_rate()); - left -= (framecnt_t) floor (secs * _session->frame_rate()); + left -= (framecnt_t) floor ((double)(secs * _session->frame_rate())); sec_promilles = (int) (left * 1000 / (float) _session->frame_rate() + 0.5); oss << std::setfill('0') << std::right << @@ -323,6 +346,14 @@ ExportTimespanSelector::update_range_name (std::string const & path, std::string CriticalSelectionChanged(); } +void +ExportTimespanSelector::set_selection_state_of_all_timespans (bool s) +{ + for (Gtk::ListStore::Children::iterator it = range_list->children().begin(); it != range_list->children().end(); ++it) { + it->set_value (range_cols.selected, s); + } +} + /*** ExportTimespanSelectorSingle ***/ ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id) : @@ -330,24 +361,18 @@ ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * se range_id (range_id) { range_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); - range_view.append_column_editable ("Range", range_cols.name); - - // Adjust selector height - int x_offset, y_offset, width, height; - Gtk::CellRenderer * renderer = *range_view.get_column(0)->get_cell_renderers().begin(); - renderer->get_size (range_view, x_offset, y_offset, width, height); - range_scroller.set_size_request (-1, height); + range_view.append_column_editable (_("Range"), range_cols.name); if (Gtk::CellRendererText * renderer = dynamic_cast (range_view.get_column_cell_renderer (0))) { renderer->signal_edited().connect (sigc::mem_fun (*this, &ExportTimespanSelectorSingle::update_range_name)); } Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText()); - Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column ("Time Span", *label_render)); + Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column (_("Time Span"), *label_render)); label_col->add_attribute (label_render->property_markup(), range_cols.label); range_view.append_column (*label_col); - range_view.append_column ("Length", range_cols.length); + range_view.append_column (_("Length"), range_cols.length); } void @@ -356,9 +381,7 @@ ExportTimespanSelectorSingle::fill_range_list () if (!state) { return; } std::string id; - if (!range_id.compare (X_("session"))) { - id = state->session_range->id().to_s(); - } else if (!range_id.compare (X_("selection"))) { + if (!range_id.compare (X_("selection"))) { id = state->selection_range->id().to_s(); } else { id = range_id; @@ -397,7 +420,7 @@ ExportTimespanSelectorMultiple::ExportTimespanSelectorMultiple (ARDOUR::Session { range_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); range_view.append_column_editable ("", range_cols.selected); - range_view.append_column_editable ("Range", range_cols.name); + range_view.append_column_editable (_("Range"), range_cols.name); if (Gtk::CellRendererToggle * renderer = dynamic_cast (range_view.get_column_cell_renderer (0))) { renderer->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &ExportTimespanSelectorMultiple::update_selection))); @@ -407,11 +430,11 @@ ExportTimespanSelectorMultiple::ExportTimespanSelectorMultiple (ARDOUR::Session } Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText()); - Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column ("Time Span", *label_render)); + Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column (_("Time Span"), *label_render)); label_col->add_attribute (label_render->property_markup(), range_cols.label); range_view.append_column (*label_col); - range_view.append_column ("Length", range_cols.length); + range_view.append_column (_("Length"), range_cols.length); } void @@ -448,9 +471,8 @@ ExportTimespanSelectorMultiple::set_selection_from_state () for (tree_it = range_list->children().begin(); tree_it != range_list->children().end(); ++tree_it) { Location * loc = tree_it->get_value (range_cols.location); - if ((!id.compare ("session") && loc == state->session_range.get()) || - (!id.compare ("selection") && loc == state->selection_range.get()) || - (!id.compare (loc->id().to_s()))) { + if ((id == "selection" && loc == state->selection_range.get()) || + (id == loc->id().to_s())) { tree_it->set_value (range_cols.selected, true); } }