diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-12-12 20:54:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-12-12 20:54:55 +0000 |
| commit | 3733c995c5269756ca5941a9db50c6a965787508 (patch) | |
| tree | e2152d49f8bd6daadf616d7b68aed2c8350d105a /gtk2_ardour/editor_markers.cc | |
| parent | 088a5289dc41b9066e9f518b94af546f80601d56 (diff) | |
editor window layout changes, and lots more
git-svn-id: svn://localhost/trunk/ardour2@187 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 47982ff728..466aa09acd 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -730,8 +730,6 @@ Editor::marker_menu_rename () Dialog dialog; Entry entry; - Button ok_button (_("OK")); - Button cancel_button (_("Cancel")); if (loc->is_mark()) { dialog.set_title (_("ardour: rename mark")); @@ -744,35 +742,24 @@ Editor::marker_menu_rename () dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_modal (true); - dialog.get_vbox()->set_border_width (10); - dialog.get_vbox()->pack_start (entry); - dialog.get_action_area()->pack_start (ok_button); - dialog.get_action_area()->pack_start (cancel_button); + dialog.add_action_widget (entry, RESPONSE_ACCEPT); + dialog.add_button (Stock::OK, RESPONSE_ACCEPT); + dialog.add_button (Stock::CANCEL, RESPONSE_ACCEPT); entry.set_text (loc->name()); entry.set_name ("MarkerNameDisplay"); - ok_button.set_name ("EditorGTKButton"); - cancel_button.set_name ("EditorGTKButton"); - - entry.signal_activate().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1)); - cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1)); - ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1)); - dialog.signal_delete_event().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1)); dialog.show_all (); entry.grab_focus (); - run_sub_event_loop (); - - if (sub_event_loop_status == 1) { - - Location* l; - bool is_start; - - if ((l = find_location_from_marker (marker, is_start)) != 0) { - l->set_name (entry.get_text()); - } + switch (dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; } + + loc->set_name (entry.get_text()); } gint |