Basic region naming test.

[ardour.git] / gtk2_ardour / option_editor.h

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index f3f2164c77cb09af3909e3c33acac8bf820665c8..5d6a48a024eecd747e86568f00882e70668cd1ab 100644 (file)
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -26,7 +26,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
 #include "gtkmm2ext/slider_controller.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 #include "ardour/types.h"
 
@@ -71,6 +71,13 @@ public:
 
        void add_widget_to_page (OptionEditorPage*, Gtk::Widget*);
        void add_widgets_to_page (OptionEditorPage*, Gtk::Widget*, Gtk::Widget*);
+
+       void set_note (std::string const &);
+
+private:
+       void maybe_add_note (OptionEditorPage *, int);
+       
+       std::string _note;
 };
 
 /** A component which provides a subheading within the dialog */
@@ -355,9 +362,11 @@ private:
        Gtk::Adjustment _db_adjustment;
        Gtkmm2ext::HSliderController* _db_slider;
        Glib::RefPtr<Gdk::Pixbuf> _pix;
+       Glib::RefPtr<Gdk::Pixbuf> _pix_desensitised;
        Gtk::Entry _db_display;
        Gtk::Label _label;
        Gtk::HBox _box;
+       Gtk::VBox _fader_centering_box;
        sigc::slot<ARDOUR::gain_t> _get;
        sigc::slot<bool, ARDOUR::gain_t> _set;
 };
@@ -387,6 +396,7 @@ public:
 
 private:
        void file_set ();
+       void current_folder_set ();
        
        sigc::slot<std::string> _get; ///< slot to get the configuration variable's value
        sigc::slot<bool, std::string> _set;  ///< slot to set the configuration variable's value
@@ -408,7 +418,7 @@ public:
 };
 
 /** The OptionEditor dialog base class */
-class OptionEditor : public ArdourDialog
+class OptionEditor : public ArdourWindow
 {
 public:
        OptionEditor (ARDOUR::Configuration *, std::string const &);