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

Amend last commit.

Browse source
This commit is contained in:
nick_m 2015-10-23 02:14:03 +11:00
parent 410d4316b9
commit 72556cdd7a
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ambiguous_file_dialog.cc
View file

@ -29,8 +29,10 @@ using namespace Gtk;
AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<string>& paths) AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<string>& paths)
: ArdourDialog (_("Ambiguous File"), true, false) : ArdourDialog (_("Ambiguous File"), true, false)
{ {
get_vbox()->set_spacing (6); /* This dialog is always shown programatically. Center the window.*/
set_position (Gtk::WIN_POS_CENTER);
get_vbox()->set_spacing (6);
Label* l = manage (new Label); Label* l = manage (new Label);
l->set_markup (string_compose (_("%1 has found the file <i>%2</i> in the following places:\n\n"), PROGRAM_NAME, file)); l->set_markup (string_compose (_("%1 has found the file <i>%2</i> in the following places:\n\n"), PROGRAM_NAME, file));
get_vbox()->pack_start (*l); get_vbox()->pack_start (*l);

13
gtk2_ardour/ardour_ui.cc
View file

@ -3162,7 +3162,6 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
list<string> const u = new_session->unknown_processors (); list<string> const u = new_session->unknown_processors ();
if (!u.empty()) { if (!u.empty()) {
MissingPluginDialog d (_session, u); MissingPluginDialog d (_session, u);
d.set_position (Gtk::WIN_POS_CENTER);
d.run (); d.run ();
} }
} }
@ -4673,11 +4672,6 @@ int
ARDOUR_UI::missing_file (Session*s, std::string str, DataType type) ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
{ {
MissingFileDialog dialog (s, str, type); MissingFileDialog dialog (s, str, type);
/**
* This dialog may appear many times in succession, so
* we can't use ArdourDialog's default WIN_POS_MOUSE.
*/
dialog.set_position (Gtk::WIN_POS_CENTER);
dialog.show (); dialog.show ();
dialog.present (); dialog.present ();
@ -4701,15 +4695,12 @@ int
ARDOUR_UI::ambiguous_file (std::string file, std::vector<std::string> hits) ARDOUR_UI::ambiguous_file (std::string file, std::vector<std::string> hits)
{ {
AmbiguousFileDialog dialog (file, hits); AmbiguousFileDialog dialog (file, hits);
/**
* This dialog may appear many times in succession, so
* we can't use ArdourDialog's default WIN_POS_MOUSE.
*/
dialog.set_position (Gtk::WIN_POS_CENTER);
dialog.show (); dialog.show ();
dialog.present (); dialog.present ();
dialog.run (); dialog.run ();
return dialog.get_which (); return dialog.get_which ();
} }

5
gtk2_ardour/missing_file_dialog.cc
View file

@ -42,7 +42,10 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT
, all_missing_ok (choice_group, _("Skip all missing files"), false) , all_missing_ok (choice_group, _("Skip all missing files"), false)
, this_missing_ok (choice_group, _("Skip this file"), false) , this_missing_ok (choice_group, _("Skip this file"), false)
{ {
set_session (s); /* This dialog is always shown programatically. Center the window.*/
set_position (Gtk::WIN_POS_CENTER);
set_session (s);
add_button (_("Done"), RESPONSE_OK); add_button (_("Done"), RESPONSE_OK);
set_default_response (RESPONSE_OK); set_default_response (RESPONSE_OK);

5
gtk2_ardour/missing_plugin_dialog.cc
View file

@ -28,7 +28,10 @@ using namespace PBD;
MissingPluginDialog::MissingPluginDialog (Session * s, list<string> const & plugins) MissingPluginDialog::MissingPluginDialog (Session * s, list<string> const & plugins)
: ArdourDialog (_("Missing Plugins"), true, false) : ArdourDialog (_("Missing Plugins"), true, false)
{ {
set_session (s); /* This dialog is always shown programatically. Center the window.*/
set_position (Gtk::WIN_POS_CENTER);
set_session (s);
add_button (_("OK"), RESPONSE_OK); add_button (_("OK"), RESPONSE_OK);
set_default_response (RESPONSE_OK); set_default_response (RESPONSE_OK);