#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"
#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"
using namespace std;
using namespace PBD;
using namespace ARDOUR;
-using namespace ArdourCanvas;
+using namespace Gtkmm2ext;
static const char* ui_config_file_name = "ui_config";
static const char* default_ui_config_file_name = "default_ui_config";
UIConfiguration::instance ()
{
static UIConfiguration s_instance;
+ _instance = &s_instance;
return s_instance;
}
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) << ';';
+ Gtkmm2ext::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
/* 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 */
int
UIConfiguration::load_defaults ()
{
- std::string rcfile;
+ std::string rcfile;
int ret = -1;
if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) {
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);
basename += color_name;
basename += "-";
- basename += downcase(PROGRAM_NAME);
+ basename += downcase(std::string(PROGRAM_NAME));
std::string rev (revision);
std::size_t pos = rev.find_first_of("-");
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);
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);
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);
int
UIConfiguration::load_state ()
{
- LocaleGuard lg; // a single guard for all 3 configs
bool found = false;
std::string rcfile;
UIConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg;
root = new XMLNode("Ardour");
UIConfiguration::get_variables (std::string which_node)
{
XMLNode* node;
- LocaleGuard lg;
node = new XMLNode (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") {
color = child->property (X_("value"));
if (name && color) {
- ArdourCanvas::Color c;
+ Gtkmm2ext::Color c;
c = strtoul (color->value().c_str(), 0, 16);
/* insert or replace color name definition */
colors[name->value()] = c;
void
UIConfiguration::load_modifiers (XMLNode const & node)
{
- PBD::LocaleGuard lg;
XMLNodeList const nlist = node.children();
XMLNodeConstIterator niter;
XMLProperty const *name;
#undef CANVAS_FONT_VARIABLE
}
-ArdourCanvas::SVAModifier
+Gtkmm2ext::SVAModifier
UIConfiguration::modifier (string const & name) const
{
Modifiers::const_iterator m = modifiers.find (name);
return SVAModifier ();
}
-ArdourCanvas::Color
+Gtkmm2ext::Color
UIConfiguration::color_mod (std::string const & colorname, std::string const & modifiername) const
{
return HSV (color (colorname)).mod (modifier (modifiername)).color ();
}
-ArdourCanvas::Color
-UIConfiguration::color_mod (const ArdourCanvas::Color& color, std::string const & modifiername) const
+Gtkmm2ext::Color
+UIConfiguration::color_mod (const Gtkmm2ext::Color& color, std::string const & modifiername) const
{
return HSV (color).mod (modifier (modifiername)).color ();
}
-ArdourCanvas::Color
+Gtkmm2ext::Color
UIConfiguration::color (const std::string& name, bool* failed) const
{
ColorAliases::const_iterator e = color_aliases.find (name);
}
void
-UIConfiguration::set_color (string const& name, ArdourCanvas::Color color)
+UIConfiguration::set_color (string const& name, Gtkmm2ext::Color color)
{
Colors::iterator i = colors.find (name);
if (i == colors.end()) {
return;
}
- info << "Loading ui configuration file " << rc_file_path << endmsg;
+ info << string_compose (_("Loading ui configuration file %1"), rc_file_path) << endmsg;
Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
}
+
+std::string
+UIConfiguration::color_to_hex_string (Gtkmm2ext::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 (Gtkmm2ext::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;
+}
projects / ardour.git / blobdiff