diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-09-03 22:32:53 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-03 22:32:53 +1000 |
| commit | 303b27a69b5befdbedf7fb6f3e57b9701de8664f (patch) | |
| tree | ad2d7d753e4babcf3200c7a6eee0433cd45c64a1 /gtk2_ardour | |
| parent | 846a5d9446b336d25a4d28a15e669822f64b701a (diff) | |
Change Cancel button in Import Dialog to Close button
This button closes the window, it doesn't actually cancel any importing that
has taken place and cancelling the import in progress is done by the Cancel
button in popup progress dialog
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/sfdb_ui.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 1ab1faa206..2874f93583 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -555,7 +555,7 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi , _status (0) , _done (false) , ok_button (Stock::OK) - , cancel_button (Stock::CANCEL) + , close_button (Stock::CLOSE) , apply_button (Stock::APPLY) , gm (0) { @@ -724,8 +724,8 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi Gtk::HButtonBox* button_box = manage (new HButtonBox); button_box->set_layout (BUTTONBOX_END); - button_box->pack_start (cancel_button, false, false); - cancel_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_CANCEL)); + button_box->pack_start (close_button, false, false); + close_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_CLOSE)); if (persistent) { button_box->pack_start (apply_button, false, false); apply_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_APPLY)); @@ -736,7 +736,7 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi Gtkmm2ext::UI::instance()->set_tip (ok_button, _("Press to import selected files and close this window")); Gtkmm2ext::UI::instance()->set_tip (apply_button, _("Press to import selected files and leave this window open")); - Gtkmm2ext::UI::instance()->set_tip (cancel_button, _("Press to close this window without importing any files")); + Gtkmm2ext::UI::instance()->set_tip (close_button, _("Press to close this window without importing any files")); vpacker.pack_end (*button_box, false, false); @@ -1955,7 +1955,7 @@ SoundFileOmega::do_something (int action) { SoundFileBrowser::do_something (action); - if (action == RESPONSE_CANCEL) { + if (action == RESPONSE_CLOSE) { hide (); return; } diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 54314e6f72..c8aaa03d0e 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -214,7 +214,7 @@ class SoundFileBrowser : public ArdourWindow Gtk::VBox vpacker; Gtk::Button ok_button; - Gtk::Button cancel_button; + Gtk::Button close_button; Gtk::Button apply_button; static std::string persistent_folder; |