tweak menu item names in group context menu to make purpose more clear to new users...

[ardour.git] / gtk2_ardour / export_timespan_selector.cc

diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 32b252c97f35eeb18a72344b788a5442ffd8f8c4..8080c028627106485db771f751a4333ad6f6dd29 100644 (file)
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -70,7 +70,7 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi
        iter = time_format_list->append();
        row = *iter;
        row[time_format_cols.format] = ExportProfileManager::Timecode;
-       row[time_format_cols.label] = X_("Timecode");
+       row[time_format_cols.label] = _("Timecode");
 
        iter = time_format_list->append();
        row = *iter;
@@ -102,7 +102,7 @@ ExportTimespanSelector::~ExportTimespanSelector ()
 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()) {
@@ -180,9 +180,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 +205,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 +222,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 ();
@@ -246,7 +240,7 @@ ExportTimespanSelector::bbt_str (framepos_t frames) const
        }
 
        std::ostringstream oss;
-       BBT_Time time;
+       Timecode::BBT_Time time;
        _session->bbt_time (frames, time);
 
        print_padded (oss, time);
@@ -330,24 +324,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<Gtk::CellRendererText *> (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
@@ -397,7 +385,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<Gtk::CellRendererToggle *> (range_view.get_column_cell_renderer (0))) {
                renderer->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &ExportTimespanSelectorMultiple::update_selection)));
@@ -407,11 +395,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