Another engine dialog edge-case fix to set the samplerate

[ardour.git] / gtk2_ardour / color_theme_manager.h

diff --git a/gtk2_ardour/color_theme_manager.h b/gtk2_ardour/color_theme_manager.h
index b83b5ae52315cfad39463dac3162de593a6b53ee..9049c8b744294aa90facce19cb506a1accb37bdb 100644 (file)
--- a/gtk2_ardour/color_theme_manager.h
+++ b/gtk2_ardour/color_theme_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis
+    Copyright (C) 2000-2016 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,10 +24,7 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/colorselection.h>
-#include <gtkmm/radiobutton.h>
 #include <gtkmm/button.h>
-#include <gtkmm/scale.h>
-#include <gtkmm/rc.h>
 
 #include "canvas/types.h"
 #include "canvas/canvas.h"
@@ -42,10 +39,11 @@ namespace ArdourCanvas {
 
 class ArdourDialog;
 
-class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
+class ColorThemeManager : public OptionEditorMiniPage
 {
-  public:
+public:
        ColorThemeManager();
+       ~ColorThemeManager();
 
        void reset_canvas_colors();
        void on_color_theme_changed ();
@@ -58,20 +56,19 @@ class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
        /** Called to instruct the object to set its UI state from the configuration */
        void set_state_from_config ();
 
-       /** Called to instruct the object to add itself to an OptionEditorPage */
-       void add_to_page (OptionEditorPage *);
-
        void set_note (std::string const &);
 
+       void add_to_page (OptionEditorPage*);
+
        Gtk::Widget& tip_widget();
 
-  private:
+private:
        Gtk::Button reset_button;
        Gtk::Notebook notebook;
 
        /* handls response from color dialog when it is used to
-          edit a derived color.
-       */
+        * edit a derived color.
+        */
        void palette_color_response (int, std::string);
 
        Gtk::ScrolledWindow palette_scroller;
@@ -79,29 +76,29 @@ class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
        ArdourCanvas::Container* palette_group;
 
        /* these methods create and manage a canvas for use in either the
-          palette tab or in a separate dialog. Different behaviour is
-          accomplished by changing the event handler passed into the
-          allocation handler. We do it there because we have to rebuild
-          the canvas on allocation events, and during the rebuild, connect
-          each rectangle to the event handler.
-
-          the alternative is one event handler for the canvas and a map
-          of where each color rectangle is. nothing wrong with this
-          but the per-rect event setup is simpler and avoids building
-          and looking up the map information.
-       */
+        * palette tab or in a separate dialog. Different behaviour is
+        * accomplished by changing the event handler passed into the
+        * allocation handler. We do it there because we have to rebuild
+        * the canvas on allocation events, and during the rebuild, connect
+        * each rectangle to the event handler.
+        *
+        * the alternative is one event handler for the canvas and a map
+        * of where each color rectangle is. nothing wrong with this
+        * but the per-rect event setup is simpler and avoids building
+        * and looking up the map information.
+        */
        ArdourCanvas::Container* initialize_palette_canvas (ArdourCanvas::Canvas& canvas);
        void build_palette_canvas (ArdourCanvas::Canvas&, ArdourCanvas::Container&, sigc::slot<bool,GdkEvent*,std::string> event_handler);
        void palette_canvas_allocated (Gtk::Allocation& alloc, ArdourCanvas::Container* group, ArdourCanvas::Canvas* canvas, sigc::slot<bool,GdkEvent*,std::string> event_handler);
        void palette_size_request (Gtk::Requisition*);
 
        /* handles events from a palette canvas inside the palette (derived
-          colors) tab
-       */
+        * colors) tab
+        */
        bool palette_event (GdkEvent*, std::string name);
        /* allows user to edit a named color (e.g. "color 3") after clicking
-          on it inside the palette tab.
-       */
+        * on it inside the palette tab.
+        */
        void edit_palette_color (std::string);
 
        struct ColorAliasModelColumns : public Gtk::TreeModel::ColumnRecord {
@@ -147,6 +144,24 @@ class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
 
        void colors_changed ();
        void set_ui_to_state ();
+
+
+       struct ColorThemeModelColumns : public Gtk::TreeModel::ColumnRecord {
+               ColorThemeModelColumns() {
+                       add (name);
+                       add (path);
+               }
+
+               Gtk::TreeModelColumn<std::string>  name;
+               Gtk::TreeModelColumn<std::string>  path;
+       };
+
+       ColorThemeModelColumns color_theme_columns;
+       Glib::RefPtr<Gtk::TreeStore> theme_list;
+
+       Gtk::Label color_theme_label;
+       Gtk::ComboBox color_theme_dropdown;
+
 };
 
 #endif /* __ardour_gtk_color_manager_h__ */