enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / session_dialog.cc

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index a036a3651c4bfdf6078831f9e7a5768191ccf3b1..225b02df84ba3d42eab0748bacff1f232778db26 100644 (file)
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -24,13 +24,14 @@
 #include <algorithm>
 
 #include <glib.h>
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm.h>
 #include <glibmm/datetime.h>
 
 #include <gtkmm/filechooser.h>
 
+#include "pbd/basename.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
 #include "pbd/replace_all.h"
@@ -39,6 +40,8 @@
 #include "pbd/stl_delete.h"
 #include "pbd/openuri.h"
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/audioengine.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
@@ -51,7 +54,7 @@
 #include "session_dialog.h"
 #include "opts.h"
 #include "engine_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
@@ -133,6 +136,8 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
 
                        if (cnt > 4) {
                                recent_scroller.set_size_request (-1, 300);
+                       } else {
+                               recent_scroller.set_size_request (-1, 80);
                        }
                } else {
                        recent_scroller.hide();
@@ -175,12 +180,16 @@ SessionDialog::SessionDialog ()
 
        get_vbox()->pack_start (recent_scroller, true, true);
        get_vbox()->show_all ();
+
        recent_scroller.show();
 
        int cnt = redisplay_recent_sessions ();
        if (cnt > 4) {
                recent_scroller.set_size_request (-1, 300);
+       } else {
+               recent_scroller.set_size_request (-1, 80);
        }
+
 }
 
 
@@ -242,6 +251,10 @@ SessionDialog::session_name (bool& should_be_new)
 
        if (iter) {
                should_be_new = false;
+               string s = (*iter)[recent_session_columns.fullpath];
+               if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
+                       return PBD::basename_nosuffix (s);
+               }
                return (*iter)[recent_session_columns.visible_name];
        }
 
@@ -335,7 +348,10 @@ SessionDialog::setup_initial_choice_box ()
 
        string image_path;
 
-       if (find_file (ardour_data_search_path(), "small-splash.png", image_path)) {
+       Searchpath rc (ARDOUR::ardour_data_search_path());
+       rc.add_subdirectory_to_paths ("resources");
+
+       if (find_file (rc, PROGRAM_NAME "-small-splash.png", image_path)) {
                Gtk::Image* image;
                if ((image = manage (new Gtk::Image (image_path))) != 0) {
                        hbox->pack_start (*image, false, false);
@@ -395,9 +411,7 @@ SessionDialog::setup_initial_choice_box ()
        existing_session_chooser.add_filter (session_filter);
        existing_session_chooser.set_filter (session_filter);
 
-#ifdef GTKOSX
-       existing_session_chooser.add_shortcut_folder ("/Volumes");
-#endif
+       Gtkmm2ext::add_volume_shortcuts (existing_session_chooser);
 
        Label* browse_label = manage (new Label);
        browse_label->set_markup (string_compose ("<span weight=\"bold\" size=\"large\">%1</span>", _("Other Sessions")));
@@ -405,6 +419,17 @@ SessionDialog::setup_initial_choice_box ()
        centering_vbox->pack_start (*browse_label, false, false, 12);
        centering_vbox->pack_start (existing_session_chooser, false, false);
 
+       /* --disable plugins UI */
+
+       _disable_plugins.set_label (_("Safe Mode: Disable all Plugins"));
+       _disable_plugins.set_flags (Gtk::CAN_FOCUS);
+       _disable_plugins.set_relief (Gtk::RELIEF_NORMAL);
+       _disable_plugins.set_mode (true);
+       _disable_plugins.set_active (ARDOUR::Session::get_disable_all_loaded_plugins());
+       _disable_plugins.set_border_width(0);
+       _disable_plugins.signal_clicked().connect (sigc::mem_fun (*this, &SessionDialog::disable_plugins_clicked));
+       centering_vbox->pack_start (_disable_plugins, false, false);
+
        /* pack it all up */
 
        centering_hbox->pack_start (*centering_vbox, true, true);
@@ -538,9 +563,7 @@ SessionDialog::setup_new_session_page ()
        new_folder_chooser.show ();
        new_folder_chooser.set_title (_("Select folder for session"));
 
-#ifdef __APPLE__
-       new_folder_chooser.add_shortcut_folder ("/Volumes");
-#endif
+       Gtkmm2ext::add_volume_shortcuts (new_folder_chooser);
 
        vbox1->pack_start (*hbox2, false, false);
 
@@ -692,28 +715,41 @@ SessionDialog::redisplay_recent_sessions ()
 
                float sr;
                SampleFormat sf;
-               std::string state_file_basename = state_file_names.front();
+
+               std::string state_file_basename;
+
+               if (state_file_names.size() > 1) {
+                       state_file_basename = Session::get_snapshot_from_instant (dirname);
+                       std::string s = Glib::build_filename (dirname, state_file_basename + statefile_suffix);
+                       if (!Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
+                               state_file_basename = "";
+                       }
+               }
+
+               if (state_file_basename.empty()) {
+                       state_file_basename = state_file_names.front();
+               }
 
                std::string s = Glib::build_filename (dirname, state_file_basename + statefile_suffix);
 
                GStatBuf gsb;
                g_stat (s.c_str(), &gsb);
 
-               row[recent_session_columns.fullpath] = dirname; /* just the dir, but this works too */
-               row[recent_session_columns.tip] = Glib::Markup::escape_text (dirname);
+               row[recent_session_columns.fullpath] = s;
+               row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname);
                row[recent_session_columns.time_modified] = gsb.st_mtime;
 
                if (Session::get_info_from_path (s, sr, sf) == 0) {
                        row[recent_session_columns.sample_rate] = rate_as_string (sr);
                        switch (sf) {
                        case FormatFloat:
-                               row[recent_session_columns.disk_format] = _("32 bit float");
+                               row[recent_session_columns.disk_format] = _("32-bit float");
                                break;
                        case FormatInt24:
-                               row[recent_session_columns.disk_format] = _("24 bit");
+                               row[recent_session_columns.disk_format] = _("24-bit");
                                break;
                        case FormatInt16:
-                               row[recent_session_columns.disk_format] = _("16 bit");
+                               row[recent_session_columns.disk_format] = _("16-bit");
                                break;
                        }
                } else {
@@ -739,7 +775,7 @@ SessionDialog::redisplay_recent_sessions ()
 
                                child_row[recent_session_columns.visible_name] = *i2;
                                child_row[recent_session_columns.fullpath] = s;
-                               child_row[recent_session_columns.tip] = Glib::Markup::escape_text (dirname);
+                               child_row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname);
                                g_stat (s.c_str(), &gsb);
                                child_row[recent_session_columns.time_modified] = gsb.st_mtime;
 
@@ -754,13 +790,13 @@ SessionDialog::redisplay_recent_sessions ()
                                        child_row[recent_session_columns.sample_rate] = rate_as_string (sr);
                                        switch (sf) {
                                        case FormatFloat:
-                                               child_row[recent_session_columns.disk_format] = _("32 bit float");
+                                               child_row[recent_session_columns.disk_format] = _("32-bit float");
                                                break;
                                        case FormatInt24:
-                                               child_row[recent_session_columns.disk_format] = _("24 bit");
+                                               child_row[recent_session_columns.disk_format] = _("24-bit");
                                                break;
                                        case FormatInt16:
-                                               child_row[recent_session_columns.disk_format] = _("16 bit");
+                                               child_row[recent_session_columns.disk_format] = _("16-bit");
                                                break;
                                        }
                                } else {
@@ -1130,6 +1166,12 @@ SessionDialog::recent_row_activated (const Gtk::TreePath&, Gtk::TreeViewColumn*)
        response (RESPONSE_ACCEPT);
 }
 
+void
+SessionDialog::disable_plugins_clicked ()
+{
+       ARDOUR::Session::set_disable_all_loaded_plugins (_disable_plugins.get_active());
+}
+
 void
 SessionDialog::existing_session_selected ()
 {