Amend last commit.

diff --git a/gtk2_ardour/ambiguous_file_dialog.cc b/gtk2_ardour/ambiguous_file_dialog.cc
index be4bdc2dc1a5505b53982a89d456d559cfde1c9c..98d0eaec3991380132c01de664f31e17c3273821 100644 (file)
--- a/gtk2_ardour/ambiguous_file_dialog.cc
+++ b/gtk2_ardour/ambiguous_file_dialog.cc
@@ -29,8 +29,10 @@ using namespace Gtk;
 AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<string>& paths)
        : 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);
        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);

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 361a29d39a87595251fb4682aaa7c99c97ca3f91..1291023f1b135e1a631b29edc7e3e3987b542318 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -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 ();
                if (!u.empty()) {
                        MissingPluginDialog d (_session, u);
-                       d.set_position (Gtk::WIN_POS_CENTER);
                        d.run ();
                }
        }
@@ -4673,11 +4672,6 @@ int
 ARDOUR_UI::missing_file (Session*s, std::string str, DataType 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.present ();
@@ -4701,15 +4695,12 @@ int
 ARDOUR_UI::ambiguous_file (std::string file, std::vector<std::string> 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.present ();
 
        dialog.run ();
+
        return dialog.get_which ();
 }
 

diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc
index 691dd29c61152c4a28d3c8e5552598dc4b6ab86d..9fe125843279424fe860926f0839f307c82b4dec 100644 (file)
--- a/gtk2_ardour/missing_file_dialog.cc
+++ b/gtk2_ardour/missing_file_dialog.cc
@@ -42,7 +42,10 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT
         , all_missing_ok (choice_group, _("Skip all missing files"), 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);
         set_default_response (RESPONSE_OK);

diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc
index fe0a597008e71f86d53df901d29ae7b817798d9f..d800946a957e828e0122cebe6cbfd28004651e4b 100644 (file)
--- a/gtk2_ardour/missing_plugin_dialog.cc
+++ b/gtk2_ardour/missing_plugin_dialog.cc
@@ -28,7 +28,10 @@ using namespace PBD;
 MissingPluginDialog::MissingPluginDialog (Session * s, list<string> const & plugins)
         : 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);
         set_default_response (RESPONSE_OK);