make GTKOSX button2 emulation actually work when clicking on redirect names

[ardour.git] / gtk2_ardour / new_session_dialog.cc

diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 608fd5e646bc693a384084a0ae4bb6feebd69f6c..c02d9b18f6a6e7a8c54ecd1333f99a534531a51f 100644 (file)
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -17,9 +17,6 @@
 
 */
 
-#include "i18n.h"
-#include "new_session_dialog.h"
-
 #include <pbd/error.h>
 
 #include <ardour/recent_sessions.h>
@@ -43,6 +40,8 @@ using namespace PBD;
 
 #include "opts.h"
 #include "utils.h"
+#include "i18n.h"
+#include "new_session_dialog.h"
 
 NewSessionDialog::NewSessionDialog()
        : ArdourDialog ("session control")
@@ -83,17 +82,17 @@ NewSessionDialog::NewSessionDialog()
        m_template = new Gtk::FileChooserButton();
        m_create_control_bus = new Gtk::CheckButton(_("Create Monitor Bus"));
        
-       Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+       Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10));
        m_control_bus_channel_count = new Gtk::SpinButton(*m_control_bus_channel_count_adj, 1, 0);
        
-       Gtk::Adjustment *m_master_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+       Gtk::Adjustment *m_master_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10));
        m_master_bus_channel_count = new Gtk::SpinButton(*m_master_bus_channel_count_adj, 1, 0);
        m_create_master_bus = new Gtk::CheckButton(_("Create Master Bus"));
        advanced_table = new Gtk::Table(2, 2, true);
        m_connect_inputs = new Gtk::CheckButton(_("Automatically Connect to Physical Inputs"));
        m_limit_input_ports = new Gtk::CheckButton(_("Use only"));
        
-       Gtk::Adjustment *m_input_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+       Gtk::Adjustment *m_input_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10));
        m_input_limit_count = new Gtk::SpinButton(*m_input_limit_count_adj, 1, 0);
        input_port_limit_hbox = new Gtk::HBox(false, 0);
        input_port_vbox = new Gtk::VBox(false, 0);
@@ -106,7 +105,7 @@ NewSessionDialog::NewSessionDialog()
        m_connect_outputs = new Gtk::CheckButton(_("Automatically Connect Outputs"));
        m_limit_output_ports = new Gtk::CheckButton(_("Use only"));
        
-       Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+       Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10));
        m_output_limit_count = new Gtk::SpinButton(*m_output_limit_count_adj, 1, 0);
        output_port_limit_hbox = new Gtk::HBox(false, 0);
        output_port_vbox = new Gtk::VBox(false, 0);
@@ -438,6 +437,8 @@ NewSessionDialog::NewSessionDialog()
        m_notebook->show();
        m_notebook->show_all_children();
 
+       engine_page_session_folder = X_("");
+       engine_page_session_name = X_("");
 
        set_default_response (Gtk::RESPONSE_OK);
        if (!ARDOUR_COMMAND_LINE::session_name.length()) {
@@ -478,7 +479,9 @@ NewSessionDialog::run ()
                /* nothing to display */
                return Gtk::RESPONSE_OK;
        }
-
+       if (!(page_set & NewPage) && !(page_set & OpenPage)) {
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
+       }
        return ArdourDialog::run ();
 }
 
@@ -532,13 +535,13 @@ void
 NewSessionDialog::set_session_name (const Glib::ustring& name)
 {
        m_name->set_text (name);
+       engine_page_session_name = name;
 }
 
 void
 NewSessionDialog::set_session_folder(const Glib::ustring& dir)
 {
        Glib::ustring realdir = dir;
-       char* res;
 
        /* this little tangled mess is a result of 4 things:
 
@@ -558,15 +561,17 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
 
        char buf[PATH_MAX];
 
-       if((res = realpath (dir.c_str(), buf)) != 0) {
+       if(realpath (dir.c_str(), buf) != 0) {
                if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
                        realdir = Glib::path_get_dirname (realdir);
                }
                m_folder->set_current_folder (realdir);
+               engine_page_session_folder = realdir;
        }
 
        
 #else 
+       char* res;
        if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
                realdir = Glib::path_get_dirname (realdir);
                cerr << "didn't exist, use " << realdir << endl;
@@ -604,6 +609,9 @@ NewSessionDialog::session_name() const
        case NewPage:
        case EnginePage:
                /* new or audio setup pages */
+               if (!(page_set & OpenPage) && !(page_set & NewPage)) {
+                       return Glib::filename_from_utf8(engine_page_session_name);
+               }
                return Glib::filename_from_utf8(m_name->get_text());
        default:
                break;
@@ -624,8 +632,12 @@ NewSessionDialog::session_folder() const
                return Glib::filename_from_utf8(m_folder->get_filename());
                
        case EnginePage:
+               if (!(page_set & OpenPage) && !(page_set & NewPage)) {
+                       /* just engine page, nothing else */
+                       return Glib::filename_from_utf8(engine_page_session_folder);
+               }
                if (page_set == EnginePage) {
-                       /* just engine page, nothing else : use m_folder since it should be set */
+                       /* use m_folder since it should be set */
                        return Glib::filename_from_utf8(m_folder->get_filename());
                }
                break;
@@ -748,7 +760,7 @@ NewSessionDialog::which_page () const
        } else if (page_set == EnginePage) {
                return EnginePage;
 
-       } else if (page_set == NewPage|OpenPage) {
+       } else if (page_set == (NewPage|OpenPage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -756,7 +768,7 @@ NewSessionDialog::which_page () const
                        return OpenPage;
                }
 
-       } else if (page_set == NewPage|EnginePage) {
+       } else if (page_set == (NewPage|EnginePage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -764,7 +776,7 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
 
-       } else if (page_set == NewPage|EnginePage|OpenPage) {
+       } else if (page_set == (NewPage|EnginePage|OpenPage)) {
                switch (num) {
                case 0:
                        return NewPage;
@@ -774,7 +786,7 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
 
-       } else if (page_set == OpenPage|EnginePage) {
+       } else if (page_set == (OpenPage|EnginePage)) {
                switch (num) {
                case 0:
                        return OpenPage;
@@ -782,6 +794,8 @@ NewSessionDialog::which_page () const
                        return EnginePage;
                }
        }
+
+       return NewPage; /* shouldn't get here */
 }
 
 void