smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Change Cancel button in Import Dialog to Close button

Browse source 
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
This commit is contained in:
Tim Mayberry 2015-09-03 22:32:53 +10:00
parent 846a5d9446
commit 303b27a69b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/sfdb_ui.cc
View file

@ -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;
}

2
gtk2_ardour/sfdb_ui.h
View file

@ -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;