Tweak Mixer screenshot method, include VCA, master-bus

[ardour.git] / gtk2_ardour / color_theme_manager.cc

diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc
index 634db8e1c4b6b0997bb7560acbcbea243248595c..cfc77ffac939d22cb1ccb2314a54f17e8222f4cd 100644 (file)
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -26,9 +26,6 @@
 
 #include "pbd/gstdio_compat.h"
 
-#include "gtkmm2ext/cell_renderer_color_selector.h"
-#include "gtkmm2ext/utils.h"
-
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
 #include "pbd/replace_all.h"
@@ -36,10 +33,14 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/profile.h"
 
+#include "gtkmm2ext/cell_renderer_color_selector.h"
+#include "gtkmm2ext/utils.h"
+
 #include "canvas/container.h"
 #include "canvas/rectangle.h"
 #include "canvas/scroll_group.h"
-#include "canvas/wave_view.h"
+
+#include "waveview/wave_view.h"
 
 #include "ardour_dialog.h"
 #include "color_theme_manager.h"
@@ -53,6 +54,7 @@ using namespace std;
 using namespace Gtk;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace Gtkmm2ext;
 using namespace ARDOUR_UI_UTILS;
 
 ColorThemeManager::ColorThemeManager ()
@@ -99,8 +101,7 @@ ColorThemeManager::ColorThemeManager ()
                }
 
                Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox());
-               Gtk::Alignment* align = Gtk::manage (new Gtk::Alignment);
-               align->set (0, 0.5);
+               Gtk::Alignment* align = Gtk::manage (new Gtk::Alignment (0, 0.5, 0, 1.0));
                align->add (color_theme_dropdown);
                hbox->set_spacing (6);
                hbox->pack_start (color_theme_label, false, false);
@@ -149,7 +150,10 @@ ColorThemeManager::ColorThemeManager ()
 
        table.attach (notebook, 0, 3, n, n + 1);
        ++n;
-       table.attach (reset_button, 0, 3, n, n + 1);
+
+       Alignment* a = manage (new Alignment (0, 0.5, 0, 1.0));
+       a->add (reset_button);
+       table.attach (*a, 0, 1, n, n + 1);
 
        color_dialog.get_colorsel()->set_has_opacity_control (true);
        color_dialog.get_colorsel()->set_has_palette (true);
@@ -168,8 +172,8 @@ ColorThemeManager::ColorThemeManager ()
 
 ColorThemeManager::~ColorThemeManager ()
 {
-       if (palette_group) { 
-               palette_group->clear (true);  
+       if (palette_group) {
+               palette_group->clear (true);
                delete palette_group;
        }
 }
@@ -273,8 +277,8 @@ ColorThemeManager::palette_canvas_allocated (Gtk::Allocation& alloc, ArdourCanva
 
 struct NamedColor {
        string name;
-       ArdourCanvas::HSV    color;
-       NamedColor (string s, ArdourCanvas::HSV c) : name (s), color (c) {}
+       Gtkmm2ext::HSV    color;
+       NamedColor (string s, Gtkmm2ext::HSV c) : name (s), color (c) {}
 };
 
 struct SortByHue {
@@ -378,7 +382,7 @@ ColorThemeManager::edit_palette_color (std::string name)
        using namespace ArdourCanvas;
        double r,g, b, a;
        UIConfiguration* uic (&UIConfiguration::instance());
-       ArdourCanvas::Color c = uic->color (name);
+       Gtkmm2ext::Color c = uic->color (name);
        Gdk::Color gdkcolor;
 
        color_to_rgba (c, r, g, b, a);