change wording of autosave option to be more clear

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 137d6b98c8a5bf8117656476d800f79351333257..59e10f058bedd4b6aad2546afa77f82fb6c5ab5a 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -22,11 +22,14 @@
 #include <gtkmm/alignment.h>
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/configuration.h"
-#include "ardour/rc_configuration.h"
-#include "ardour/utils.h"
 #include "ardour/dB.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
+#include "ardour/utils.h"
+
+#include "pbd/configuration.h"
+#include "pbd/replace_all.h"
 
 #include "public_editor.h"
 #include "option_editor.h"
@@ -137,7 +140,9 @@ BoolOption::set_state_from_config ()
 void
 BoolOption::toggled ()
 {
-       _set (_button->get_active ());
+       if (!_set (_button->get_active ())) {
+               _button->set_active (_get ());
+       }
 }
 
 RouteDisplayBoolOption::RouteDisplayBoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s)
@@ -377,7 +382,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param o Configuration to edit.
  *  @param t Title for the dialog.
  */
-OptionEditor::OptionEditor (Configuration* c, std::string const & t)
+OptionEditor::OptionEditor (PBD::Configuration* c, std::string const & t)
        : ArdourWindow (t), _config (c)
 {
        using namespace Notebook_Helpers;
@@ -445,6 +450,21 @@ OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o)
        o->set_state_from_config ();
 }
 
+/** Add a new page 
+ *  @param pn Page name (will be created if it doesn't already exist)
+ *  @param w widget that fills the page
+ */
+void
+OptionEditor::add_page (std::string const & pn, Gtk::Widget& w)
+{
+       if (_pages.find (pn) == _pages.end()) {
+               _pages[pn] = new OptionEditorPage (_notebook, pn);
+       }
+
+       OptionEditorPage* p = _pages[pn];
+       p->box.pack_start (w, true, true);
+}
+
 void
 OptionEditor::set_current_page (string const & p)
 {
@@ -466,15 +486,14 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
        , _set (s)
 {
        _file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
-       _file_chooser.signal_file_set().connect (sigc::mem_fun (*this, &DirectoryOption::file_set));
-       _file_chooser.signal_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set));
+       _file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed));
 }
 
 
 void
 DirectoryOption::set_state_from_config ()
 {
-       _file_chooser.set_current_folder (_get ());
+       _file_chooser.set_current_folder (poor_mans_glob(_get ()));
 }
 
 void
@@ -487,13 +506,7 @@ DirectoryOption::add_to_page (OptionEditorPage* p)
 }
 
 void
-DirectoryOption::file_set ()
-{
-       _set (_file_chooser.get_filename ());
-}
-
-void
-DirectoryOption::current_folder_set ()
+DirectoryOption::selection_changed ()
 {
-       _set (_file_chooser.get_current_folder ());
+       _set (poor_mans_glob(_file_chooser.get_filename ()));
 }