clean up patch change/sysex headers.

[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 e038493c96ce57216317a8625d237293fd1dcd95..013a0764d0360748dec3c9aca1d5aeb125e24d0d 100644 (file)
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -61,17 +61,15 @@ ColorThemeManager::ColorThemeManager ()
        , palette_window (0)
        , color_theme_label (_("Color Theme"))
 {
-       set_spacing (12);
-
        std::map<string,string> color_themes;
 
        get_color_themes (color_themes);
+       int n = 0;
 
        if (color_themes.size() > 1) {
                theme_list = TreeStore::create (color_theme_columns);
 
                TreeModel::iterator selected_iter = theme_list->children().end();
-               const bool running_from_source = running_from_source_tree();
 
                for (std::map<string,string>::iterator c = color_themes.begin(); c != color_themes.end(); ++c) {
                        TreeModel::Row row;
@@ -81,13 +79,6 @@ ColorThemeManager::ColorThemeManager ()
 
                        string color_file_name = c->second;
 
-                       if (running_from_source) {
-                               /* color themes from within the source tree are
-                                  suffixed by "-PROGRAM-NAME" (lowercased)
-                               */
-                               replace_all (color_file_name, string_compose ("-%1", downcase (PROGRAM_NAME)), "");
-                       }
-
                        row[color_theme_columns.path] = color_file_name;
 
                        /* match second (path; really basename) since that is
@@ -113,8 +104,9 @@ ColorThemeManager::ColorThemeManager ()
                hbox->set_spacing (6);
                hbox->pack_start (color_theme_label, false, false);
                hbox->pack_start (*align, true, true);
-               pack_start (*hbox, PACK_SHRINK);
                hbox->show_all ();
+               table.attach (*hbox, 0, 3, n, n + 1);
+               ++n;
        }
 
        reset_button.signal_clicked().connect (sigc::mem_fun (*this, &ColorThemeManager::reset_canvas_colors));
@@ -154,8 +146,9 @@ ColorThemeManager::ColorThemeManager ()
 
        notebook.set_size_request (400, 400);
 
-       pack_start (notebook, true, true);
-       pack_start (reset_button, false, false);
+       table.attach (notebook, 0, 3, n, n + 1);
+       ++n;
+       table.attach (reset_button, 0, 3, n, n + 1);
 
        color_dialog.get_colorsel()->set_has_opacity_control (true);
        color_dialog.get_colorsel()->set_has_palette (true);
@@ -169,10 +162,18 @@ ColorThemeManager::ColorThemeManager ()
        setup_modifiers ();
 
        UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ColorThemeManager::colors_changed));
+}
+
 
-       show_all ();
+ColorThemeManager::~ColorThemeManager ()
+{
+       if (palette_group) { 
+               palette_group->clear (true);  
+               delete palette_group;
+       }
 }
 
+
 void
 ColorThemeManager::setup_modifiers ()
 {
@@ -233,7 +234,7 @@ ColorThemeManager::reset_canvas_colors()
 
        /* look for a versioned user-owned color file, and try to rename it */
 
-       basename = UIConfiguration::instance().color_file_name (true, false, true);
+       basename = UIConfiguration::instance().color_file_name (true, true);
 
        if (find_file (ardour_config_search_path(), basename, cfile)) {
                string backup = cfile + string (X_(".old"));
@@ -319,7 +320,6 @@ ColorThemeManager::build_palette_canvas (ArdourCanvas::Canvas& canvas, ArdourCan
        for (uint32_t y = 0; y < height - box_size && color_num < color_limit; y += box_size) {
                for (uint32_t x = 0; x < width - box_size && color_num < color_limit; x += box_size) {
                        ArdourCanvas::Rectangle* r = new ArdourCanvas::Rectangle (&group, ArdourCanvas::Rect (x, y, x + box_size, y + box_size));
-
                        string name = nc[color_num++].name;
 
                        UIConfiguration::Colors::iterator c = colors.find (name);
@@ -603,9 +603,16 @@ ColorThemeManager::set_state_from_config ()
 }
 
 void
-ColorThemeManager::add_to_page (OptionEditorPage* page)
+ColorThemeManager::add_to_page (OptionEditorPage* p)
 {
-       add_widget_to_page (page, this);
+       int const n = p->table.property_n_rows();
+       int m = n + 1;
+       if (!_note.empty ()) {
+               ++m;
+       }
+       p->table.resize (m, 3);
+       p->table.attach (box, 1, 3, n, n + 1, FILL | EXPAND, SHRINK, 0, 0);
+       maybe_add_note (p, n + 1);
 }
 
 Gtk::Widget&