scale peak-meter reset button

[ardour.git] / gtk2_ardour / theme_manager.h

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index f023076c97512c1078ce0929b7381ee441eddff6..20a73f0d4d065dde9a7fc4873e8cdb5920f26a52 100644 (file)
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -32,8 +32,6 @@
 #include "canvas/types.h"
 #include "canvas/canvas.h"
 
-#include "ardour_window.h"
-
 #include "ui_config.h"
 
 namespace ArdourCanvas {
@@ -43,7 +41,7 @@ namespace ArdourCanvas {
 
 class ArdourDialog;
 
-class ThemeManager : public ArdourWindow
+class ThemeManager : public Gtk::VBox
 {
   public:
        ThemeManager();
@@ -61,6 +59,7 @@ class ThemeManager : public ArdourWindow
         void on_waveform_gradient_depth_change ();
         void on_timeline_item_gradient_depth_change ();
        void on_all_dialogs_toggled ();
+       void on_transients_follow_front_toggled ();
        void on_icon_set_changed ();
 
   private:
@@ -92,6 +91,7 @@ class ThemeManager : public ArdourWindow
         Gtk::HScale timeline_item_gradient_depth;
         Gtk::Label timeline_item_gradient_depth_label;
        Gtk::CheckButton all_dialogs;
+       Gtk::CheckButton transients_follow_front;
        Gtk::CheckButton gradient_waveforms;
        Gtk::Label icon_set_label;
        Gtk::ComboBoxText icon_set_dropdown;
@@ -136,11 +136,13 @@ class ThemeManager : public ArdourWindow
                        add (name);
                        add (alias);
                        add (color);
+                       add (key);
                }
                
                Gtk::TreeModelColumn<std::string>  name;
                Gtk::TreeModelColumn<std::string>  alias;
                Gtk::TreeModelColumn<Gdk::Color>   color;
+               Gtk::TreeModelColumn<std::string>  key;
        };
 
        ColorAliasModelColumns       alias_columns;
@@ -161,7 +163,14 @@ class ThemeManager : public ArdourWindow
        void setup_aliases ();
        void setup_palette ();
 
+       Gtk::ScrolledWindow modifier_scroller;
+       Gtk::VBox modifier_vbox;
+       
+       void setup_modifiers ();
+       void modifier_edited (Gtk::Range*, std::string);
+       
        void colors_changed ();
+       void set_ui_to_state ();
 };
 
 #endif /* __ardour_gtk_color_manager_h__ */