#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"
#include "tooltips.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Gtk;
}
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)
, 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)
CANVAS_DEBUG_NAME (selection_group, "selection for TAV");
selection_group->set_data (X_("timeselection"), (void *) 1);
selection_group->hide();
-
+
_ghost_group = new ArdourCanvas::Container (_canvas_display);
CANVAS_DEBUG_NAME (_ghost_group, "ghost for TAV");
_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<Gtk::Entry> 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);
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 ();
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()
* @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
_canvas_display->raise_to_top ();
_canvas_display->show ();
-
+
_hidden = false;
_effective_height = current_height ();
}
_ebox_release_can_act = true;
-
+
if (maybe_set_cursor (event->y) > 0) {
_resize_drag_start = event->y_root;
}
switch (ev->button) {
case 1:
- selection_click (ev);
+ if (selectable()) {
+ selection_click (ev);
+ }
break;
case 3:
_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);
-
- name_entry->set_width_chars(8); // min width, entry expands
+ fte->set_name ("TrackNameEditor");
+ fte->use_text.connect (sigc::mem_fun (*this, &TimeAxisView::end_name_edit));
- 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));
+ /* 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.
+ */
- if (name_label.is_ancestor (name_hbox)) {
- name_hbox.remove (name_label);
- }
-
- name_hbox.pack_end (*name_entry, true, true);
- name_entry->show ();
+ int x, y;
+ int wx, wy;
- name_entry->select_region (0, -1);
- name_entry->set_state (STATE_SELECTED);
- name_entry->grab_focus ();
- name_entry->start_editing (0);
- }
+ name_label.translate_coordinates (*toplevel, 0, 0, x, y);
+ toplevel->get_window()->get_origin (wx, wy);
+
+ 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 (!name_entry_changed (str)) {
+ next_dir = 0;
}
- if (ending_name_edit) {
- /* already doing this, and focus out or other event has caused
- us to re-enter this code.
- */
- return;
- }
-
- PBD::Unwinder<bool> 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;
- }
-
- /* 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);
-
+
if (i != allviews.end()) {
-
+
do {
if (++i == allviews.end()) {
return;
}
-
+
RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
-
- if (rtav && rtav->route()->record_enabled()) {
+
+ if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) {
continue;
}
-
+
if (!(*i)->hidden()) {
break;
}
-
+
} while (true);
}
(*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);
-
+
if (i != allviews.begin()) {
do {
if (i == allviews.begin()) {
return;
}
-
+
--i;
-
+
RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
-
- if (rtav && rtav->route()->record_enabled()) {
+
+ if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) {
continue;
}
-
+
if (!(*i)->hidden()) {
break;
}
-
+
} while (true);
}
-
+
if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
_editor.ensure_time_axis_view_is_visible (**i, false);
(*i)->begin_name_edit ();
}
}
-void
-TimeAxisView::name_entry_changed ()
+bool
+TimeAxisView::name_entry_changed (string const&)
{
+ return true;
}
bool
void
TimeAxisView::conditionally_add_to_selection ()
{
+ if (!selectable()) {
+ return;
+ }
+
Selection& s (_editor.get_selection ());
if (!s.selected (this)) {
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;
}
}
}
+// 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)
{
for (list<SelectionRect*>::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;
}
}
(*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
(*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
-
+
(*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
(*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
}
-
+
for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
-
+
(*i)->rect->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect"));
(*i)->rect->set_outline_color (UIConfiguration::instance().color ("selection"));
-
+
(*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
(*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
-
+
(*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
(*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
}
/* if either the top or bottom of the axisview is in the vertical
* range, we cover it.
*/
-
+
if ((y0 < _y_position && y1 < _y_position) ||
(y0 >= _y_position + height && y1 >= _y_position + height)) {
return false;
/* this method is not required to trigger a global redraw */
string str = gui_property ("height");
-
+
if (!str.empty()) {
set_height (atoi (str));
} else {
projects / ardour.git / blobdiff