changes from colin for route_params, nick for location_ui and route_ui, and me for ardour_ui.cc

git-svn-id: svn://localhost/trunk/ardour2@50 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 37 insertions, 37 deletions

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index ae9fd20bc3..d10f43cd30 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -107,37 +107,37 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	cd_track_details_hbox.pack_start (composer_label, false, false);
 	cd_track_details_hbox.pack_start (composer_entry, true, true);
 
-	isrc_entry.changed.connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); 
-	isrc_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
-	isrc_entry.signal_focus_out_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	isrc_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); 
+	isrc_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	isrc_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
-	performer_entry.changed.connect (mem_fun(*this, &LocationEditRow::performer_entry_changed));
-	performer_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
-	performer_entry.signal_focus_out_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	performer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::performer_entry_changed));
+	performer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	performer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
-	composer_entry.changed.connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
-	composer_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
-	composer_entry.signal_focus_out_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
+	composer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	composer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
-	scms_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::scms_toggled));
-	preemph_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::preemph_toggled));
+	scms_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::scms_toggled));
+	preemph_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::preemph_toggled));
 
 
 	set_session (sess);
 
 
-	item_table.attach (number_label, 0, 1, 0, 1, 0, 0, 3, 0);
+	item_table.attach (number_label, 0, 1, 0, 1, FILL, FILL, 3, 0);
 	
 	start_hbox.pack_start (start_go_button, false, false);
 	start_hbox.pack_start (start_clock, false, false);
 	start_hbox.pack_start (start_set_button, false, false);
 
-	item_table.attach (start_hbox, 2, 3, 0, 1, 0, 0, 4, 0);
+	item_table.attach (start_hbox, 2, 3, 0, 1, FILL, FILL, 4, 0);
 
 	
-	start_set_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::set_button_pressed), LocStart));
-	start_go_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::go_button_pressed), LocStart));
- 	start_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocStart));
+	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));
 
 	
 	end_hbox.pack_start (end_go_button, false, false);
@@ -146,9 +146,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	
 	//item_table.attach (end_hbox, 2, 3, 0, 1, 0, 0, 4, 0);
 	
-	end_set_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::set_button_pressed), LocEnd));
-	end_go_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::go_button_pressed), LocEnd));
-	end_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocEnd));
+	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));
 	
 //	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));
@@ -157,10 +157,10 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 //	item_table.attach (hide_check_button, 5, 6, 0, 1, 0, Gtk::FILL, 4, 0);
 //	item_table.attach (remove_button, 7, 8, 0, 1, 0, Gtk::FILL, 4, 0);
 	
-	cd_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::cd_toggled));
-	hide_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::hide_toggled));
+	cd_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::cd_toggled));
+	hide_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::hide_toggled));
 	
-	remove_button.clicked.connect(mem_fun(*this, &LocationEditRow::remove_button_pressed));
+	remove_button.signal_clicked().connect(mem_fun(*this, &LocationEditRow::remove_button_pressed));
 
 	pack_start(item_table, true, true);
 
@@ -218,7 +218,7 @@ LocationEditRow::set_location (Location *loc)
 	if (!location) return;
 
 	if (!hide_check_button.get_parent()) {
-		item_table.attach (hide_check_button, 6, 7, 0, 1, 0, Gtk::FILL, 4, 0);
+		item_table.attach (hide_check_button, 6, 7, 0, 1, FILL, Gtk::FILL, 4, 0);
 	}
 	hide_check_button.set_active (location->is_hidden());
 	
@@ -229,7 +229,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, 0, Gtk::FILL, 4, 0);
+			item_table.attach (name_label, 1, 2, 0, 1, FILL, Gtk::FILL, 4, 0);
 		}
 		
 		name_label.show();
@@ -239,20 +239,20 @@ LocationEditRow::set_location (Location *loc)
 		name_entry.set_text (location->name());
 		name_entry.set_size_request (100, -1);
 		name_entry.set_editable (true);
-		name_entry.changed.connect (mem_fun(*this, &LocationEditRow::name_entry_changed));  
-		name_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
-		name_entry.signal_focus_out_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+		name_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::name_entry_changed));  
+		name_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+		name_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
 		if (!name_entry.get_parent()) {
-			item_table.attach (name_entry, 1, 2, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL, 4, 0);
+			item_table.attach (name_entry, 1, 2, 0, 1, FILL | EXPAND, FILL, 4, 0);
 		}
 		name_entry.show();
 
 		if (!cd_check_button.get_parent()) {
-			item_table.attach (cd_check_button, 5, 6, 0, 1, 0, Gtk::FILL, 4, 0);
+			item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0);
 		}
 		if (!remove_button.get_parent()) {
-			item_table.attach (remove_button, 7, 8, 0, 1, 0, Gtk::FILL, 4, 0);
+			item_table.attach (remove_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0);
 		}
 
 		/* XXX i can't find a way to hide the button without messing up 
@@ -273,10 +273,10 @@ LocationEditRow::set_location (Location *loc)
 
 	if (!location->is_mark()) {
 		if (!end_hbox.get_parent()) {
-			item_table.attach (end_hbox, 3, 4, 0, 1, 0, 0, 4, 0);
+			item_table.attach (end_hbox, 3, 4, 0, 1, FILL, FILL, 4, 0);
 		}
 		if (!length_clock.get_parent()) {
-			item_table.attach (length_clock, 4, 5, 0, 1, 0, 0, 4, 0);
+			item_table.attach (length_clock, 4, 5, 0, 1, FILL, FILL, 4, 0);
 		}
 
 		end_clock.set (location->end(), true);
@@ -449,7 +449,7 @@ LocationEditRow::cd_toggled ()
 	  }
 	  
 	  if(!cd_track_details_hbox.get_parent()) {
-	    item_table.attach (cd_track_details_hbox, 1, 8, 1, 2, Gtk::FILL | Gtk::EXPAND, 0, 4, 0);
+	    item_table.attach (cd_track_details_hbox, 1, 8, 1, 2, FILL | EXPAND, FILL, 4, 0);
 	  }
 	  // item_table.resize(2, 7);
 	  cd_track_details_hbox.show_all();
@@ -598,7 +598,7 @@ LocationUI::LocationUI ()
 	set_wmclass(_("ardour_locations"), "Ardour");
 
 	set_name ("LocationWindow");
-	delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window*>(this)));
+	signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast<Window*>(this)));
 
 	add (location_hpacker);
 
@@ -692,7 +692,7 @@ void LocationUI::location_remove_requested (ARDOUR::Location *loc)
 	// must do this to prevent problems when destroying
 	// the effective sender of this event
 	
-	Main::idle.connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc));
+  Glib::signal_idle().connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc));
 }
 
 
@@ -769,7 +769,7 @@ LocationUI::map_locations (Locations::LocationList& locations)
 			erow = manage (new LocationEditRow(session, location, mark_n));
 			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, false, false, 1));
+			loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
 		}
 		else if (location->is_auto_punch()) {
 			punch_edit_row.set_session (session);
@@ -782,7 +782,7 @@ LocationUI::map_locations (Locations::LocationList& locations)
 		else {
 			erow = manage (new LocationEditRow(session, location));
 			erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
-			range_children.push_back(Box_Helpers::Element(*erow, false, false, 1));
+			range_children.push_back(Box_Helpers::Element(*erow,  PACK_SHRINK, 1, PACK_START));
 		}
 	}