X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_regions.cc;h=845e56fdec5cb00e852a04b61123c0dde6f089bb;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=bf13bd5a6596d496a04a199edc2afd5b303a0ec0;hpb=316973d7c7bc99bfef6367d42009883d0de2abbd;p=ardour.git diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index bf13bd5a65..845e56fdec 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -35,6 +35,7 @@ #include "gtkmm2ext/choice.h" #include "gtkmm2ext/treeutils.h" +#include "gtkmm2ext/utils.h" #include "audio_clock.h" #include "editor.h" @@ -48,11 +49,14 @@ #include "editor_regions.h" #include "editor_drag.h" #include "main_clock.h" +#include "tooltips.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Glib; @@ -80,6 +84,7 @@ EditorRegions::EditorRegions (Editor* e) _display.set_size_request (100, -1); _display.set_rules_hint (true); _display.set_name ("EditGroupList"); + _display.set_fixed_height_mode (true); /* Try to prevent single mouse presses from initiating edits. This relies on a hack in gtktreeview.c:gtk_treeview_button_press() @@ -90,50 +95,94 @@ EditorRegions::EditorRegions (Editor* e) _model->set_sort_func (0, sigc::mem_fun (*this, &EditorRegions::sorter)); _model->set_sort_column (0, SORT_ASCENDING); - _display.set_model (_model); - - _display.append_column ("", _columns.name); - _display.append_column ("", _columns.position); - _display.append_column ("", _columns.end); - _display.append_column ("", _columns.length); - _display.append_column ("", _columns.sync); - _display.append_column ("", _columns.fadein); - _display.append_column ("", _columns.fadeout); - _display.append_column ("", _columns.locked); - _display.append_column ("", _columns.glued); - _display.append_column ("", _columns.muted); - _display.append_column ("", _columns.opaque); + /* column widths */ + int bbt_width, sync_width, check_width, height; + + Glib::RefPtr layout = _display.create_pango_layout (X_("000|000|000")); + Gtkmm2ext::get_pixel_size (layout, bbt_width, height); + + layout = _display.create_pango_layout (X_("Start ")); + Gtkmm2ext::get_pixel_size (layout, sync_width, height); + + check_width = 20; + + TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name)); + col_name->set_fixed_width (120); + col_name->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_position = manage (new TreeViewColumn ("", _columns.position)); + col_position->set_fixed_width (bbt_width); + col_position->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_end = manage (new TreeViewColumn ("", _columns.end)); + col_end->set_fixed_width (bbt_width); + col_end->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_length = manage (new TreeViewColumn ("", _columns.length)); + col_length->set_fixed_width (bbt_width); + col_length->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_sync = manage (new TreeViewColumn ("", _columns.sync)); + col_sync->set_fixed_width (sync_width); + col_sync->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_fadein = manage (new TreeViewColumn ("", _columns.fadein)); + col_fadein->set_fixed_width (bbt_width); + col_fadein->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_fadeout = manage (new TreeViewColumn ("", _columns.fadeout)); + col_fadeout->set_fixed_width (bbt_width); + col_fadeout->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_locked = manage (new TreeViewColumn ("", _columns.locked)); + col_locked->set_fixed_width (check_width); + col_locked->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_glued = manage (new TreeViewColumn ("", _columns.glued)); + col_glued->set_fixed_width (check_width); + col_glued->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_muted = manage (new TreeViewColumn ("", _columns.muted)); + col_muted->set_fixed_width (check_width); + col_muted->set_sizing (TREE_VIEW_COLUMN_FIXED); + TreeViewColumn* col_opaque = manage (new TreeViewColumn ("", _columns.opaque)); + col_opaque->set_fixed_width (check_width); + col_opaque->set_sizing (TREE_VIEW_COLUMN_FIXED); + + _display.append_column (*col_name); + _display.append_column (*col_position); + _display.append_column (*col_end); + _display.append_column (*col_length); + _display.append_column (*col_sync); + _display.append_column (*col_fadein); + _display.append_column (*col_fadeout); + _display.append_column (*col_locked); + _display.append_column (*col_glued); + _display.append_column (*col_muted); + _display.append_column (*col_opaque); TreeViewColumn* col; Gtk::Label* l; ColumnInfo ci[] = { - { 0, _("Region"), _("Region name, with number of channels in []'s") }, - { 1, _("Position"), _("Position of start of region") }, - { 2, _("End"), _("Position of end of region") }, - { 3, _("Length"), _("Length of the region") }, - { 4, _("Sync"), _("Position of region sync point, relative to start of the region") }, - { 5, _("Fade In"), _("Length of region fade-in (units: secondary clock), () if disabled") }, - { 6, _("Fade Out"), _("Length of region fade-out (units: secondary clock), () if dsisabled") }, - { 7, _("L"), _("Region position locked?") }, - { 8, _("G"), _("Region position glued to Bars|Beats time?") }, - { 9, _("M"), _("Region muted?") }, - { 10, _("O"), _("Region opaque (blocks regions below it from being heard)?") }, + { 0, _("Region"), _("Region name, with number of channels in []'s") }, + { 1, _("Position"), _("Position of start of region") }, + { 2, _("End"), _("Position of end of region") }, + { 3, _("Length"), _("Length of the region") }, + { 4, _("Sync"), _("Position of region sync point, relative to start of the region") }, + { 5, _("Fade In"), _("Length of region fade-in (units: secondary clock), () if disabled") }, + { 6, _("Fade Out"), _("Length of region fade-out (units: secondary clock), () if disabled") }, + { 7, S_("Lock|L"), _("Region position locked?") }, + { 8, S_("Gain|G"), _("Region position glued to Bars|Beats time?") }, + { 9, S_("Mute|M"), _("Region muted?") }, + { 10, S_("Opaque|O"), _("Region opaque (blocks regions below it from being heard)?") }, { -1, 0, 0 } }; - + for (int i = 0; ci[i].index >= 0; ++i) { col = _display.get_column (ci[i].index); l = manage (new Label (ci[i].label)); - ARDOUR_UI::instance()->set_tip (*l, ci[i].tooltip); + set_tooltip (*l, ci[i].tooltip); col->set_widget (*l); l->show (); if (ci[i].index > 6) { col->set_expand (false); col->set_alignment (ALIGN_CENTER); - } + } } + _display.set_model (_model); _display.set_headers_visible (true); _display.set_rules_hint (); @@ -184,6 +233,7 @@ EditorRegions::EditorRegions (Editor* e) _display.get_selection()->set_mode (SELECTION_MULTIPLE); _display.add_object_drag (_columns.region.index(), "regions"); + _display.set_drag_column (_columns.name.index()); /* setup DnD handling */ @@ -294,7 +344,7 @@ EditorRegions::add_region (boost::shared_ptr region) string str; TreeModel::Row row; Gdk::Color c; - bool missing_source = boost::dynamic_pointer_cast(region->source()); + bool missing_source = boost::dynamic_pointer_cast(region->source()) != NULL; if (!_show_automatic_regions && region->automatic()) { return; @@ -340,14 +390,15 @@ EditorRegions::add_region (boost::shared_ptr region) row = *(_model->append()); if (missing_source) { - c.set_rgb(65535,0,0); // FIXME: error color from style + // c.set_rgb(65535,0,0); // FIXME: error color from style + set_color_from_rgba (c, UIConfiguration::instance().color ("region list missing source")); } else if (region->automatic()){ - c.set_rgb(0,65535,0); // FIXME: error color from style + // c.set_rgb(0,65535,0); // FIXME: error color from style + set_color_from_rgba (c, UIConfiguration::instance().color ("region list automatic")); } else { - set_color(c, rgba_from_style ("RegionListWholeFile", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false )); - + set_color_from_rgba (c, UIConfiguration::instance().color ("region list whole file")); } row[_columns.color_] = c; @@ -373,27 +424,19 @@ EditorRegions::add_region (boost::shared_ptr region) str = region->name(); } - if (region->n_channels() > 1) { - std::stringstream foo; - foo << region->n_channels (); - str += " ["; - str += foo.str(); - str += "]"; - } - - row[_columns.name] = str; + populate_row_name (region, row); row[_columns.region] = region; row[_columns.property_toggles_visible] = false; if (missing_source) { - row[_columns.path] = _("(MISSING) ") + region->source()->name(); + row[_columns.path] = _("(MISSING) ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { boost::shared_ptr fs = boost::dynamic_pointer_cast(region->source()); if (fs) { - row[_columns.path] = fs->path(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path()); } else { - row[_columns.path] = region->source()->name(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } @@ -429,7 +472,7 @@ EditorRegions::add_region (boost::shared_ptr region) */ row = *(_model->insert (subrows.end())); - + } else { row = *(_model->append()); } @@ -440,8 +483,8 @@ EditorRegions::add_region (boost::shared_ptr region) row[_columns.region] = region; region_row_map.insert(pair, Gtk::TreeModel::RowReference>(region, TreeRowReference(_model, TreePath (row))) ); - - populate_row(region, (*row)); + PropertyChange pc; + populate_row(region, (*row), pc); } void @@ -489,14 +532,13 @@ EditorRegions::region_changed (boost::shared_ptr r, const PropertyChange our_interests.add (ARDOUR::Properties::fade_out_active); if (what_changed.contains (our_interests)) { - if (last_row != 0) { TreeModel::iterator j = _model->get_iter (last_row.get_path()); boost::shared_ptr c = (*j)[_columns.region]; if (c == r) { - populate_row (r, (*j)); + populate_row (r, (*j), what_changed); if (what_changed.contains (ARDOUR::Properties::hidden)) { redisplay (); @@ -516,7 +558,7 @@ EditorRegions::region_changed (boost::shared_ptr r, const PropertyChange boost::shared_ptr c = (*j)[_columns.region]; if (c == r) { - populate_row (r, (*j)); + populate_row (r, (*j), what_changed); if (what_changed.contains (ARDOUR::Properties::hidden)) { redisplay (); @@ -565,7 +607,7 @@ EditorRegions::selection_changed () _change_connection.block (false); } } - + } } else { _editor->get_selection().clear_regions (); @@ -655,9 +697,9 @@ EditorRegions::update_row (boost::shared_ptr region) it = region_row_map.find (region); if (it != region_row_map.end()){ - + PropertyChange c; TreeModel::iterator j = _model->get_iter ((*it).second.get_path()); - populate_row(region, (*j)); + populate_row(region, (*j), c); } } @@ -677,7 +719,8 @@ EditorRegions::update_all_rows () boost::shared_ptr region = (*j)[_columns.region]; if (!region->automatic()) { - populate_row(region, (*j)); + PropertyChange c; + populate_row(region, (*j), c); } } } @@ -688,9 +731,15 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool Timecode::BBT_Time bbt; Timecode::Time timecode; + if (pos < 0) { + error << string_compose (_("EditorRegions::format_position: negative timecode position: %1"), pos) << endmsg; + snprintf (buf, bufsize, "invalid"); + return; + } + switch (ARDOUR_UI::instance()->secondary_clock->mode ()) { case AudioClock::BBT: - _session->tempo_map().bbt_time (pos, bbt); + bbt = _session->tempo_map().bbt_at_frame (pos); if (onoff) { snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); } else { @@ -738,26 +787,53 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool } void -EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row const &row) +EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row const &row, PBD::PropertyChange const &what_changed) { boost::shared_ptr audioregion = boost::dynamic_pointer_cast(region); //uint32_t used = _session->playlists->region_use_count (region); /* Presently a region is only used once so let's save on the sequential scan to determine use count */ uint32_t used = 1; - populate_row_position (region, row, used); - populate_row_end (region, row, used); - populate_row_sync (region, row, used); - populate_row_fade_in (region, row, used, audioregion); - populate_row_fade_out (region, row, used, audioregion); - populate_row_locked (region, row, used); - populate_row_glued (region, row, used); - populate_row_muted (region, row, used); - populate_row_opaque (region, row, used); - populate_row_length (region, row); - populate_row_source (region, row); - populate_row_name (region, row); - populate_row_used (region, row, used); + PropertyChange c; + const bool all = what_changed == c; + + if (all || what_changed.contains (Properties::position)) { + populate_row_position (region, row, used); + } + if (all || what_changed.contains (Properties::start)) { + populate_row_sync (region, row, used); + } + if (all || what_changed.contains (Properties::fade_in)) { + populate_row_fade_in (region, row, used, audioregion); + } + if (all || what_changed.contains (Properties::fade_out)) { + populate_row_fade_out (region, row, used, audioregion); + } + if (all || what_changed.contains (Properties::locked)) { + populate_row_locked (region, row, used); + } + if (all || what_changed.contains (Properties::position_lock_style)) { + populate_row_glued (region, row, used); + } + if (all || what_changed.contains (Properties::muted)) { + populate_row_muted (region, row, used); + } + if (all || what_changed.contains (Properties::opaque)) { + populate_row_opaque (region, row, used); + } + if (all || what_changed.contains (Properties::length)) { + populate_row_end (region, row, used); + populate_row_length (region, row); + } + if (all) { + populate_row_source (region, row); + } + if (all || what_changed.contains (Properties::name)) { + populate_row_name (region, row); + } + if (all) { + populate_row_used (region, row, used); + } } #if 0 @@ -803,7 +879,15 @@ void EditorRegions::populate_row_length (boost::shared_ptr region, TreeModel::Row const &row) { char buf[16]; - format_position (region->length(), buf, sizeof (buf)); + + if (ARDOUR_UI::instance()->secondary_clock->mode () == AudioClock::BBT) { + TempoMap& map (_session->tempo_map()); + Timecode::BBT_Time bbt = map.bbt_at_beat (map.beat_at_frame (region->last_frame()) - map.beat_at_frame (region->first_frame())); + snprintf (buf, sizeof (buf), "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); + } else { + format_position (region->length(), buf, sizeof (buf)); + } + row[_columns.length] = buf; } @@ -814,10 +898,12 @@ EditorRegions::populate_row_end (boost::shared_ptr region, TreeModel::Ro row[_columns.end] = ""; } else if (used > 1) { row[_columns.end] = _("Mult."); - } else { + } else if (region->last_frame() >= region->first_frame()) { char buf[16]; format_position (region->last_frame(), buf, sizeof (buf)); row[_columns.end] = buf; + } else { + row[_columns.end] = "empty"; } } @@ -937,9 +1023,9 @@ void EditorRegions::populate_row_name (boost::shared_ptr region, TreeModel::Row const &row) { if (region->n_channels() > 1) { - row[_columns.name] = string_compose("%1 [%2]", region->name(), region->n_channels()); + row[_columns.name] = string_compose("%1 [%2]", Gtkmm2ext::markup_escape_text (region->name()), region->n_channels()); } else { - row[_columns.name] = region->name(); + row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name()); } } @@ -947,9 +1033,9 @@ void EditorRegions::populate_row_source (boost::shared_ptr region, TreeModel::Row const &row) { if (boost::dynamic_pointer_cast(region->source())) { - row[_columns.path] = _("MISSING ") + region->source()->name(); + row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { - row[_columns.path] = region->source()->name(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } @@ -1235,7 +1321,7 @@ EditorRegions::drag_data_received (const RefPtr& context, framepos_t pos = 0; bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); - if (Profile->get_sae() || Config->get_only_copy_imported_files() || copy) { + if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos); } else { _editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos); @@ -1267,7 +1353,7 @@ EditorRegions::selection_filter (const RefPtr& model, const TreeModel } void -EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&) +EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring& path) { name_editable = ce; @@ -1277,6 +1363,15 @@ EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&) if (e) { e->set_name (X_("RegionNameEditorEntry")); + + TreeIter iter; + if ((iter = _model->get_iter (path))) { + boost::shared_ptr region = (*iter)[_columns.region]; + + if(region) { + e->set_text(region->name()); + } + } } } @@ -1286,11 +1381,11 @@ EditorRegions::name_edit (const std::string& path, const std::string& new_text) name_editable = 0; boost::shared_ptr region; - TreeIter iter; + TreeIter row_iter; - if ((iter = _model->get_iter (path))) { - region = (*iter)[_columns.region]; - (*iter)[_columns.name] = new_text; + if ((row_iter = _model->get_iter (path))) { + region = (*row_iter)[_columns.region]; + (*row_iter)[_columns.name] = new_text; } /* now mapover everything */ @@ -1304,8 +1399,9 @@ EditorRegions::name_edit (const std::string& path, const std::string& new_text) (*i)->region()->set_name (new_text); } } - } + populate_row_name (region, (*row_iter)); + } } /** @return Region that has been dragged out of the list, or 0 */ @@ -1559,7 +1655,7 @@ EditorRegions::sort_type_action (Editing::RegionListSortType t) const break; default: fatal << string_compose (_("programming error: %1: %2"), "EditorRegions: impossible sort type", (int) t) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } RefPtr act = ActionManager::get_action (X_("RegionList"), action);