cd_track_details_hbox.pack_start (composer_label, false, false);
cd_track_details_hbox.pack_start (composer_entry, true, true);
- isrc_entry.changed.connect (slot (*this, &LocationEditRow::isrc_entry_changed));
- isrc_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- isrc_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
-
- performer_entry.changed.connect (slot (*this, &LocationEditRow::performer_entry_changed));
- performer_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- performer_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
-
- composer_entry.changed.connect (slot (*this, &LocationEditRow::composer_entry_changed));
- composer_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- composer_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
-
- scms_check_button.toggled.connect(slot (*this, &LocationEditRow::scms_toggled));
- preemph_check_button.toggled.connect(slot (*this, &LocationEditRow::preemph_toggled));
+ isrc_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed));
+ performer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::performer_entry_changed));
+ composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
+ 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 ( slot (*this, &LocationEditRow::set_button_pressed), LocStart));
- start_go_button.clicked.connect( bind ( slot (*this, &LocationEditRow::go_button_pressed), LocStart));
- start_clock.ValueChanged.connect (bind ( slot (*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);
//item_table.attach (end_hbox, 2, 3, 0, 1, 0, 0, 4, 0);
- end_set_button.clicked.connect( bind ( slot (*this, &LocationEditRow::set_button_pressed), LocEnd));
- end_go_button.clicked.connect( bind ( slot (*this, &LocationEditRow::go_button_pressed), LocEnd));
- end_clock.ValueChanged.connect (bind ( slot (*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 ( slot (*this, &LocationEditRow::clock_changed), LocLength));
+ length_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), 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);
// item_table.attach (remove_button, 7, 8, 0, 1, 0, Gtk::FILL, 4, 0);
- cd_check_button.toggled.connect(slot (*this, &LocationEditRow::cd_toggled));
- hide_check_button.toggled.connect(slot (*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(slot (*this, &LocationEditRow::remove_button_pressed));
+ remove_button.signal_clicked().connect(mem_fun(*this, &LocationEditRow::remove_button_pressed));
pack_start(item_table, true, true);
number = num;
if (number >= 0 ) {
- number_label.set_text (compose ("%1", number));
+ number_label.set_text (string_compose ("%1", number));
}
}
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());
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();
name_entry.set_text (location->name());
name_entry.set_size_request (100, -1);
name_entry.set_editable (true);
- name_entry.changed.connect (slot (*this, &LocationEditRow::name_entry_changed));
- name_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- name_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
+ name_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::name_entry_changed));
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
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);
length_clock.hide();
}
- start_changed_connection = location->start_changed.connect (slot (*this, &LocationEditRow::start_changed));
- end_changed_connection = location->end_changed.connect (slot (*this, &LocationEditRow::end_changed));
- name_changed_connection = location->name_changed.connect (slot (*this, &LocationEditRow::name_changed));
- changed_connection = location->changed.connect (slot (*this, &LocationEditRow::location_changed));
- flags_changed_connection = location->FlagsChanged.connect (slot (*this, &LocationEditRow::flags_changed));
+ start_changed_connection = location->start_changed.connect (mem_fun(*this, &LocationEditRow::start_changed));
+ end_changed_connection = location->end_changed.connect (mem_fun(*this, &LocationEditRow::end_changed));
+ name_changed_connection = location->name_changed.connect (mem_fun(*this, &LocationEditRow::name_changed));
+ changed_connection = location->changed.connect (mem_fun(*this, &LocationEditRow::location_changed));
+ flags_changed_connection = location->FlagsChanged.connect (mem_fun(*this, &LocationEditRow::flags_changed));
}
-gint
-LocationEditRow::entry_focus_event (GdkEventFocus* ev)
-{
- if (ev->in) {
- ARDOUR_UI::instance()->allow_focus (true);
- } else {
- ARDOUR_UI::instance()->allow_focus (false);
- }
- return TRUE;
-}
-
-
void
LocationEditRow::name_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::name_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::name_entry_changed));
if (i_am_the_modifier || !location) return;
location->set_name (name_entry.get_text());
void
LocationEditRow::isrc_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::isrc_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::isrc_entry_changed));
if (i_am_the_modifier || !location) return;
void
LocationEditRow::performer_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::performer_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::performer_entry_changed));
if (i_am_the_modifier || !location) return;
void
LocationEditRow::composer_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::composer_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::composer_entry_changed));
if (i_am_the_modifier || !location) return;
}
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();
void
LocationEditRow::end_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::end_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::end_changed), loc));
if (!location) return;
void
LocationEditRow::start_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::start_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::start_changed), loc));
if (!location) return;
void
LocationEditRow::name_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::name_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::name_changed), loc));
if (!location) return;
void
LocationEditRow::location_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::location_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::location_changed), loc));
if (!location) return;
void
LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::flags_changed), loc, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::flags_changed), loc, src));
if (!location) return;
set_wmclass(_("ardour_locations"), "Ardour");
set_name ("LocationWindow");
- delete_event.connect (bind (slot (just_hide_it), static_cast<Window*>(this)));
-
- add (location_hpacker);
+ get_vbox()->pack_start (location_hpacker);
location_vpacker.set_border_width (10);
location_vpacker.set_spacing (5);
-
location_vpacker.pack_start (loop_edit_row, false, false);
location_vpacker.pack_start (punch_edit_row, false, false);
location_rows.set_name("LocationLocRows");
- location_rows_scroller.add_with_viewport (location_rows);
+ location_rows_scroller.add (location_rows);
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);
range_rows.set_name("LocationRangeRows");
- range_rows_scroller.add_with_viewport (range_rows);
+ range_rows_scroller.add (range_rows);
range_rows_scroller.set_name ("LocationRangeRowsScroller");
range_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
range_rows_scroller.set_size_request (-1, 130);
location_hpacker.pack_start (location_vpacker, true, true);
- add_location_button.signal_clicked().connect (slot (*this, &LocationUI::add_new_location));
- add_range_button.signal_clicked().connect (slot (*this, &LocationUI::add_new_range));
+ add_location_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_location));
+ add_range_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_range));
//add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
// must do this to prevent problems when destroying
// the effective sender of this event
- Main::idle.connect (bind (slot (*this, &LocationUI::do_location_remove), loc));
+ Glib::signal_idle().connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc));
}
void
LocationUI::location_added (Location* location)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::location_added), location));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_added), location));
if (location->is_auto_punch()) {
punch_edit_row.set_location(location);
void
LocationUI::location_removed (Location* location)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::location_removed), location));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_removed), location));
if (location->is_auto_punch()) {
punch_edit_row.set_location(0);
if (location->is_mark()) {
mark_n++;
erow = manage (new LocationEditRow(session, location, mark_n));
- erow->remove_requested.connect (slot (*this, &LocationUI::location_remove_requested));
- erow->redraw_ranges.connect (slot (*this, &LocationUI::location_redraw_ranges));
- loc_children.push_back(Box_Helpers::Element(*erow, false, false, 1));
+ 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));
}
else if (location->is_auto_punch()) {
punch_edit_row.set_session (session);
}
else {
erow = manage (new LocationEditRow(session, location));
- erow->remove_requested.connect (slot (*this, &LocationUI::location_remove_requested));
- range_children.push_back(Box_Helpers::Element(*erow, false, false, 1));
+ erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
+ range_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
}
}
void
LocationUI::refresh_location_list_s (Change ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::refresh_location_list_s), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::refresh_location_list_s), ignored));
refresh_location_list ();
}
void
LocationUI::refresh_location_list ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationUI::refresh_location_list));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list));
using namespace Box_Helpers;
BoxList & loc_children = location_rows.children();
ArdourDialog::set_session (sess);
if (session) {
- session->locations()->changed.connect (slot (*this, &LocationUI::refresh_location_list));
- session->locations()->StateChanged.connect (slot (*this, &LocationUI::refresh_location_list_s));
- session->locations()->added.connect (slot (*this, &LocationUI::location_added));
- session->locations()->removed.connect (slot (*this, &LocationUI::location_removed));
- session->going_away.connect (slot (*this, &LocationUI::session_gone));
+ session->locations()->changed.connect (mem_fun(*this, &LocationUI::refresh_location_list));
+ session->locations()->StateChanged.connect (mem_fun(*this, &LocationUI::refresh_location_list_s));
+ session->locations()->added.connect (mem_fun(*this, &LocationUI::location_added));
+ session->locations()->removed.connect (mem_fun(*this, &LocationUI::location_removed));
+ session->going_away.connect (mem_fun(*this, &LocationUI::session_gone));
}
refresh_location_list ();
}
void
LocationUI::session_gone()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationUI::session_gone));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::session_gone));
hide_all();
punch_edit_row.set_session (0);
punch_edit_row.set_location (0);
-
- ArdourDialog::session_gone();
+
+ ArdourDialog::session_gone ();
}
+bool
+LocationUI::on_delete_event (GdkEventAny* ev)
+{
+ hide ();
+ return true;
+}
projects / ardour.git / blobdiff