Unify the canvases by moving groups around rather than using set_scrolling_region...

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index b9dea243134ddaaea1c95ca975a629be8344bb5d..451a85efd7e0bedfa1ab3c311426f1e337b421ea 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -46,10 +46,10 @@ using namespace Gtkmm2ext;
 LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
        : location(0), session(0),
          item_table (1, 7, false),
-         start_set_button (_("Set")),
+         start_set_button (_("Use PH")),
          start_go_button (_("Go")),
          start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true),
-         end_set_button (_("Set")),
+         end_set_button (_("Use PH")),
          end_go_button (_("Go")),
          end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true),
          length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, true),
@@ -82,7 +82,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
        composer_label.set_name ("LocationEditNumberLabel");
        composer_entry.set_name ("LocationEditNameEntry");
 
-
+       ARDOUR_UI::instance()->tooltips().set_tip(start_set_button, _("Set value to Playhead"));
+       ARDOUR_UI::instance()->tooltips().set_tip(end_set_button, _("Set value to Playhead"));
+ 
        isrc_label.set_text ("ISRC: ");
        isrc_label.set_size_request (30, -1);
        performer_label.set_text ("Performer: ");
@@ -131,6 +133,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
        start_set_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::set_button_pressed), LocStart));
        start_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart));
        start_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocStart));
+       start_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocStart));
 
        
        end_hbox.pack_start (end_go_button, false, false);
@@ -142,9 +145,11 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
        end_set_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::set_button_pressed), LocEnd));
        end_go_button.signal_clicked().connect(bind (mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd));
        end_clock.ValueChanged.connect (bind (mem_fun (*this, &LocationEditRow::clock_changed), LocEnd));
+       end_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocEnd));
        
 //     item_table.attach (length_clock, 3, 4, 0, 1, 0, 0, 4, 0);
        length_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
+       length_clock.ChangeAborted.connect (bind (mem_fun (*this, &LocationEditRow::change_aborted), LocLength));
 
 //     item_table.attach (cd_check_button, 4, 5, 0, 1, 0, Gtk::FILL, 4, 0);
 //     item_table.attach (hide_check_button, 5, 6, 0, 1, 0, Gtk::FILL, 4, 0);
@@ -222,7 +227,7 @@ LocationEditRow::set_location (Location *loc)
                name_label.set_size_request (80, -1);
 
                if (!name_label.get_parent()) {
-                       item_table.attach (name_label, 1, 2, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0);
                }
                
                name_label.show();
@@ -240,10 +245,10 @@ LocationEditRow::set_location (Location *loc)
                name_entry.show();
 
                if (!cd_check_button.get_parent()) {
-                       item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, FILL, 4, 0);
                }
                if (!remove_button.get_parent()) {
-                       item_table.attach (remove_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
+                       item_table.attach (remove_button, 7, 8, 0, 1, FILL, FILL, 4, 0);
                }
 
                /* XXX i can't find a way to hide the button without messing up 
@@ -267,7 +272,7 @@ LocationEditRow::set_location (Location *loc)
        }
 
        start_clock.set (location->start(), true);
-       
+
 
        if (!location->is_mark()) {
                if (!end_hbox.get_parent()) {
@@ -414,6 +419,14 @@ LocationEditRow::clock_changed (LocationPart part)
 
 }
 
+void
+LocationEditRow::change_aborted (LocationPart part)
+{
+       if (i_am_the_modifier || !location) return;
+       
+       set_location(location);
+}
+
 void
 LocationEditRow::cd_toggled ()
 {
@@ -421,9 +434,9 @@ LocationEditRow::cd_toggled ()
                return;
        }
        
-       if (cd_check_button.get_active() == location->is_cd_marker()) {
-               return;
-       }
+       //if (cd_check_button.get_active() == location->is_cd_marker()) {
+       //      return;
+       //}
 
        if (cd_check_button.get_active()) {
                if (location->start() <= session->current_start_frame()) {
@@ -600,6 +613,12 @@ LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src)
        i_am_the_modifier--;
 }
 
+void
+LocationEditRow::focus_name() {
+       name_entry.grab_focus();
+}
+
+
 LocationUI::LocationUI ()
        : ArdourDialog ("locations dialog"),
          add_location_button (_("Add New Location")),
@@ -628,6 +647,8 @@ LocationUI::LocationUI ()
        location_rows_scroller.set_name ("LocationLocRowsScroller");
        location_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
        location_rows_scroller.set_size_request (-1, 130);
+       
+       newest_location = 0;
 
        loc_frame_box.set_spacing (5);
        loc_frame_box.set_border_width (5);
@@ -678,6 +699,11 @@ LocationUI::~LocationUI()
 {
 }
 
+void LocationUI::on_show()
+{
+       ArdourDialog::on_show();
+       refresh_location_list();
+}
 
 
 gint LocationUI::do_location_remove (ARDOUR::Location *loc)
@@ -784,14 +810,20 @@ LocationUI::map_locations (Locations::LocationList& locations)
                        erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
                        erow->redraw_ranges.connect (mem_fun(*this, &LocationUI::location_redraw_ranges));
                        loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
+                       if (location == newest_location) {
+                               newest_location = 0;
+                               erow->focus_name();
+                       }
                }
                else if (location->is_auto_punch()) {
                        punch_edit_row.set_session (session);
                        punch_edit_row.set_location (location);
+                       punch_edit_row.show_all();
                }
                else if (location->is_auto_loop()) {
                        loop_edit_row.set_session (session);
                        loop_edit_row.set_location (location);
+                       loop_edit_row.show_all();
                }
                else {
                        erow = manage (new LocationEditRow(session, location));
@@ -813,6 +845,9 @@ LocationUI::add_new_location()
                nframes_t where = session->audible_frame();
                session->locations()->next_available_name(markername,"mark");
                Location *location = new Location (where, where, markername, Location::IsMark);
+               if (Config->get_name_new_markers()) {
+                       newest_location = location;                     
+               }
                session->begin_reversible_command (_("add marker"));
                XMLNode &before = session->locations()->get_state();
                session->locations()->add (location, true);
@@ -856,6 +891,9 @@ LocationUI::refresh_location_list ()
        ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list));
        using namespace Box_Helpers;
 
+       // this is just too expensive to do when window is not shown
+       if (!is_visible()) return;
+
        BoxList & loc_children = location_rows.children();
        BoxList & range_children = range_rows.children();