From 2fee2bc60c4f675cd2c71f5d4d7d98dbb62afcf0 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Tue, 22 Jan 2013 18:27:13 +0000 Subject: [PATCH] fix #5290 for 'Session|Recent' dialog as well as startup dialog. reinstate tooltips for collapsed rows in recent sessions too. git-svn-id: svn://localhost/ardour2/branches/3.0@13972 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 4 +++- gtk2_ardour/ardour_ui.h | 2 ++ gtk2_ardour/startup.cc | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 7a3ecdb2a4..5846fa577f 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1188,6 +1188,7 @@ ARDOUR_UI::redisplay_recent_sessions () row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_session_columns.fullpath] = fullpath; + row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath); if (state_file_names.size() > 1) { @@ -1201,11 +1202,12 @@ ARDOUR_UI::redisplay_recent_sessions () child_row[recent_session_columns.visible_name] = *i2; child_row[recent_session_columns.fullpath] = fullpath; + child_row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath); } } } - recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath + recent_session_display.set_tooltip_column(1); // recent_session_columns.tip recent_session_display.set_model (recent_session_model); } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 1ab32113b7..e2f3e70f69 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -466,9 +466,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord { RecentSessionModelColumns() { add (visible_name); + add (tip); add (fullpath); } Gtk::TreeModelColumn visible_name; + Gtk::TreeModelColumn tip; Gtk::TreeModelColumn fullpath; }; diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 213b912f03..042bd7f75a 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -958,6 +958,7 @@ ArdourStartup::redisplay_recent_sessions () row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_session_columns.fullpath] = fullpath; + row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath); ++session_snapshot_count;