Work around tooltips in treeviews selection issue #7678

[ardour.git] / gtk2_ardour / session_import_dialog.cc

diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index 58d96e934519bc57de9c1ebfe59fa225da8700b1..8c95a332075f81c464b0f487642df67ffcb7b6a7 100644 (file)
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -18,7 +18,8 @@
 
 */
 
-#include "session_import_dialog.h"
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/failed_constructor.h"
 
@@ -29,11 +30,14 @@
 #include "ardour/location_importer.h"
 #include "ardour/tempo_map_importer.h"
 
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
+#include "widgets/prompter.h"
 
 #include "gui_thread.h"
-#include "prompter.h"
-#include "i18n.h"
+#include "session_import_dialog.h"
+#include "ui_config.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -41,7 +45,7 @@ using namespace PBD;
 using namespace Gtk;
 
 SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) :
-  ArdourDialog (_("Import From Session")),
+  ArdourDialog (_("Import from Session")),
   file_browse_button (_("Browse"))
 {
        set_session (target);
@@ -73,10 +77,12 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) :
        session_browser.set_name ("SessionBrowser");
        session_browser.append_column (_("Elements"), sb_cols.name);
        session_browser.append_column_editable (_("Import"), sb_cols.queued);
-       session_browser.set_tooltip_column (3);
        session_browser.get_column(0)->set_min_width (180);
        session_browser.get_column(1)->set_min_width (40);
        session_browser.get_column(1)->set_sizing (TREE_VIEW_COLUMN_AUTOSIZE);
+       if (UIConfiguration::instance().get_use_tooltips()) {
+               session_browser.set_tooltip_column (3);
+       }
 
        session_scroll.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
        session_scroll.add (session_browser);
@@ -108,9 +114,9 @@ SessionImportDialog::load_session (const string& filename)
 {
        if (_session) {
                if (tree.read (filename)) {
-                        error << string_compose (_("Cannot load XML for session from %1"), filename) << endmsg;
-                        return;
-                }
+                       error << string_compose (_("Cannot load XML for session from %1"), filename) << endmsg;
+                       return;
+               }
                boost::shared_ptr<AudioRegionImportHandler> region_handler (new AudioRegionImportHandler (tree, *_session));
                boost::shared_ptr<AudioPlaylistImportHandler> pl_handler (new AudioPlaylistImportHandler (tree, *_session, *region_handler));
 
@@ -166,7 +172,7 @@ SessionImportDialog::browse ()
        dialog.set_filename (file_entry.get_text());
 
        FileFilter session_filter;
-       session_filter.add_pattern (string_compose(X_("*.%1"), ARDOUR::statefile_suffix));
+       session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
        session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
        dialog.add_filter (session_filter);
        dialog.set_filter (session_filter);
@@ -282,7 +288,7 @@ SessionImportDialog::end_dialog ()
 std::pair<bool, string>
 SessionImportDialog::open_rename_dialog (string text, string name)
 {
-       ArdourPrompter prompter(true);
+       ArdourWidgets::Prompter prompter(true);
        string new_name;
 
        prompter.set_name ("Prompter");