Fix thinko in dd3f922788

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 3b45eb7a70683c766b49a3b5d5357b9959d8064b..0c0deaed15e36da65e7e580f500a23c982068679 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -41,7 +41,6 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
 #include "pbd/gstdio_compat.h"
-#include "pbd/locale_guard.h"
 #include "pbd/unwind.h"
 #include "pbd/xml++.h"
 
@@ -49,6 +48,7 @@
 #include "ardour/search_paths.h"
 #include "ardour/revision.h"
 #include "ardour/utils.h"
+#include "ardour/types_convert.h"
 
 #include "gtkmm2ext/rgb_macros.h"
 #include "gtkmm2ext/gtk_ui.h"
@@ -136,24 +136,23 @@ UIConfiguration::parameter_changed (string param)
 void
 UIConfiguration::reset_gtk_theme ()
 {
-       LocaleGuard lg;
-       stringstream ss;
-
-       ss << "gtk_color_scheme = \"" << hex;
+       std::string color_scheme_string("gtk_color_scheme = \"");
 
        for (ColorAliases::iterator g = color_aliases.begin(); g != color_aliases.end(); ++g) {
 
                if (g->first.find ("gtk_") == 0) {
                        const string gtk_name = g->first.substr (4);
-                       ss << gtk_name << ":#" << std::setw (6) << setfill ('0') << (color (g->second) >> 8) << ';';
+                       ArdourCanvas::Color a_color = color (g->second);
+
+                       color_scheme_string += gtk_name + ":#" + color_to_hex_string_no_alpha (a_color) + ';';
                }
        }
 
-       ss << '"' << dec << endl;
+       color_scheme_string += '"';
 
        /* reset GTK color scheme */
 
-       Gtk::Settings::get_default()->property_gtk_color_scheme() = ss.str();
+       Gtk::Settings::get_default()->property_gtk_color_scheme() = color_scheme_string;
 }
 
 void
@@ -164,7 +163,7 @@ UIConfiguration::reset_dpi ()
        /* FT2 rendering - used by GnomeCanvas, sigh */
 
 #ifndef PLATFORM_WINDOWS
-       pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
+       pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); // XXX pango_ft2_font_map_new leaks
 #endif
 
        /* Cairo rendering, in case there is any */
@@ -242,7 +241,6 @@ UIConfiguration::load_defaults ()
                warning << string_compose (_("Could not find default UI configuration file %1"), default_ui_config_file_name) << endmsg;
        }
 
-
        if (ret == 0) {
                /* reload color theme */
                load_color_theme (false);
@@ -362,17 +360,14 @@ int
 UIConfiguration::store_color_theme ()
 {
        XMLNode* root;
-       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
        XMLNode* parent = new XMLNode (X_("Colors"));
        for (Colors::const_iterator i = colors.begin(); i != colors.end(); ++i) {
                XMLNode* node = new XMLNode (X_("Color"));
-               node->add_property (X_("name"), i->first);
-               stringstream ss;
-               ss << "0x" << setw (8) << setfill ('0') << hex << i->second;
-               node->add_property (X_("value"), ss.str());
+               node->set_property (X_("name"), i->first);
+               node->set_property (X_("value"), color_to_hex_string (i->second));
                parent->add_child_nocopy (*node);
        }
        root->add_child_nocopy (*parent);
@@ -380,8 +375,8 @@ UIConfiguration::store_color_theme ()
        parent = new XMLNode (X_("ColorAliases"));
        for (ColorAliases::const_iterator i = color_aliases.begin(); i != color_aliases.end(); ++i) {
                XMLNode* node = new XMLNode (X_("ColorAlias"));
-               node->add_property (X_("name"), i->first);
-               node->add_property (X_("alias"), i->second);
+               node->set_property (X_("name"), i->first);
+               node->set_property (X_("alias"), i->second);
                parent->add_child_nocopy (*node);
        }
        root->add_child_nocopy (*parent);
@@ -389,8 +384,8 @@ UIConfiguration::store_color_theme ()
        parent = new XMLNode (X_("Modifiers"));
        for (Modifiers::const_iterator i = modifiers.begin(); i != modifiers.end(); ++i) {
                XMLNode* node = new XMLNode (X_("Modifier"));
-               node->add_property (X_("name"), i->first);
-               node->add_property (X_("modifier"), i->second.to_string());
+               node->set_property (X_("name"), i->first);
+               node->set_property (X_("modifier"), i->second.to_string());
                parent->add_child_nocopy (*node);
        }
        root->add_child_nocopy (*parent);
@@ -411,7 +406,6 @@ UIConfiguration::store_color_theme ()
 int
 UIConfiguration::load_state ()
 {
-       LocaleGuard lg; // a single guard for all 3 configs
        bool found = false;
 
        std::string rcfile;
@@ -501,7 +495,6 @@ XMLNode&
 UIConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
@@ -519,7 +512,6 @@ XMLNode&
 UIConfiguration::get_variables (std::string which_node)
 {
        XMLNode* node;
-       LocaleGuard lg;
 
        node = new XMLNode (which_node);
 
@@ -538,7 +530,6 @@ UIConfiguration::get_variables (std::string which_node)
 int
 UIConfiguration::set_state (const XMLNode& root, int /*version*/)
 {
-       LocaleGuard lg;
        /* this can load a generic UI configuration file or a colors file */
 
        if (root.name() != "Ardour") {
@@ -636,7 +627,6 @@ UIConfiguration::load_colors (XMLNode const & node)
 void
 UIConfiguration::load_modifiers (XMLNode const & node)
 {
-       PBD::LocaleGuard lg;
        XMLNodeList const nlist = node.children();
        XMLNodeConstIterator niter;
        XMLProperty const *name;
@@ -798,3 +788,28 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own)
 
        Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
 }
+
+std::string
+UIConfiguration::color_to_hex_string (ArdourCanvas::Color c)
+{
+       char buf[16];
+       int retval = g_snprintf (buf, sizeof(buf), "%08x", c);
+
+       if (retval < 0 || retval >= (int)sizeof(buf)) {
+               assert(false);
+       }
+       return buf;
+}
+
+std::string
+UIConfiguration::color_to_hex_string_no_alpha (ArdourCanvas::Color c)
+{
+       c >>= 8; // shift/remove alpha
+       char buf[16];
+       int retval = g_snprintf (buf, sizeof(buf), "%06x", c);
+
+       if (retval < 0 || retval >= (int)sizeof(buf)) {
+               assert(false);
+       }
+       return buf;
+}