X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=c001e5c5b1838d0008e9ea2452d9d51e8d791162;hb=c292cd95ac7d8dbdf34b7f84e6a24f4c312f8710;hp=8e6c03a9802180b01092a86d70694f5b637f41b8;hpb=c99bf353a5cf460f06f78cc542d28624d01233bc;p=ardour.git

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 8e6c03a980..c001e5c5b1 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -32,8 +32,8 @@
 #include <pango/pangoft2.h> // for fontmap resolution control for GnomeCanvas
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
-#include <glib/gstdio.h>
 
 #include <gtkmm/settings.h>
 
@@ -62,13 +62,15 @@ using namespace ArdourCanvas;
 
 static const char* ui_config_file_name = "ui_config";
 static const char* default_ui_config_file_name = "default_ui_config";
-UIConfiguration* UIConfiguration::_instance = 0;
 
 static const double hue_width = 18.0;
 
-sigc::signal<void>  UIConfiguration::ColorsChanged;
-
-sigc::signal<void>  UIConfiguration::DPIReset;
+UIConfiguration&
+UIConfiguration::instance ()
+{
+	static UIConfiguration s_instance;
+	return s_instance;
+}
 
 UIConfiguration::UIConfiguration ()
 	:
@@ -86,8 +88,6 @@ UIConfiguration::UIConfiguration ()
 	modifiers_modified (false),
 	block_save (0)
 {
-	_instance = this;
-
 	load_state();
 
 	ColorsChanged.connect (boost::bind (&UIConfiguration::colors_changed, this));
@@ -120,7 +120,7 @@ void
 UIConfiguration::parameter_changed (string param)
 {
 	_dirty = true;
-	
+
 	if (param == "ui-rc-file") {
 		load_rc_file (true);
 	} else if (param == "color-file") {
@@ -136,9 +136,9 @@ UIConfiguration::reset_gtk_theme ()
 	stringstream ss;
 
 	ss << "gtk_color_scheme = \"" << hex;
-	
+
 	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) << ';';
@@ -180,6 +180,12 @@ UIConfiguration::set_pango_fontsize ()
 	pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024);
 }
 
+float
+UIConfiguration::get_ui_scale ()
+{
+	return get_font_scale () / 102400.;
+}
+
 void
 UIConfiguration::map_parameters (boost::function<void (std::string)>& functor)
 {
@@ -217,7 +223,7 @@ UIConfiguration::load_defaults ()
 {
         std::string rcfile;
 	int ret = -1;
-	
+
 	if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) {
 		XMLTree tree;
 
@@ -268,7 +274,7 @@ UIConfiguration::load_color_theme (bool allow_own)
 	if (!found) {
 		basename = color_file.get();
 		basename += ".colors";
-	
+
 		if (find_file (ardour_config_search_path(), basename, cfile)) {
 			found = true;
 		}
@@ -277,7 +283,7 @@ UIConfiguration::load_color_theme (bool allow_own)
 	if (found) {
 
 		XMLTree tree;
-		
+
 		info << string_compose (_("Loading color file %1"), cfile) << endmsg;
 
 		if (!tree.read (cfile.c_str())) {
@@ -316,7 +322,7 @@ UIConfiguration::store_color_theme ()
 		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"));
@@ -337,7 +343,7 @@ UIConfiguration::store_color_theme ()
 
 	XMLTree tree;
 	std::string colorfile = Glib::build_filename (user_config_directory(), (string ("my-") + color_file.get() + ".colors"));
-	
+
 	tree.set_root (root);
 
 	if (!tree.write (colorfile.c_str())){
@@ -404,7 +410,7 @@ UIConfiguration::save_state()
 
 	if (_dirty) {
 		std::string rcfile = Glib::build_filename (user_config_directory(), ui_config_file_name);
-		
+
 		XMLTree tree;
 
 		tree.set_root (&get_state());
@@ -428,7 +434,7 @@ UIConfiguration::save_state()
 		colors_modified = false;
 		modifiers_modified = false;
 	}
-	
+
 
 	return 0;
 }
@@ -524,7 +530,7 @@ UIConfiguration::load_color_aliases (XMLNode const & node)
 	XMLNodeConstIterator niter;
 	XMLProperty const *name;
 	XMLProperty const *alias;
-	
+
 	color_aliases.clear ();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
@@ -547,7 +553,7 @@ UIConfiguration::load_colors (XMLNode const & node)
 	XMLNodeConstIterator niter;
 	XMLProperty const *name;
 	XMLProperty const *color;
-	
+
 	colors.clear ();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
@@ -573,9 +579,9 @@ UIConfiguration::load_modifiers (XMLNode const & node)
 	XMLNodeConstIterator niter;
 	XMLProperty const *name;
 	XMLProperty const *mod;
-	
+
 	modifiers.clear ();
-	
+
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 		if ((*niter)->name() != X_("Modifier")) {
 			continue;
@@ -633,7 +639,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const
 	if (failed) {
 		*failed = false;
 	}
-	
+
 	if (e != color_aliases.end ()) {
 		Colors::const_iterator rc = colors.find (e->second);
 		if (rc != colors.end()) {
@@ -646,7 +652,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const
 			return rc->second;
 		}
 	}
-	
+
 	if (!failed) {
 		/* only show this message if the caller wasn't interested in
 		   the fail status.
@@ -657,7 +663,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const
 	if (failed) {
 		*failed = true;
 	}
-	
+
 	return rgba_to_color ((g_random_int()%256)/255.0,
 			      (g_random_int()%256)/255.0,
 			      (g_random_int()%256)/255.0,