X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=5bd26b193a987f56dfad6281dd636e8d6b91537b;hb=dc0139d4af4d246f6dcafb04425e3f1198c347c3;hp=436e161583f01dad8322ba9c866bd649a0e1b8e2;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 436e161583..5bd26b193a 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -42,6 +42,7 @@ #include "ardour/profile.h" #include "ardour_dialog.h" +#include "floating_text_entry.h" #include "gui_thread.h" #include "public_editor.h" #include "time_axis_view.h" @@ -57,7 +58,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -87,8 +88,7 @@ TimeAxisView::setup_sizes() } TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) - : AxisView (sess) - , controls_table (3, 3) + : controls_table (5, 4) , controls_button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_BOTH)) , _name_editing (false) , height (0) @@ -96,14 +96,12 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie , parent (rent) , selection_group (0) , _ghost_group (0) - , _hidden (false) + , _hidden (true) , in_destructor (false) , _size_menu (0) , _canvas_display (0) , _y_position (0) , _editor (ed) - , name_entry (0) - , ending_name_edit (false) , control_parent (0) , _order (0) , _effective_height (0) @@ -144,25 +142,24 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie _ghost_group->lower_to_bottom(); _ghost_group->show(); - name_label.set_name ("TrackLabel"); + name_label.set_name (X_("TrackNameEditor")); name_label.set_alignment (0.0, 0.5); name_label.set_width_chars (12); set_tooltip (name_label, _("Track/Bus name (double click to edit)")); - Gtk::Entry* an_entry = new Gtkmm2ext::FocusEntry; - an_entry->set_name ("EditorTrackNameDisplay"); - Gtk::Requisition req; - an_entry->size_request (req); - name_label.set_size_request (-1, req.height); - name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE); - delete an_entry; + { + std::auto_ptr an_entry (new Gtkmm2ext::FocusEntry); + an_entry->set_name (X_("TrackNameEditor")); + Gtk::Requisition req; + an_entry->size_request (req); - name_hbox.pack_end (name_label, true, true); + name_label.set_size_request (-1, req.height); + name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE); + } // set min. track-header width if fader is not visible - name_hbox.set_size_request(name_width_px, -1); + name_label.set_size_request(name_width_px, -1); - name_hbox.show (); name_label.show (); controls_table.set_row_spacings (2); @@ -170,10 +167,11 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_table.set_border_width (2); if (ARDOUR::Profile->get_mixbus() ) { - controls_table.attach (name_hbox, 4, 5, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + controls_table.attach (name_label, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); } else { - controls_table.attach (name_hbox, 1, 2, 0, 2, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + controls_table.attach (name_label, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); } + controls_table.show_all (); controls_table.set_no_show_all (); @@ -221,8 +219,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie top_hbox.pack_start (scroomer_placeholder, false, false); // OR pack_end to move after meters ? UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); - - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); } TimeAxisView::~TimeAxisView() @@ -297,6 +293,7 @@ TimeAxisView::hide () * @param y y position. * @param nth index for this TimeAxisView, increased if this view has children. * @param parent parent component. +* * @return height of this TimeAxisView. */ guint32 @@ -335,6 +332,10 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) } } + for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + (*i)->set_height (); + } + /* put separator at the bottom of this time axis view */ _canvas_separator->set (ArdourCanvas::Duple(0, height), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, height)); @@ -511,7 +512,9 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev) switch (ev->button) { case 1: - selection_click (ev); + if (selectable()) { + selection_click (ev); + } break; case 3: @@ -587,9 +590,7 @@ TimeAxisView::set_height (uint32_t h, TrackHeightMode m) TOP_LEVEL_WIDGET.property_height_request () = h; height = h; - char buf[32]; - snprintf (buf, sizeof (buf), "%u", height); - set_gui_property ("height", buf); + set_gui_property ("height", height); for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_height (); @@ -609,137 +610,42 @@ TimeAxisView::set_height (uint32_t h, TrackHeightMode m) _editor.override_visible_track_count (); } -bool -TimeAxisView::name_entry_key_press (GdkEventKey* ev) -{ - /* steal escape, tabs from GTK */ - - switch (ev->keyval) { - case GDK_Escape: - case GDK_ISO_Left_Tab: - case GDK_Tab: - return true; - } - return false; -} - -bool -TimeAxisView::name_entry_key_release (GdkEventKey* ev) -{ - TrackViewList::iterator i; - - switch (ev->keyval) { - case GDK_Escape: - end_name_edit (RESPONSE_CANCEL); - return true; - - /* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually - * generates a different ev->keyval, rather than setting - * ev->state. - */ - case GDK_ISO_Left_Tab: - end_name_edit (RESPONSE_APPLY); - return true; - - case GDK_Tab: - end_name_edit (RESPONSE_ACCEPT); - return true; - default: - break; - } - - return false; -} - -bool -TimeAxisView::name_entry_focus_out (GdkEventFocus*) -{ - end_name_edit (RESPONSE_OK); - return false; -} - void TimeAxisView::begin_name_edit () { - if (name_entry) { + if (!can_edit_name()) { return; } - if (can_edit_name()) { + Gtk::Window* toplevel = (Gtk::Window*) control_parent->get_toplevel(); + FloatingTextEntry* fte = new FloatingTextEntry (toplevel, name_label.get_text ()); - name_entry = manage (new Gtkmm2ext::FocusEntry); + fte->set_name ("TrackNameEditor"); + fte->use_text.connect (sigc::mem_fun (*this, &TimeAxisView::end_name_edit)); - name_entry->set_width_chars(8); // min width, entry expands + /* We want to new toplevel window to overlay the name label, so + * translate the coordinates of the upper left corner of the name label + * into the coordinate space of the top level window. + */ - name_entry->set_name ("EditorTrackNameDisplay"); - name_entry->signal_key_press_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_press), false); - name_entry->signal_key_release_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_key_release), false); - name_entry->signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out)); - name_entry->set_text (name_label.get_text()); - name_entry->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisView::end_name_edit), RESPONSE_OK)); + int x, y; + int wx, wy; - if (name_label.is_ancestor (name_hbox)) { - name_hbox.remove (name_label); - } + name_label.translate_coordinates (*toplevel, 0, 0, x, y); + toplevel->get_window()->get_origin (wx, wy); - name_hbox.pack_end (*name_entry, true, true); - name_entry->show (); - - name_entry->select_region (0, -1); - name_entry->set_state (STATE_SELECTED); - name_entry->grab_focus (); - name_entry->start_editing (0); - } + fte->move (wx + x, wy + y); + fte->present (); } void -TimeAxisView::end_name_edit (int response) +TimeAxisView::end_name_edit (std::string str, int next_dir) { - if (!name_entry) { - return; - } - - if (ending_name_edit) { - /* already doing this, and focus out or other event has caused - us to re-enter this code. - */ - return; - } - - PBD::Unwinder uw (ending_name_edit, true); - - bool edit_next = false; - bool edit_prev = false; - - switch (response) { - case RESPONSE_CANCEL: - break; - case RESPONSE_OK: - name_entry_changed (); - break; - case RESPONSE_ACCEPT: - name_entry_changed (); - edit_next = true; - case RESPONSE_APPLY: - name_entry_changed (); - edit_prev = true; + if (!name_entry_changed (str)) { + next_dir = 0; } - /* this will delete the name_entry. but it will also drop focus, which - * will cause another callback to this function, so set name_entry = 0 - * first to ensure we don't double-remove etc. etc. - */ - - Gtk::Entry* tmp = name_entry; - name_entry = 0; - name_hbox.remove (*tmp); - - /* put the name label back */ - - name_hbox.pack_end (name_label); - name_label.show (); - - if (edit_next) { + if (next_dir > 0) { TrackViewList const & allviews = _editor.get_track_views (); TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); @@ -753,7 +659,7 @@ TimeAxisView::end_name_edit (int response) RouteTimeAxisView* rtav = dynamic_cast(*i); - if (rtav && rtav->route()->record_enabled()) { + if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) { continue; } @@ -769,7 +675,7 @@ TimeAxisView::end_name_edit (int response) (*i)->begin_name_edit (); } - } else if (edit_prev) { + } else if (next_dir < 0) { TrackViewList const & allviews = _editor.get_track_views (); TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); @@ -784,7 +690,7 @@ TimeAxisView::end_name_edit (int response) RouteTimeAxisView* rtav = dynamic_cast(*i); - if (rtav && rtav->route()->record_enabled()) { + if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) { continue; } @@ -802,9 +708,10 @@ TimeAxisView::end_name_edit (int response) } } -void -TimeAxisView::name_entry_changed () +bool +TimeAxisView::name_entry_changed (string const&) { + return true; } bool @@ -816,6 +723,10 @@ TimeAxisView::can_edit_name () const void TimeAxisView::conditionally_add_to_selection () { + if (!selectable()) { + return; + } + Selection& s (_editor.get_selection ()); if (!s.selected (this)) { @@ -829,21 +740,20 @@ TimeAxisView::popup_display_menu (guint32 when) conditionally_add_to_selection (); build_display_menu (); - display_menu->popup (1, when); + + if (!display_menu->items().empty()) { + display_menu->popup (1, when); + } } void TimeAxisView::set_selected (bool yn) { - if (can_edit_name() && name_entry && name_entry->get_visible()) { - end_name_edit (RESPONSE_CANCEL); - } - - if (yn == _selected) { + if (yn == selected()) { return; } - Selectable::set_selected (yn); + AxisView::set_selected (yn); if (_selected) { time_axis_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -859,19 +769,9 @@ TimeAxisView::set_selected (bool yn) time_axis_vbox.set_name (controls_base_unselected_name); hide_selection (); - - /* children will be set for the yn=true case. but when deselecting - the editor only has a list of top-level trackviews, so we - have to do this here. - */ - - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_selected (false); - } } time_axis_frame.show(); - } void @@ -1024,6 +924,8 @@ TimeAxisView::order_selection_trims (ArdourCanvas::Item *item, bool put_start_on } } +// retuned rect is pushed back into the used_selection_rects list +// in TimeAxisView::show_selection() which is the only caller. SelectionRect * TimeAxisView::get_selection_rect (uint32_t id) { @@ -1033,7 +935,9 @@ TimeAxisView::get_selection_rect (uint32_t id) for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { if ((*i)->id == id) { - return (*i); + SelectionRect* ret = (*i); + used_selection_rects.erase (i); + return ret; } } @@ -1391,10 +1295,9 @@ TimeAxisView::reset_visual_state () { /* this method is not required to trigger a global redraw */ - string str = gui_property ("height"); - - if (!str.empty()) { - set_height (atoi (str)); + uint32_t height; + if (get_gui_property ("height", height)) { + set_height (height); } else { set_height (preset_height (HeightNormal)); }