Merge lp:~3v1n0/unity/scale-factor-binding into lp:unity

[Marco Trevisan (Treviño)]

UnitySettings: apply the unity scaling factor to global system settings

We basically use the integer part of our scaling factor as the Gdk scaling factor,
while we apply the point scaling to the Gdk text-scaling-factor.
In this way the readable items will match our scaling.

Applying the scaling factors system-wide. To make this possible we needed to introduce some our "custom" settings to make all things to scale correctly both in unity and outside:

Inside com.canonical.Unity.Interface:
 - text-scale-factor: defines the extra text-scaling factor that can be used
   (for a11y reasons, for example). This is what is controlled by UCC.
 - cursor-scale-factor: custom scaling factor for the mouse cursor (to override
   auto computation, based on UI scaling)
 - app-scale-factor-monitor: the name of the monitor that should be used as
   "reference" for global scaling.
 - app-fallback-to-maximum-scale-factor: toggle the fallback to use the maximum
   scale value if the "reference" monitor is not available

The reason for having our own text-scaling factor is that we use the Gdk global value for scaling up applications, and thus we need to have our value for both scaling the text in unity and to know if the user has overridden it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3742
http://jenkins.qa.ubuntu.com/job/unity-ci/818/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/350/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/352/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/818/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3743
http://jenkins.qa.ubuntu.com/job/unity-ci/819/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/351/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/353/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/819/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3744
http://jenkins.qa.ubuntu.com/job/unity-ci/820/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/356/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/352/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/354/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/820/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/821/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/357/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/353/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/355/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/821/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3750
http://jenkins.qa.ubuntu.com/job/unity-ci/822/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/356/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/822/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3751
http://jenkins.qa.ubuntu.com/job/unity-ci/823/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/359/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/357/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/823/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3752
http://jenkins.qa.ubuntu.com/job/unity-ci/824/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/360/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/358/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/824/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3753
http://jenkins.qa.ubuntu.com/job/unity-ci/825/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/359/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/825/rebuild

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

+1! Very good job, it works well for me :)

review: Approve

[Brandon Schaefer (brandontschaefer)]

Looks good to me.

review: Approve

[Brandon Schaefer (brandontschaefer)]

Wait, we need to default false on scaling toolkit text...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3754
http://jenkins.qa.ubuntu.com/job/unity-ci/826/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/362
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/360/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/826/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nevermind, I guess it is correct

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/unity-ci/827/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/361

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/827/rebuild

review: Approve (continuous-integration)

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2014-02-18 18:01:22 +0000
+++ com.canonical.Unity.gschema.xml	2014-03-21 23:09:12 +0000
@@ -54,6 +54,36 @@
         unity top panel</description>
     </key>
   </schema>
+  <schema path="/com/canonical/unity/interface/" id="com.canonical.Unity.Interface" gettext-domain="unity">
+    <key type="d" name="text-scale-factor">
+      <default>1.0</default>
+      <range min="0.5" max="3.0"/>
+      <summary>Font scaling for unity and applications.</summary>
+      <description>This value defines the global font scaling used by both
+        unity and applications. It will match the current system font scaling.</description>
+    </key>
+    <key type="d" name="cursor-scale-factor">
+      <default>1.0</default>
+      <range min="0.5" max="3.0"/>
+      <summary>Mouse cursor scaling.</summary>
+      <description>This value defines the global mouse cursor scaling used by both
+        unity and applications. Changing this value allows to use a custom scaling
+        for the mouse cursor.</description>
+    </key>
+    <key type="s" name="app-scale-factor-monitor">
+      <default>''</default>
+      <summary>The name of the monitor that controls the global app scaling factor.</summary>
+      <description>This value defines the monitor that unity will use (if found) as reference
+        for scaling all the applications.</description>
+    </key>
+    <key type="b" name="app-fallback-to-maximum-scale-factor">
+      <default>true</default>
+      <summary>Use the maximum per-monitor scale-factor as application scale factor if no target monitor is found.</summary>
+      <description>When this is enabled, the applications scale factor will match
+        the scale factor of the monitor with the greater value, in case the monitor
+        defined in 'app-scale-factor-monitor' is not provided or available.</description>
+    </key>
+  </schema>
   <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
     <key type="as" name="favorites">
       <default>[

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-03-03 23:19:56 +0000
+++ dash/DashController.cpp	2014-03-21 23:09:12 +0000
@@ -92,7 +92,7 @@
   SetupWindow();
   UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); });
 
-  Settings::Instance().form_factor.changed.connect([this](FormFactor)
+  form_factor_changed_ = Settings::Instance().form_factor.changed.connect([this] (FormFactor)
   {
     if (window_ && view_ && visible_)
     {

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2014-03-03 23:19:56 +0000
+++ dash/DashController.h	2014-03-21 23:09:12 +0000
@@ -68,7 +68,7 @@
   bool IsCommandLensOpen() const;
   nux::Geometry GetInputWindowGeometry();
   nux::ObjectPtr<DashView> const& Dash() const;
-  
+
   int Monitor() const;
 
 protected:
@@ -108,6 +108,7 @@
   bool need_show_;
 
   connection::Wrapper screen_ungrabbed_slot_;
+  connection::Wrapper form_factor_changed_;
   glib::DBusServer dbus_server_;
   glib::TimeoutSeconds ensure_timeout_;
   nux::animation::AnimateValue<double> timeline_animator_;

=== modified file 'dash/ResultRendererHorizontalTile.cpp'
--- dash/ResultRendererHorizontalTile.cpp	2014-03-21 23:09:11 +0000
+++ dash/ResultRendererHorizontalTile.cpp	2014-03-21 23:09:12 +0000
@@ -30,6 +30,7 @@
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/TextureCache.h"
 #include "unity-shared/RawPixel.h"
+#include "unity-shared/UnitySettings.h"
 #include <NuxGraphics/GdkGraphics.h>
 
 
@@ -313,9 +314,6 @@
   PangoFontDescription* desc       = NULL;
   PangoContext*         pango_context   = NULL;
   GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
-  int                   dpi = -1;
-
-  g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
 
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
   layout = pango_cairo_create_layout(cr);
@@ -338,10 +336,8 @@
   pango_layout_set_markup(layout, final_text.str().c_str(), -1);
 
   pango_context = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pango_context,
-                                       gdk_screen_get_font_options(screen));
-  pango_cairo_context_set_resolution(pango_context,
-                                     dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
+  pango_cairo_context_set_font_options(pango_context, gdk_screen_get_font_options(screen));
+  pango_cairo_context_set_resolution(pango_context, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2014-03-21 23:09:11 +0000
+++ dash/ResultRendererTile.cpp	2014-03-21 23:09:12 +0000
@@ -32,6 +32,7 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/TextureCache.h"
 #include "unity-shared/RawPixel.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -48,7 +49,7 @@
 char const REPLACEMENT_CHAR = '?';
 float const CORNER_HIGHTLIGHT_RADIUS = 2.0f;
 
-void RenderTexture(nux::GraphicsEngine& GfxContext, 
+void RenderTexture(nux::GraphicsEngine& GfxContext,
                    int x,
                    int y,
                    int width,
@@ -485,10 +486,8 @@
   PangoContext*         pango_context   = NULL;
   GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
   glib::String          font;
-  int                   dpi = -1;
 
   g_object_get(gtk_settings_get_default(), "gtk-font-name", &font, NULL);
-  g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
 
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
   layout = pango_cairo_create_layout(cr);
@@ -513,10 +512,8 @@
   g_free (escaped_text);
 
   pango_context = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pango_context,
-                                       gdk_screen_get_font_options(screen));
-  pango_cairo_context_set_resolution(pango_context,
-                                     dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
+  pango_cairo_context_set_font_options(pango_context, gdk_screen_get_font_options(screen));
+  pango_cairo_context_set_resolution(pango_context, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);

=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2014-03-21 23:09:11 +0000
+++ dash/ResultView.cpp	2014-03-21 23:09:12 +0000
@@ -27,6 +27,7 @@
 
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/GraphicsUtils.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -60,6 +61,7 @@
     NeedRedraw();
   });
 
+  Settings::Instance().font_scaling.changed.connect(sigc::mem_fun(this, &ResultView::UpdateFontScale));
   enable_texture_render.changed.connect(sigc::mem_fun(this, &ResultView::OnEnableRenderToTexture));
   scale.changed.connect(sigc::mem_fun(this, &ResultView::UpdateScale));
 }
@@ -93,6 +95,17 @@
   }
 }
 
+void ResultView::UpdateFontScale(double scale)
+{
+  if (renderer_)
+  {
+    for (auto const& result : *result_model_)
+      renderer_->ReloadResult(result);
+
+    QueueDraw();
+  }
+}
+
 void ResultView::SetModelRenderer(ResultRenderer* renderer)
 {
   if (renderer_ != NULL)

=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2014-03-21 23:09:11 +0000
+++ dash/ResultView.h	2014-03-21 23:09:12 +0000
@@ -127,6 +127,7 @@
   void OnRowAdded(DeeModel* model, DeeModelIter* iter);
   void OnRowRemoved(DeeModel* model, DeeModelIter* iter);
   void UpdateScale(double scale);
+  void UpdateFontScale(double scale);
 
   Result cached_result_;
   connection::Manager result_connections_;

=== modified file 'debian/unity.migrations'
--- debian/unity.migrations	2012-07-19 10:22:37 +0000
+++ debian/unity.migrations	2014-03-21 23:09:12 +0000
@@ -1,1 +1,2 @@
 tools/migration-scripts/01_unity_change_dconf_path
+tools/migration-scripts/02_unity_setup_text_scale_factor

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-03-17 20:58:25 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-03-21 23:09:12 +0000
@@ -393,19 +393,34 @@
     {
       if (scaleWasActive) // #5 above
       {
-        Focus(arg);
+        if (minimize_window_on_click())
+        {
+          for (auto const& win : GetWindows(WindowFilter::ON_CURRENT_DESKTOP))
+            wm.Minimize(win->window_id());
+        }
+        else
+        {
+          Focus(arg);
+        }
       }
       else // #2 above
       {
         if (arg.source != ActionArg::Source::SWITCHER)
         {
-          WindowList windows = GetWindows(WindowFilter::ON_CURRENT_DESKTOP);
+          bool minimized = false;
 
-          if (windows.size() == 1 && minimize_window_on_click)
+          if (minimize_window_on_click)
           {
-            wm.Minimize(windows[0]->window_id());
+            WindowList const& windows = GetWindows(WindowFilter::ON_CURRENT_DESKTOP);
+
+            if (windows.size() == 1)
+            {
+              wm.Minimize(windows[0]->window_id());
+              minimized = true;
+            }
           }
-          else
+
+          if (!minimized)
           {
             Spread(true, 0, false);
           }

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2014-02-26 07:08:37 +0000
+++ launcher/QuicklistMenuItem.cpp	2014-03-21 23:09:12 +0000
@@ -22,6 +22,7 @@
 #include <gtk/gtk.h>
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
+#include "unity-shared/UnitySettings.h"
 
 #include "QuicklistMenuItem.h"
 
@@ -320,21 +321,9 @@
 
   PangoContext* pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
   pango_cairo_context_set_font_options(pangoCtx, gdk_screen_get_font_options(screen));
-
-  int dpi = 0;
-  g_object_get(settings, "gtk-xft-dpi", &dpi, nullptr);
-
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx, static_cast<float>(dpi) / static_cast<float>(PANGO_SCALE));
-  }
-
+  pango_cairo_context_set_resolution(pangoCtx, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
+
   PangoRectangle log_rect  = {0, 0, 0, 0};
   pango_layout_get_extents(layout, nullptr, &log_rect);
 

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-03-06 09:31:24 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-03-21 23:09:12 +0000
@@ -469,6 +469,7 @@
     std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font.c_str()), pango_font_description_free);
     pango_context_set_font_description(context, desc.get());
     pango_context_set_language(context, gtk_get_default_language());
+    pango_cairo_context_set_resolution(context, 96.0 * Settings::Instance().font_scaling());
 
     label.erase(std::remove(label.begin(), label.end(), '_'), label.end());
     layout = pango_layout_new(context);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-20 23:51:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-21 23:09:12 +0000
@@ -2855,8 +2855,7 @@
   {
     if ((window->type() != CompWindowTypePopupMenuMask ||
         !uScreen->lockscreen_controller_->HasOpenMenu()) &&
-        window->resName() != "onboard" &&
-        !window->minimized())
+        !window->minimized() && window->resName() != "onboard")
     {
       // For some reasons PAINT_WINDOW_NO_CORE_INSTANCE_MASK doesn't work here
       // (well, it works too much, as it applies to menus too), so we need
@@ -3736,9 +3735,9 @@
 
   launcher_controller_->ClearTooltips();
 
-  auto& adapter = PluginAdapter::Default();
-  if (adapter.IsScaleActive())
-    adapter.TerminateScale();
+  auto& wm = WindowManager::Default();
+  if (wm.IsScaleActive())
+    wm.TerminateScale();
 
   RaiseOSK();
 }

=== modified file 'tests/data/external.gschema.xml'
--- tests/data/external.gschema.xml	2014-03-06 21:37:11 +0000
+++ tests/data/external.gschema.xml	2014-03-21 23:09:12 +0000
@@ -53,6 +53,21 @@
     </key>
   </schema>
 
+  <schema id="org.gnome.desktop.interface" path="/org/gnome/desktop/interface/">
+    <key type="u" name="scaling-factor">
+      <default>1</default>
+    </key>
+    <key type="d" name="text-scaling-factor">
+      <default>1.0</default>
+    </key>
+    <key type="s" name="font-name">
+      <default>'Ubuntu 11'</default>
+    </key>
+    <key type="i" name="cursor-size">
+      <default>24</default>
+    </key>
+  </schema>
+
   <schema id="com.canonical.unity-greeter" path="/com/canonical/unity-greeter/">
     <key type="s" name="logo">
       <default>'/usr/share/unity-greeter/logo.png'</default>

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2014-02-18 01:20:01 +0000
+++ tests/mock-application.h	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 
 #include "unity-shared/ApplicationManager.h"
 #include "unity-shared/WindowManager.h"
-#include "unity-shared/UnitySettings.h"
 
 using namespace testing;
 
@@ -379,7 +378,6 @@
     unity_app_->actions_log_.clear();
   }
 
-  unity::Settings settings;
   MockApplication::Ptr unity_app_;
 };
 

=== modified file 'tests/test_action_link.cpp'
--- tests/test_action_link.cpp	2013-01-22 16:01:18 +0000
+++ tests/test_action_link.cpp	2014-03-21 23:09:12 +0000
@@ -22,7 +22,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <unity-shared/StaticCairoText.h>
+#include "unity-shared/StaticCairoText.h"
 
 #include "dash/previews/ActionLink.cpp"
 #include "test_utils.h"
@@ -75,6 +75,7 @@
     {
       action_link = new ActionLinkMock("action_id", "display_name");
     }
+
     nux::ObjectPtr<ActionLinkMock> action_link;
 };
 

=== modified file 'tests/test_bfb_launcher_icon.cpp'
--- tests/test_bfb_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_bfb_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -19,8 +19,6 @@
 
 #include <gmock/gmock.h>
 
-#include "unity-shared/UnitySettings.h"
-
 #include "BFBLauncherIcon.h"
 
 using namespace unity;
@@ -39,7 +37,6 @@
 
 struct TestBFBLauncherIcon : testing::Test
 {
-  unity::Settings settings;
   MockBFBLauncherIcon bfb;
 };
 

=== modified file 'tests/test_dash_controller.cpp'
--- tests/test_dash_controller.cpp	2013-10-14 16:45:07 +0000
+++ tests/test_dash_controller.cpp	2014-03-21 23:09:12 +0000
@@ -20,7 +20,6 @@
 #include "mock-base-window.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 #include "test_utils.h"
 
@@ -46,7 +45,6 @@
   nux::animation::AnimationController animation_controller;
 
   // required to create hidden secret global variables
-  Settings unity_settings_;
   dash::Style dash_style_;
   panel::Style panel_style_;
 

=== modified file 'tests/test_dashview.cpp'
--- tests/test_dashview.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_dashview.cpp	2014-03-21 23:09:12 +0000
@@ -32,10 +32,8 @@
 #include "dash/ApplicationStarter.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
 
 #include "test_mock_scope.h"
-#include "test_utils.h"
 
 using namespace unity;
 using namespace unity::dash;
@@ -70,9 +68,6 @@
   {}
   virtual ~TestDashView() {}
 
-  virtual void SetUp() { Utils::init_gsettings_test_environment(); }
-  virtual void TearDown() { Utils::reset_gsettings_test_environment(); }
-
   class MockDashView  : public DashView
   {
   public:
@@ -86,7 +81,6 @@
   };
 
 protected:
-  Settings unity_settings_;
   dash::Style dash_style_;
   panel::Style panel_style_;
   MockApplicationStarter::Ptr application_starter_;

=== modified file 'tests/test_desktop_launcher_icon.cpp'
--- tests/test_desktop_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_desktop_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -19,7 +19,6 @@
 
 #include <gmock/gmock.h>
 
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 #include "launcher/DesktopLauncherIcon.h"
 
@@ -31,7 +30,6 @@
 
 struct TestDesktopLauncherIcon : testing::Test
 {
-  unity::Settings settings;
   DesktopLauncherIcon icon;
 };
 

=== modified file 'tests/test_device_launcher_section.cpp'
--- tests/test_device_launcher_section.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_device_launcher_section.cpp	2014-03-21 23:09:12 +0000
@@ -22,8 +22,6 @@
 
 #include <gmock/gmock.h>
 
-#include "unity-shared/UnitySettings.h"
-
 #include "DevicesSettings.h"
 #include "test_mock_devices.h"
 #include "test_utils.h"
@@ -60,7 +58,6 @@
     , section_(monitor_, devices_settings_, notifications_)
   {}
 
-  unity::Settings settings_;
   MockVolumeMonitorWrapper::Ptr monitor_;
   DevicesSettings::Ptr devices_settings_;
   DeviceNotificationDisplay::Ptr notifications_;

=== modified file 'tests/test_error_preview.cpp'
--- tests/test_error_preview.cpp	2013-03-21 16:33:03 +0000
+++ tests/test_error_preview.cpp	2014-03-21 23:09:12 +0000
@@ -28,7 +28,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "dash/previews/ErrorPreview.h"
@@ -100,7 +99,6 @@
   UnityProtocolPreviewPaymentType preview_type;
 
   // needed for styles
-  unity::Settings settings;
   dash::Style dash_style;
 };
 

=== modified file 'tests/test_expo_launcher_icon.cpp'
--- tests/test_expo_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_expo_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -23,8 +23,6 @@
 #include "launcher/ExpoLauncherIcon.h"
 #include "test_standalone_wm.h"
 
-#include "unity-shared/UnitySettings.h"
-
 using namespace unity;
 using namespace unity::launcher;
 
@@ -33,7 +31,6 @@
 
 struct TestExpoLauncherIcon : testing::Test
 {
-  unity::Settings settings;
   ExpoLauncherIcon icon;
   testwrapper::StandaloneWM wm;
 };

=== modified file 'tests/test_favorite_store_gsettings.cpp'
--- tests/test_favorite_store_gsettings.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_favorite_store_gsettings.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include <gmock/gmock.h>
 #include <glib.h>
 
-#include "test_utils.h"
 #include "FavoriteStore.h"
 #include "FavoriteStoreGSettings.h"
 
@@ -77,20 +76,12 @@
 
   virtual void SetUp()
   {
-    // set the data directory so gsettings can find the schema
-    Utils::init_gsettings_test_environment();
-
     favorite_store.reset(new internal::FavoriteStoreGSettings());
 
     // Setting the test values
     gsettings_client = g_settings_new(SETTINGS_NAME);
     g_settings_set_strv(gsettings_client, SETTINGS_KEY, base_store_favs);
   }
-
-  virtual void TearDown()
-  {
-    Utils::reset_gsettings_test_environment();
-  }
 };
 
 TEST_F(TestFavoriteStoreGSettings, TestAllocation)

=== modified file 'tests/test_filter_widgets.cpp'
--- tests/test_filter_widgets.cpp	2012-12-20 10:42:49 +0000
+++ tests/test_filter_widgets.cpp	2014-03-21 23:09:12 +0000
@@ -24,7 +24,6 @@
 #include <gtest/gtest.h>
 #include "test_filter_multirange.h"
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/UnitySettings.h"
 
 #include <Nux/Nux.h>
 #include <NuxGraphics/Events.h>
@@ -113,7 +112,6 @@
                           FALSE);
   }
 
-  Settings unity_settings_;
   dash::Style dash_style_;
 
   glib::Object<DeeModel> model_;

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2014-03-10 19:38:01 +0000
+++ tests/test_gnome_session_manager.cpp	2014-03-21 23:09:12 +0000
@@ -134,8 +134,6 @@
 {
   static void SetUpTestCase()
   {
-    Utils::init_gsettings_test_environment();
-
     can_shutdown_ = (g_random_int() % 2) ? true : false;
     can_suspend_ = (g_random_int() % 2) ? true : false;
     can_hibernate_ = (g_random_int() % 2) ? true : false;
@@ -246,8 +244,6 @@
 
   static void TearDownTestCase()
   {
-    Utils::reset_gsettings_test_environment();
-
     bool cancelled = false;
     bool closed = false;
     shell_proxy_->Connect("Canceled", [&cancelled] (GVariant*) { cancelled = true; });

=== modified file 'tests/test_gsettings_scopes.cpp'
--- tests/test_gsettings_scopes.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_gsettings_scopes.cpp	2014-03-21 23:09:12 +0000
@@ -52,7 +52,6 @@
 public:
   TestGSettingsScopes():scope_added(0),scope_removed(0),scopes_reordered(0)
   {}
-  virtual ~TestGSettingsScopes() {}
 
   virtual void SetUp() { Utils::init_gsettings_test_environment(); }
   virtual void TearDown() { Utils::reset_gsettings_test_environment(); }

=== modified file 'tests/test_hud_button.cpp'
--- tests/test_hud_button.cpp	2012-12-14 12:14:34 +0000
+++ tests/test_hud_button.cpp	2014-03-21 23:09:12 +0000
@@ -28,7 +28,6 @@
 #include "hud/HudButton.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/UnitySettings.h"
 
 using namespace unity;
 
@@ -37,7 +36,6 @@
 
 TEST(TestHudButton, TestLabelOpacity)
 {
-  Settings unity_settings;
   dash::Style dash_style;
   nux::ObjectPtr<hud::HudButton> button(new hud::HudButton());
   nux::Layout* layout = button->GetLayout();

=== modified file 'tests/test_hud_controller.cpp'
--- tests/test_hud_controller.cpp	2013-11-14 00:17:19 +0000
+++ tests/test_hud_controller.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include "mock-base-window.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 #include "test_utils.h"
 using namespace unity;
@@ -74,7 +73,6 @@
 
 protected:
   // required to create hidden secret global variables
-  Settings unity_settings_;
   dash::Style dash_style_;
   panel::Style panel_style_;
 

=== modified file 'tests/test_hud_launcher_icon.cpp'
--- tests/test_hud_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_hud_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -21,7 +21,6 @@
 
 #include "HudLauncherIcon.h"
 
-#include "unity-shared/UnitySettings.h"
 
 using namespace unity;
 using namespace unity::launcher;
@@ -39,7 +38,6 @@
 
 struct TestHudLauncherIcon : testing::Test
 {
-  unity::Settings settings;
   MockHudLauncherIcon hud;
 };
 

=== modified file 'tests/test_hud_view.cpp'
--- tests/test_hud_view.cpp	2013-02-21 10:47:14 +0000
+++ tests/test_hud_view.cpp	2014-03-21 23:09:12 +0000
@@ -31,7 +31,6 @@
 #include "hud/HudView.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
 
 using namespace unity;
 
@@ -40,7 +39,6 @@
 
 TEST(TestHudView, TestSetQueries)
 {
-  Settings unity_settings;
   dash::Style dash_style;
   panel::Style panel_style;
   nux::ObjectPtr<hud::View> view(new hud::View());

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2014-02-26 02:23:26 +0000
+++ tests/test_launcher.cpp	2014-03-21 23:09:12 +0000
@@ -29,7 +29,6 @@
 #include "launcher/MockLauncherIcon.h"
 #include "launcher/Launcher.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/IconRenderer.h"
 #include "unity-shared/UBusMessages.h"
 #include "test_standalone_wm.h"
@@ -187,7 +186,6 @@
     return icons;
   }
 
-  Settings settings;
   panel::Style panel_style;
   MockUScreen uscreen;
   testwrapper::StandaloneWM WM;

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2014-03-05 20:21:53 +0000
+++ tests/test_launcher_controller.cpp	2014-03-21 23:09:12 +0000
@@ -33,7 +33,6 @@
 #include "VolumeLauncherIcon.h"
 #include "SoftwareCenterLauncherIcon.h"
 #include "PanelStyle.h"
-#include "UnitySettings.h"
 #include "UBusMessages.h"
 #include "logger_helper.h"
 #include "test_utils.h"
@@ -279,7 +278,6 @@
 
   std::shared_ptr<helper::CaptureLogOutput> logger_output_;
   MockUScreen uscreen;
-  Settings settings;
   panel::Style panel_style;
   MockFavoriteStore favorite_store;
   MockXdndManager::Ptr xdnd_manager_;

=== modified file 'tests/test_launcher_icon.cpp'
--- tests/test_launcher_icon.cpp	2013-10-21 23:37:54 +0000
+++ tests/test_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -21,7 +21,6 @@
 #include <Nux/NuxTimerTickSource.h>
 
 #include "LauncherIcon.h"
-#include "UnitySettings.h"
 
 using namespace unity;
 using namespace unity::launcher;
@@ -71,7 +70,6 @@
   nux::NuxTimerTickSource tick_source_;
   nux::animation::AnimationController animation_controller;
   unsigned animations_tick_;
-  unity::Settings settings;
   MockLauncherIcon icon;
 };
 

=== modified file 'tests/test_launcher_minimize_speed.cpp'
--- tests/test_launcher_minimize_speed.cpp	2013-07-09 04:29:25 +0000
+++ tests/test_launcher_minimize_speed.cpp	2014-03-21 23:09:12 +0000
@@ -22,7 +22,6 @@
 
 #include <gio/gio.h>
 #include <gtest/gtest.h>
-#include "test_utils.h"
 
 #include "plugins/unityshell/src/WindowMinimizeSpeedController.h"
 
@@ -36,19 +35,12 @@
 {
 public:
   glib::Object<GSettings> mSettings;
-  WindowMinimizeSpeedController* mController;
-  
+  std::shared_ptr<WindowMinimizeSpeedController> mController;
+
   /* override */ void SetUp()
   {
-    Utils::init_gsettings_test_environment();
     mSettings = g_settings_new("com.canonical.Unity");
-    mController = new WindowMinimizeSpeedController();
-  }
-
-  /* override */ void TearDown()
-  {
-    Utils::reset_gsettings_test_environment();
-    delete mController;
+    mController = std::make_shared<WindowMinimizeSpeedController>();
   }
 };
 

=== modified file 'tests/test_launcher_tooltip.cpp'
--- tests/test_launcher_tooltip.cpp	2014-02-14 04:45:29 +0000
+++ tests/test_launcher_tooltip.cpp	2014-03-21 23:09:12 +0000
@@ -25,7 +25,6 @@
 #include "unity-shared/StaticCairoText.h"
 #include "launcher/Tooltip.h"
 
-#include <unity-shared/UnitySettings.h>
 #include "test_utils.h"
 
 namespace unity
@@ -73,7 +72,6 @@
 protected:
   TestTooltip() : Test()
   {
-    Settings settings;
     tooltip = new TooltipMock();
   }
 

=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-03-18 23:49:29 +0000
+++ tests/test_lockscreen_controller.cpp	2014-03-21 23:09:12 +0000
@@ -30,7 +30,6 @@
 #include "lockscreen/LockScreenSettings.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UScreen.h"
-#include "unity-shared/UnitySettings.h"
 #include "test_mock_session_manager.h"
 #include "test_uscreen_mock.h"
 #include "test_utils.h"
@@ -109,7 +108,6 @@
   nux::animation::AnimationController animation_controller;
 
   MockUScreen uscreen;
-  unity::Settings unity_settings;
   unity::panel::Style panel_style;
   unity::lockscreen::Settings lockscreen_settings;
   static glib::DBusServer::Ptr lightdm_;

=== modified file 'tests/test_main.cpp'
--- tests/test_main.cpp	2014-01-30 19:46:36 +0000
+++ tests/test_main.cpp	2014-03-21 23:09:12 +0000
@@ -7,7 +7,7 @@
 
 #include "logger_helper.h"
 #include "test_utils.h"
-
+#include "UnitySettings.h"
 
 int main(int argc, char** argv)
 {
@@ -22,6 +22,7 @@
 
   gtk_init(&argc, &argv);
   setlocale(LC_ALL, "C");
+  unity::Settings settings;
 
   nux::NuxInitialize(0);
   std::unique_ptr<nux::WindowThread> win_thread(nux::CreateNuxWindow("Tests",

=== modified file 'tests/test_panel_controller.cpp'
--- tests/test_panel_controller.cpp	2014-02-27 23:09:32 +0000
+++ tests/test_panel_controller.cpp	2014-03-21 23:09:12 +0000
@@ -22,7 +22,6 @@
 #include "PanelController.h"
 #include "PanelStyle.h"
 #include "PanelView.h"
-#include "UnitySettings.h"
 #include "mock_menu_manager.h"
 #include "test_uscreen_mock.h"
 #include "launcher/LauncherOptions.h"
@@ -43,7 +42,6 @@
   }
 
   MockUScreen uscreen;
-  Settings settings;
   Style panel_style;
   menu::MockManager::Ptr menus;
   ui::EdgeBarrierController::Ptr edge_barriers;

=== modified file 'tests/test_panel_indicator_entry_dropdown_view.cpp'
--- tests/test_panel_indicator_entry_dropdown_view.cpp	2014-02-18 17:55:54 +0000
+++ tests/test_panel_indicator_entry_dropdown_view.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include <Nux/Nux.h>
 #include "PanelIndicatorEntryDropdownView.h"
 #include "PanelStyle.h"
-#include "UnitySettings.h"
 
 #include "mock_indicators.h"
 #include "test_standalone_wm.h"
@@ -67,7 +66,6 @@
     return PanelIndicatorEntryView::Ptr(new PanelIndicatorEntryView(entry));
   }
 
-  Settings settings_;
   Style style_;
   MockIndicators::Ptr indicators_;
   PanelIndicatorEntryDropdownView dropdown;

=== modified file 'tests/test_panel_indicators_view.cpp'
--- tests/test_panel_indicators_view.cpp	2014-01-30 15:14:36 +0000
+++ tests/test_panel_indicators_view.cpp	2014-03-21 23:09:12 +0000
@@ -24,7 +24,6 @@
 #include <Nux/HLayout.h>
 #include "PanelIndicatorsView.h"
 #include "PanelStyle.h"
-#include "UnitySettings.h"
 #include "mock_indicators.h"
 
 namespace unity
@@ -52,7 +51,6 @@
 
 struct TestPanelIndicatorsView : testing::Test
 {
-  Settings settings_;
   Style style_;
   testing::NiceMock<MockPanelIndicatorsView> indicators;
 };

=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2014-02-18 19:37:55 +0000
+++ tests/test_panel_menu_view.cpp	2014-03-21 23:09:12 +0000
@@ -21,7 +21,6 @@
 #include <Nux/Nux.h>
 #include "PanelMenuView.h"
 #include "PanelStyle.h"
-#include "UnitySettings.h"
 #include "UBusMessages.h"
 #include "mock_menu_manager.h"
 #include "test_standalone_wm.h"
@@ -78,7 +77,6 @@
   // The order is important, i.e. menu_view needs
   // panel::Style that needs Settings
   MockUScreen uscreen;
-  Settings settings;
   panel::Style panelStyle;
   testwrapper::StandaloneWM WM;
   testing::NiceMock<MockPanelMenuView> menu_view;

=== modified file 'tests/test_panel_style.cpp'
--- tests/test_panel_style.cpp	2014-02-28 05:48:21 +0000
+++ tests/test_panel_style.cpp	2014-03-21 23:09:12 +0000
@@ -25,8 +25,6 @@
 
 #include <Nux/Nux.h>
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/UnitySettings.h"
-#include "test_utils.h"
 
 #include "MultiMonitor.h"
 
@@ -42,23 +40,15 @@
 {
 public:
   glib::Object<GSettings> gsettings;
-  Settings unity_settings;
   std::unique_ptr<panel::Style> panel_style_instance;
 
   /* override */ void SetUp()
   {
-    Utils::init_gsettings_test_environment();
-
     gsettings = g_settings_new("org.gnome.desktop.wm.preferences");
     g_settings_set_string(gsettings, "titlebar-font", TITLEBAR_FONT.c_str());
 
     panel_style_instance.reset(new panel::Style());
   }
-
-  /* override */ void TearDown()
-  {
-    Utils::reset_gsettings_test_environment();
-  }
 };
 
 TEST_F(TestPanelStyle, TestGetFontDescription)
@@ -80,7 +70,7 @@
   sleep(1);
 
   ASSERT_TRUE(signal_received);
-  ASSERT_EQ(panel_style_instance->GetFontDescription(panel::PanelItem::TITLE), "Ubuntu Italic 11");  
+  ASSERT_EQ(panel_style_instance->GetFontDescription(panel::PanelItem::TITLE), "Ubuntu Italic 11");
 
   g_settings_set_string(gsettings, "titlebar-font", old_font);
   g_free (old_font);

=== modified file 'tests/test_panel_view.cpp'
--- tests/test_panel_view.cpp	2014-02-17 14:09:15 +0000
+++ tests/test_panel_view.cpp	2014-03-21 23:09:12 +0000
@@ -25,7 +25,6 @@
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/UnitySettings.h"
 
 #include "mock_menu_manager.h"
 #include "test_standalone_wm.h"
@@ -39,7 +38,6 @@
 class TestPanelView : public testing::Test
 {
 public:
-  Settings unity_settings_;
   Style panel_style_;
   UBusManager ubus_manager_;
   nux::ObjectPtr<MockableBaseWindow> window_;

=== modified file 'tests/test_previews_application.cpp'
--- tests/test_previews_application.cpp	2013-01-24 03:17:58 +0000
+++ tests/test_previews_application.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "UnityCore/ApplicationPreview.h"
@@ -99,7 +98,6 @@
   nux::ObjectPtr<nux::BaseWindow> parent_window_;
   dash::Preview::Ptr preview_model_;
 
-  unity::Settings settings;
   previews::Style panel_style;
   dash::Style dash_style;
   ThumbnailGenerator thumbnail_generator;

=== modified file 'tests/test_previews_generic.cpp'
--- tests/test_previews_generic.cpp	2013-01-24 03:17:58 +0000
+++ tests/test_previews_generic.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "UnityCore/GenericPreview.h"
@@ -86,7 +85,6 @@
   nux::ObjectPtr<nux::BaseWindow> parent_window_;
   dash::Preview::Ptr preview_model_;
 
-  unity::Settings settings;
   previews::Style panel_style;
   dash::Style dash_style;
   ThumbnailGenerator thumbnail_generator;

=== modified file 'tests/test_previews_movie.cpp'
--- tests/test_previews_movie.cpp	2013-05-13 12:23:50 +0000
+++ tests/test_previews_movie.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "UnityCore/MoviePreview.h"
@@ -94,7 +93,6 @@
   nux::ObjectPtr<nux::BaseWindow> parent_window_;
   dash::Preview::Ptr preview_model_;
 
-  unity::Settings settings;
   previews::Style panel_style;
   dash::Style dash_style;
   ThumbnailGenerator thumbnail_generator;

=== modified file 'tests/test_previews_music.cpp'
--- tests/test_previews_music.cpp	2013-02-27 15:17:55 +0000
+++ tests/test_previews_music.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "UnityCore/MusicPreview.h"
@@ -89,7 +88,6 @@
   nux::ObjectPtr<nux::BaseWindow> parent_window_;
   dash::Preview::Ptr preview_model_;
 
-  unity::Settings settings;
   previews::Style panel_style;
   dash::Style dash_style;
   ThumbnailGenerator thumbnail_generator;

=== modified file 'tests/test_previews_music_payment.cpp'
--- tests/test_previews_music_payment.cpp	2013-03-20 12:11:01 +0000
+++ tests/test_previews_music_payment.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "dash/previews/MusicPaymentPreview.h"
@@ -125,7 +124,6 @@
   UnityProtocolPreviewPaymentType preview_type;
 
   // needed for styles
-  unity::Settings settings;
   dash::Style dash_style;
 
 };

=== modified file 'tests/test_previews_payment.cpp'
--- tests/test_previews_payment.cpp	2013-03-20 12:11:01 +0000
+++ tests/test_previews_payment.cpp	2014-03-21 23:09:12 +0000
@@ -28,7 +28,6 @@
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
 #include <unity-shared/CoverArt.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "dash/previews/PaymentPreview.h"
@@ -146,7 +145,6 @@
   dash::Preview::Ptr preview_model;
 
   // needed for styles
-  unity::Settings settings;
   dash::Style dash_style;
 
 };

=== modified file 'tests/test_previews_social.cpp'
--- tests/test_previews_social.cpp	2013-01-24 03:17:58 +0000
+++ tests/test_previews_social.cpp	2014-03-21 23:09:12 +0000
@@ -27,7 +27,6 @@
 #include <unity-shared/DashStyle.h>
 #include <unity-shared/PreviewStyle.h>
 #include <unity-shared/ThumbnailGenerator.h>
-#include "unity-shared/UnitySettings.h"
 
 #include <unity-protocol.h>
 #include "UnityCore/SocialPreview.h"
@@ -84,7 +83,6 @@
   nux::ObjectPtr<nux::BaseWindow> parent_window_;
   dash::Preview::Ptr preview_model_;
 
-  unity::Settings settings;
   previews::Style panel_style;
   dash::Style dash_style;
   ThumbnailGenerator thumbnail_generator;

=== modified file 'tests/test_quicklist_manager.cpp'
--- tests/test_quicklist_manager.cpp	2013-02-12 20:59:12 +0000
+++ tests/test_quicklist_manager.cpp	2014-03-21 23:09:12 +0000
@@ -24,7 +24,6 @@
 
 #include "launcher/QuicklistManager.h"
 #include "launcher/QuicklistView.h"
-#include "unity-shared/UnitySettings.h"
 
 namespace {
 
@@ -44,7 +43,6 @@
 
 TEST(TestQuicklistManager, RegisterQuicklist)
 {
-  unity::Settings unity_settings;
   nux::ObjectWeakPtr<unity::QuicklistView> ptr;
 
   {

=== modified file 'tests/test_quicklist_view.cpp'
--- tests/test_quicklist_view.cpp	2012-10-17 21:36:24 +0000
+++ tests/test_quicklist_view.cpp	2014-03-21 23:09:12 +0000
@@ -26,7 +26,6 @@
 #include "QuicklistMenuItemLabel.h"
 #include "QuicklistMenuItemRadio.h"
 #include "QuicklistMenuItemSeparator.h"
-#include "unity-shared/UnitySettings.h"
 
 using namespace unity;
 using namespace testing;
@@ -76,7 +75,6 @@
     }
   }
 
-  unity::Settings unity_settings;
   nux::ObjectPtr<QuicklistView> quicklist;
 };
 

=== modified file 'tests/test_result_renderer.cpp'
--- tests/test_result_renderer.cpp	2013-07-22 17:11:47 +0000
+++ tests/test_result_renderer.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include <glib-object.h>
 
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/UnitySettings.h"
 #include "UnityCore/GTKWrapper.h"
 #include "UnityCore/Result.h"
 #include "dash/ResultRendererTile.h"
@@ -72,7 +71,6 @@
 public:
   TestResultRenderer() {}
 
-  unity::Settings settings;
   dash::Style style;
 };
 

=== modified file 'tests/test_scope_bar.cpp'
--- tests/test_scope_bar.cpp	2013-05-01 00:18:50 +0000
+++ tests/test_scope_bar.cpp	2014-03-21 23:09:12 +0000
@@ -22,7 +22,6 @@
 #include <dash/ScopeBar.h>
 
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/UnitySettings.h"
 #include "test_mock_scope.h"
 
 namespace unity
@@ -42,7 +41,6 @@
     EXPECT_EQ(scope_bar.icons_.size(), size);
   }
 
-  unity::Settings settings;
   dash::Style style;
 };
 

=== modified file 'tests/test_scope_view.cpp'
--- tests/test_scope_view.cpp	2013-07-09 17:51:37 +0000
+++ tests/test_scope_view.cpp	2014-03-21 23:09:12 +0000
@@ -22,7 +22,6 @@
 #include <dash/ScopeView.h>
 #include <dash/PlacesGroup.h>
 #include <unity-shared/DashStyle.h>
-#include <unity-shared/UnitySettings.h>
 #include <UnityCore/Category.h>
 
 #include "MockCategories.h"
@@ -77,7 +76,6 @@
     , scope_view_(new FakeScopeView(scope_))
   {}
 
-  unity::Settings settings;
   dash::Style style;
   MockScopeData::Ptr scope_data_;
   MockScope::Ptr scope_;

=== modified file 'tests/test_searchbar.cpp'
--- tests/test_searchbar.cpp	2013-01-18 17:31:00 +0000
+++ tests/test_searchbar.cpp	2014-03-21 23:09:12 +0000
@@ -21,7 +21,6 @@
 #include <gmock/gmock.h>
 #include <unity-shared/SearchBarSpinner.h>
 #include <unity-shared/DashStyle.h>
-#include <unity-shared/UnitySettings.h>
 #include "test_utils.h"
 
 using namespace unity;
@@ -34,7 +33,6 @@
 public:
   TestSearchBar() {}
 
-  unity::Settings settings;
   dash::Style style;
 };
 

=== modified file 'tests/test_session_controller.cpp'
--- tests/test_session_controller.cpp	2013-09-25 00:48:03 +0000
+++ tests/test_session_controller.cpp	2014-03-21 23:09:12 +0000
@@ -24,7 +24,6 @@
 #include "SessionController.h"
 #include "UBusMessages.h"
 #include "UBusWrapper.h"
-#include "UnitySettings.h"
 #include "WindowManager.h"
 #include "test_utils.h"
 
@@ -55,7 +54,6 @@
 
   nux::NuxTimerTickSource tick_source;
   nux::animation::AnimationController animation_controller;
-  unity::Settings settings;
   MockManager::Ptr manager ;
   ControllerWrap controller;
 };

=== modified file 'tests/test_session_view.cpp'
--- tests/test_session_view.cpp	2013-11-16 11:44:23 +0000
+++ tests/test_session_view.cpp	2014-03-21 23:09:12 +0000
@@ -21,7 +21,6 @@
 #include "test_mock_session_manager.h"
 #include "SessionButton.h"
 #include "SessionView.h"
-#include "UnitySettings.h"
 
 namespace unity
 {
@@ -91,7 +90,6 @@
     nux::GetWindowCompositor().SetKeyFocusArea(nullptr);
   }
 
-  unity::Settings settings;
   MockManager::Ptr manager;
   ViewWrap view;
 };

=== modified file 'tests/test_shortcut_controller.cpp'
--- tests/test_shortcut_controller.cpp	2014-03-10 23:44:54 +0000
+++ tests/test_shortcut_controller.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 
 #include "shortcuts/BaseWindowRaiser.h"
 #include "shortcuts/ShortcutController.h"
-#include "unity-shared/UnitySettings.h"
 #include "WindowManager.h"
 #include "UBusMessages.h"
 using namespace unity;
@@ -89,7 +88,6 @@
   }
 
   MockUScreen uscreen;
-  Settings unity_settings;
   MockBaseWindowRaiser::Ptr base_window_raiser_;
   AbstractModeller::Ptr modeller_;
   NiceMock<MockShortcutController> controller_;

=== modified file 'tests/test_shortcut_view.cpp'
--- tests/test_shortcut_view.cpp	2013-11-16 11:44:23 +0000
+++ tests/test_shortcut_view.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include "ShortcutView.h"
 #include "ShortcutModel.h"
 #include "MockShortcutHint.h"
-#include "UnitySettings.h"
 #include "LineSeparator.h"
 
 namespace unity
@@ -54,7 +53,6 @@
     return std::make_shared<Model>(hints);
   }
 
-  Settings settings;
   MockShortcutView view;
 };
 

=== modified file 'tests/test_single_monitor_launcher_icon.cpp'
--- tests/test_single_monitor_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_single_monitor_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -20,7 +20,6 @@
 #include <gtest/gtest.h>
 
 #include "SingleMonitorLauncherIcon.h"
-#include "unity-shared/UnitySettings.h"
 
 using namespace unity;
 using namespace launcher;
@@ -30,7 +29,6 @@
 
 struct TestSingleMonitorLauncherIconMock : testing::Test
 {
-  unity::Settings settings;
 };
 
 TEST_F(TestSingleMonitorLauncherIconMock, Construction)

=== modified file 'tests/test_spread_filter.cpp'
--- tests/test_spread_filter.cpp	2014-02-17 21:41:32 +0000
+++ tests/test_spread_filter.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include <NuxCore/AnimationController.h>
 
 #include "SpreadFilter.h"
-#include "UnitySettings.h"
 #include "DashStyle.h"
 #include "test_utils.h"
 
@@ -64,7 +63,6 @@
     tick_source.tick(big_tick_);
   }
 
-  Settings settings_;
   dash::Style style_;
   nux::NuxTimerTickSource tick_source;
   nux::animation::AnimationController animation_controller;

=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2013-10-14 17:36:51 +0000
+++ tests/test_switcher_controller.h	2014-03-21 23:09:12 +0000
@@ -31,7 +31,6 @@
 #include "SwitcherController.h"
 #include "SwitcherView.h"
 #include "TimeUtil.h"
-#include "unity-shared/UnitySettings.h"
 #include "mock-base-window.h"
 #include "test_standalone_wm.h"
 
@@ -92,9 +91,6 @@
 protected:
   TestSwitcherController();
 
-  // required to create hidden secret global variables before test objects
-  unity::Settings unity_settings_;
-
   unity::testwrapper::StandaloneWM WM;
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;

=== modified file 'tests/test_switcher_view.cpp'
--- tests/test_switcher_view.cpp	2013-11-19 18:33:11 +0000
+++ tests/test_switcher_view.cpp	2014-03-21 23:09:12 +0000
@@ -25,7 +25,6 @@
 #include "MockLauncherIcon.h"
 #include "test_standalone_wm.h"
 #include "unity-shared/IconRenderer.h"
-#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -93,7 +92,6 @@
     }
 
   testwrapper::StandaloneWM WM;
-  unity::Settings settings;
   testing::NiceMock<MockSwitcherView> switcher;
 };
 

=== modified file 'tests/test_text_input.cpp'
--- tests/test_text_input.cpp	2014-03-06 02:26:23 +0000
+++ tests/test_text_input.cpp	2014-03-21 23:09:12 +0000
@@ -24,7 +24,6 @@
 
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/TextInput.h"
-#include "unity-shared/UnitySettings.h"
 #include "test_utils.h"
 
 using namespace nux;
@@ -55,7 +54,6 @@
        pango_entry = entry->GetPangoEntry();
      }
 
-     unity::Settings unity_settings_;
      dash::Style dash_style_;
      nux::ObjectPtr<TextInputMock> entry;
      StaticCairoText* hint;

=== modified file 'tests/test_unity_settings.cpp'
--- tests/test_unity_settings.cpp	2013-07-09 04:29:25 +0000
+++ tests/test_unity_settings.cpp	2014-03-21 23:09:12 +0000
@@ -19,34 +19,46 @@
  */
 
 #include <gio/gio.h>
-#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
+#include "UnitySettings.h"
 #include "test_utils.h"
-#include "unity-shared/UnitySettings.h"
 
+#include <NuxCore/Logger.h>
 #include <UnityCore/GLibWrapper.h>
 
 namespace
 {
-
-class TestUnitySettings : public testing::Test
-{
-public:
+struct SigReceiver : sigc::trackable
+{
+  typedef testing::NiceMock<SigReceiver> Nice;
+
+  SigReceiver(std::shared_ptr<unity::Settings> const& settings)
+  {
+   settings->form_factor.changed.connect(sigc::mem_fun(this, &SigReceiver::FormFactorChanged));
+  }
+
+  MOCK_CONST_METHOD1(FormFactorChanged, void(unity::FormFactor));
+};
+
+struct TestUnitySettings : testing::Test
+{
   unity::glib::Object<GSettings> gsettings;
-  std::unique_ptr<unity::Settings> unity_settings;
+  std::shared_ptr<unity::Settings> unity_settings;
+  SigReceiver::Nice sig_receiver;
 
-  void SetUp()
+  TestUnitySettings()
+   : gsettings(g_settings_new("com.canonical.Unity"))
+   , unity_settings(std::make_shared<unity::Settings>())
+   , sig_receiver(unity_settings)
   {
-    Utils::init_gsettings_test_environment();
-    gsettings = g_settings_new("com.canonical.Unity");
     g_settings_set_enum(gsettings, "form-factor", static_cast<int>(unity::FormFactor::DESKTOP));
-
-    unity_settings.reset(new unity::Settings);
   }
 
-  void TearDown()
+  ~TestUnitySettings()
   {
-    Utils::reset_gsettings_test_environment();
+    sig_receiver.notify_callbacks();
+    g_settings_reset(gsettings, "form-factor");
   }
 };
 
@@ -60,7 +72,7 @@
 
 TEST_F(TestUnitySettings, GetFormFactor)
 {
-  EXPECT_EQ(unity_settings->form_factor(), unity::FormFactor::DESKTOP);
+  ASSERT_NE(unity_settings->form_factor(), unity::FormFactor::NETBOOK);
 
   g_settings_set_enum(gsettings, "form-factor", static_cast<int>(unity::FormFactor::NETBOOK));
   EXPECT_EQ(unity_settings->form_factor(), unity::FormFactor::NETBOOK);
@@ -68,42 +80,24 @@
 
 TEST_F(TestUnitySettings, FormFactorChangedSignal_Extern)
 {
-  bool signal_received = false;
-  unity::FormFactor new_form_factor;
-  unity_settings->form_factor.changed.connect([&](unity::FormFactor form_factor) {
-    signal_received = true;
-    new_form_factor = form_factor;
-  });
+  EXPECT_CALL(sig_receiver, FormFactorChanged(unity::FormFactor::NETBOOK));
 
   g_settings_set_enum(gsettings, "form-factor", static_cast<int>(unity::FormFactor::NETBOOK));
-  Utils::WaitUntilMSec(signal_received);
-  EXPECT_EQ(new_form_factor, unity::FormFactor::NETBOOK);
 }
 
 TEST_F(TestUnitySettings, FormFactorChangedSignal_Extern_OtherKeys)
 {
-  bool signal_received = false;
-  unity_settings->form_factor.changed.connect([&](unity::FormFactor form_factor) {
-    signal_received = true;
-  });
+  EXPECT_CALL(sig_receiver, FormFactorChanged(testing::_)).Times(0);
 
   g_settings_set_int(gsettings, "minimize-count", 0);
   Utils::WaitForTimeoutMSec(100);
-  EXPECT_FALSE(signal_received);
 }
 
 TEST_F(TestUnitySettings, FormFactorChangedSignal_Inter)
 {
-  bool signal_received = false;
-  unity::FormFactor new_form_factor;
-  unity_settings->form_factor.changed.connect([&](unity::FormFactor form_factor) {
-    signal_received = true;
-    new_form_factor = form_factor;
-  });
+  EXPECT_CALL(sig_receiver, FormFactorChanged(unity::FormFactor::NETBOOK));
 
   unity_settings->form_factor = unity::FormFactor::NETBOOK;
-  Utils::WaitUntilMSec(signal_received);
-  EXPECT_EQ(new_form_factor, unity::FormFactor::NETBOOK);
 }
 
 }

=== modified file 'tests/test_unity_window_view.cpp'
--- tests/test_unity_window_view.cpp	2013-11-16 11:44:23 +0000
+++ tests/test_unity_window_view.cpp	2014-03-21 23:09:12 +0000
@@ -19,7 +19,6 @@
 
 #include <gmock/gmock.h>
 #include "UnityWindowView.h"
-#include "UnitySettings.h"
 #include "WindowManager.h"
 #include <Nux/VLayout.h>
 
@@ -51,7 +50,6 @@
     nux::Geometry background_geo_;
   };
 
-  Settings settings;
   testing::NiceMock<MockUnityWindowView> view;
 };
 

=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_volume_launcher_icon.cpp	2014-03-21 23:09:12 +0000
@@ -20,7 +20,6 @@
 #include <gmock/gmock.h>
 using namespace testing;
 
-#include "unity-shared/UnitySettings.h"
 
 #include "DevicesSettings.h"
 #include "VolumeLauncherIcon.h"
@@ -78,7 +77,6 @@
     return *menuitem;
   }
 
-  unity::Settings u_settings_;
   MockVolume::Ptr volume_;
   MockDevicesSettings::Ptr settings_;
   MockDeviceNotificationDisplay::Ptr notifications_;

=== modified file 'tests/test_window_buttons.cpp'
--- tests/test_window_buttons.cpp	2013-10-14 17:36:51 +0000
+++ tests/test_window_buttons.cpp	2014-03-21 23:09:12 +0000
@@ -23,7 +23,6 @@
 #include <Nux/Nux.h>
 #include "PanelStyle.h"
 #include "test_standalone_wm.h"
-#include "UnitySettings.h"
 #include "unity-shared/WindowButtons.h"
 #include "unity-shared/WindowButtonPriv.h"
 
@@ -60,7 +59,6 @@
     MOCK_METHOD0(QueueDraw, void());
   };
 
-  Settings settings;
   panel::Style panel_style;
   testing::NiceMock<MockWindowButtons> wbuttons;
   testwrapper::StandaloneWM wm;
@@ -163,7 +161,6 @@
     MOCK_METHOD0(QueueDraw, void());
   };
 
-  Settings settings;
   panel::Style panel_style;
   testing::NiceMock<MockWindowButton> button;
 };

=== added file 'tools/migration-scripts/02_unity_setup_text_scale_factor'
--- tools/migration-scripts/02_unity_setup_text_scale_factor	1970-01-01 00:00:00 +0000
+++ tools/migration-scripts/02_unity_setup_text_scale_factor	2014-03-21 23:09:12 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 Canonical
+#
+# Authors:
+#  Marco Trevisan <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gi.repository import Gio
+import os,sys
+
+GNOME_UI_SETTINGS = "org.gnome.desktop.interface";
+GNOME_UI_SETTINGS_PATH = "/org/gnome/desktop/interface/"
+GNOME_TEXT_SCALE_FACTOR = "text-scaling-factor";
+
+if GNOME_UI_SETTINGS not in Gio.Settings.list_schemas():
+    print("No gnome desktop interface schemas found, no migration needed")
+    sys.exit(0)
+
+ui_settings = Gio.Settings(schema=GNOME_UI_SETTINGS, path=GNOME_UI_SETTINGS_PATH)
+text_scale_factor = ui_settings.get_double(GNOME_TEXT_SCALE_FACTOR)
+
+# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+# ui_settings.set_int(GNOME_TEXT_SCALE_FACTOR, text_scale_factor)
+from subprocess import Popen, PIPE, STDOUT
+p = Popen(("dconf load "+GNOME_UI_SETTINGS_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+p.communicate(input="[/]\n"+GNOME_TEXT_SCALE_FACTOR+"={}".format(text_scale_factor).encode('utf-8'))

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2013-08-15 22:30:55 +0000
+++ unity-shared/DashStyle.cpp	2014-03-21 23:09:12 +0000
@@ -108,9 +108,8 @@
 } // anon namespace
 
 
-class Style::Impl
+struct Style::Impl : sigc::trackable
 {
-public:
   Impl(Style* owner);
   ~Impl();
 
@@ -165,6 +164,7 @@
                           nux::ButtonVisualState state);
 
   void Refresh();
+  void UpdateFormFactor(FormFactor);
   void OnFontChanged(GtkSettings* object, GParamSpec* pspec);
 
   // Members
@@ -293,11 +293,13 @@
                       (gtk_settings_get_default(),
                        "notify::gtk-font-name",
                        sigc::mem_fun(this, &Impl::OnFontChanged)));
-  signal_manager_.Add(new glib::Signal<void, GtkSettings*, GParamSpec*>
-                      (gtk_settings_get_default(),
-                       "notify::gtk-xft-dpi",
-                       sigc::mem_fun(this, &Impl::OnFontChanged)));
+
+  auto& settings = Settings::Instance();
+  settings.font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::Refresh)));
+  settings.form_factor.changed.connect(sigc::mem_fun(this, &Impl::UpdateFormFactor));
+
   Refresh();
+  UpdateFormFactor(settings.form_factor());
 
   // create fallback font-options
   default_font_options_ = cairo_font_options_create();
@@ -388,11 +390,7 @@
   cairo_t* cr = util_cg.GetInternalContext();
 
   glib::String font_description;
-  int dpi = 0;
-  ::g_object_get(settings,
-                 "gtk-font-name", &font_description,
-                 "gtk-xft-dpi", &dpi,
-                 NULL);
+  ::g_object_get(settings, "gtk-font-name", &font_description, nullptr);
   PangoFontDescription* desc = ::pango_font_description_from_string(font_description);
   ::pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
   ::pango_font_description_set_size(desc, 9 * PANGO_SCALE);
@@ -405,8 +403,7 @@
 
   GdkScreen* screen = ::gdk_screen_get_default();
   ::pango_cairo_context_set_font_options(cxt, ::gdk_screen_get_font_options(screen));
-  float pango_scale = PANGO_SCALE;
-  ::pango_cairo_context_set_resolution(cxt, dpi / pango_scale);
+  ::pango_cairo_context_set_resolution(cxt, 96.0 * Settings::Instance().font_scaling());
   ::pango_layout_context_changed(layout);
 
   PangoRectangle log_rect;
@@ -419,12 +416,15 @@
   pango_font_description_free(desc);
 }
 
-
 void Style::Impl::OnFontChanged(GtkSettings* object, GParamSpec* pspec)
 {
   Refresh();
 }
 
+void Style::Impl::UpdateFormFactor(FormFactor form_factor)
+{
+  owner_->always_maximised = (form_factor == FormFactor::NETBOOK || form_factor == FormFactor::TV);
+}
 
 Style::Style()
   : always_maximised(false)
@@ -438,15 +438,6 @@
   {
     style_instance = this;
   }
-
-  auto formfactor_lambda = [this] (FormFactor)
-  {
-    FormFactor formfactor = Settings::Instance().form_factor();
-    always_maximised = (formfactor == FormFactor::NETBOOK || formfactor == FormFactor::TV); 
-  };
-
-  Settings::Instance().form_factor.changed.connect(formfactor_lambda);
-  formfactor_lambda(FormFactor());
 }
 
 Style::~Style ()
@@ -1384,7 +1375,6 @@
   PangoFontDescription* desc     = NULL;
   PangoContext*         pangoCtx = NULL;
   PangoRectangle        inkRect  = {0, 0, 0, 0};
-  int                   dpi      = 0;
   char*                 fontName = NULL;
   GdkScreen*            screen   = gdk_screen_get_default();  // is not ref'ed
   GtkSettings*          settings = gtk_settings_get_default();// is not ref'ed
@@ -1423,17 +1413,7 @@
     pango_cairo_context_set_font_options(pangoCtx,
                                          gdk_screen_get_font_options(screen));
 
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
-  }
+  pango_cairo_context_set_resolution(pangoCtx, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
   pango_layout_get_extents(layout, &inkRect, NULL);
 
@@ -1461,7 +1441,6 @@
   PangoLayout*          layout      = NULL;
   PangoFontDescription* desc        = NULL;
   PangoContext*         pangoCtx    = NULL;
-  int                   dpi         = 0;
   GdkScreen*            screen      = gdk_screen_get_default();   // not ref'ed
   GtkSettings*          settings    = gtk_settings_get_default(); // not ref'ed
   gchar*                fontName    = NULL;
@@ -1480,7 +1459,7 @@
 
   g_object_get(settings, "gtk-font-name", &fontName, NULL);
   if (!fontName)
-    desc = pango_font_description_from_string("Sans 10");
+    desc = pango_font_description_from_string("Ubuntu 10");
   else
     desc = pango_font_description_from_string(fontName);
 
@@ -1543,17 +1522,7 @@
     pango_cairo_context_set_font_options(pangoCtx,
                                          gdk_screen_get_font_options(screen));
 
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
-  }
+  pango_cairo_context_set_resolution(pangoCtx, 96.0 * Settings::Instance().font_scaling());
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
   cairo_set_source_rgba(cr, color);

=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp	2014-02-28 17:40:25 +0000
+++ unity-shared/DecorationStyle.cpp	2014-03-21 23:09:12 +0000
@@ -157,6 +157,7 @@
     parent_->integrated_menus = false;
     parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();
     parent_->font = glib::String(GetSettingValue<gchar*>("gtk-font-name")).Str();
+    parent_->font_scale = 1.0;
     SetTitleFont();
 
     UpdateTitlePangoContext(parent_->title_font);
@@ -185,14 +186,12 @@
       LOG_INFO(logger) << "gtk-font-name changed to " << parent_->font();
     });
 
-    signals_.Add<void, GtkSettings*, GParamSpec*>(settings, "notify::gtk-xft-dpi", [this] (GtkSettings*, GParamSpec*) {
-      title_pango_ctx_ = gdk_pango_context_get_for_screen(gdk_screen_get_default());
-      menu_item_pango_ctx_ = gdk_pango_context_get_for_screen(gdk_screen_get_default());
+    parent_->font_scale.changed.connect([this] (bool scale) {
       UpdateTitlePangoContext(parent_->title_font);
       UpdateMenuItemPangoContext(parent_->font);
       gtk_style_context_invalidate(ctx_);
       parent_->theme.changed.emit(parent_->theme());
-      LOG_INFO(logger) << "gtk-xft-dpi changed to " << GetSettingValue<int>("gtk-xft-dpi");
+      LOG_INFO(logger) << "font scale changed to " << scale;
     });
 
     signals_.Add<void, GSettings*, gchar*>(settings_, "changed::" + FONT_KEY, [this] (GSettings*, gchar*) {
@@ -255,6 +254,7 @@
     std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font.c_str()), pango_font_description_free);
     pango_context_set_font_description(ctx, desc.get());
     pango_context_set_language(ctx, gtk_get_default_language());
+    pango_cairo_context_set_resolution(ctx, 96.0 * parent_->font_scale());
   }
 
   void UpdateTitlePangoContext(std::string const& font)
@@ -508,9 +508,9 @@
 
     nux::Size extents;
     pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
-    pango_layout_set_height(layout, (h > 0) ? h * PANGO_SCALE : -1);
+    pango_layout_set_height(layout, (h >= 0) ? h * PANGO_SCALE : -1);
 
-    if (extents.width > w)
+    if (w >= 0 && extents.width > w)
     {
       double out_pixels = extents.width - w;
       double fading_width = std::min<double>(title_fade_, out_pixels);
@@ -528,7 +528,7 @@
     }
     else
     {
-      pango_layout_set_width(layout, w * PANGO_SCALE);
+      pango_layout_set_width(layout, (w >= 0) ? w * PANGO_SCALE : -1);
       gtk_render_layout(ctx_, cr, 0, 0, layout);
     }
 
@@ -571,8 +571,8 @@
       pango_attr_list_unref(text_attribs);
     }
 
-    pango_layout_set_width(layout, w * PANGO_SCALE);
-    pango_layout_set_height(layout, (h > 0) ? h * PANGO_SCALE : -1);
+    pango_layout_set_width(layout, (w >= 0) ? w * PANGO_SCALE : -1);
+    pango_layout_set_height(layout, (h >= 0) ? h * PANGO_SCALE : -1);
     gtk_render_layout(ctx_, cr, 0, 0, layout);
 
     gtk_style_context_restore(ctx_);

=== modified file 'unity-shared/DecorationStyle.h'
--- unity-shared/DecorationStyle.h	2014-02-28 17:30:20 +0000
+++ unity-shared/DecorationStyle.h	2014-03-21 23:09:12 +0000
@@ -99,6 +99,7 @@
   nux::Property<std::string> title_font;
   nux::Property<bool> integrated_menus;
   nux::Property<unsigned> grab_wait;
+  nux::Property<double> font_scale;
 
   decoration::Border const& Border() const;
   decoration::Border const& InputBorder() const;

=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp	2013-11-14 03:00:29 +0000
+++ unity-shared/IconLoader.cpp	2014-03-21 23:09:12 +0000
@@ -35,6 +35,7 @@
 #include <UnityCore/GTKWrapper.h>
 
 #include "unity-shared/Timer.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -313,10 +314,8 @@
         PangoContext* pango_context = NULL;
         GdkScreen* screen = gdk_screen_get_default(); // not ref'ed
         glib::String font;
-        int dpi = -1;
 
         g_object_get(gtk_settings_get_default(), "gtk-font-name", &font, NULL);
-        g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
         cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
         layout = pango_cairo_create_layout(cr);
         std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
@@ -345,10 +344,8 @@
         pango_layout_set_markup(layout, escaped_text, -1);
 
         pango_context = pango_layout_get_context(layout);  // is not ref'ed
-        pango_cairo_context_set_font_options(pango_context,
-                                             gdk_screen_get_font_options(screen));
-        pango_cairo_context_set_resolution(pango_context,
-                                           dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
+        pango_cairo_context_set_font_options(pango_context, gdk_screen_get_font_options(screen));
+        pango_cairo_context_set_resolution(pango_context, 96.0 * Settings::Instance().font_scaling());
         pango_layout_context_changed(layout);
 
         // find proper font size
@@ -923,11 +920,7 @@
   cairo_t* cr = util_cg.GetInternalContext();
 
   glib::String font;
-  int dpi = 0;
-  g_object_get(settings,
-                 "gtk-font-name", &font,
-                 "gtk-xft-dpi", &dpi,
-                 NULL);
+  g_object_get(settings, "gtk-font-name", &font, nullptr);
   std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
   pango_font_description_set_weight(desc.get(), PANGO_WEIGHT_BOLD);
   pango_font_description_set_size(desc.get(), FONT_SIZE * PANGO_SCALE);
@@ -939,7 +932,7 @@
   PangoContext* cxt = pango_layout_get_context(layout);
   GdkScreen* screen = gdk_screen_get_default();
   pango_cairo_context_set_font_options(cxt, gdk_screen_get_font_options(screen));
-  pango_cairo_context_set_resolution(cxt, dpi / (double) PANGO_SCALE);
+  pango_cairo_context_set_resolution(cxt, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
 
   PangoRectangle log_rect;

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2014-02-25 04:59:37 +0000
+++ unity-shared/StaticCairoText.cpp	2014-03-21 23:09:12 +0000
@@ -36,12 +36,13 @@
 #include <UnityCore/GLibWrapper.h>
 
 #include "CairoTexture.h"
+#include "UnitySettings.h"
 
 using namespace nux;
 
 namespace unity
 {
-struct StaticCairoText::Impl
+struct StaticCairoText::Impl : sigc::trackable
 {
   Impl(StaticCairoText* parent, std::string const& text);
   ~Impl();
@@ -128,8 +129,8 @@
   GtkSettings* settings = gtk_settings_get_default();  // not ref'ed
   g_signal_connect(settings, "notify::gtk-font-name",
                    (GCallback)FontChanged, this);
-  g_signal_connect(settings, "notify::gtk-xft-dpi",
-                   (GCallback)FontChanged, this);
+
+  Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::OnFontChanged)));
 }
 
 StaticCairoText::Impl::~Impl()
@@ -552,9 +553,7 @@
   PangoLayout*          layout   = NULL;
   PangoFontDescription* desc     = NULL;
   PangoContext*         pangoCtx = NULL;
-  int                   dpi      = 0;
   GdkScreen*            screen   = gdk_screen_get_default();    // is not ref'ed
-  GtkSettings*          settings = gtk_settings_get_default();  // is not ref'ed
 
   if (!need_new_extent_cache_)
   {
@@ -581,19 +580,8 @@
   pango_layout_set_spacing(layout, line_spacing_ * PANGO_SCALE);
 
   pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pangoCtx,
-                                       gdk_screen_get_font_options(screen));
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
-  }
+  pango_cairo_context_set_font_options(pangoCtx, gdk_screen_get_font_options(screen));
+  pango_cairo_context_set_resolution(pangoCtx, 96.0 * Settings::Instance().font_scaling());
   pango_layout_context_changed(layout);
 
   PangoRectangle ink_rect, logic_rect;
@@ -721,9 +709,7 @@
   PangoLayout*          layout     = NULL;
   PangoFontDescription* desc       = NULL;
   PangoContext*         pangoCtx   = NULL;
-  int                   dpi        = 0;
   GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
-  GtkSettings*          settings   = gtk_settings_get_default();  // not ref'ed
 
   std::string text = text_.substr(texture->start_index, texture->length);
 
@@ -746,22 +732,11 @@
   SetAttributes(layout);
 
   pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pangoCtx,
-                                       gdk_screen_get_font_options(screen));
-  g_object_get(settings, "gtk-xft-dpi", &dpi, NULL);
-  if (dpi == -1)
-  {
-    // use some default DPI-value
-    pango_cairo_context_set_resolution(pangoCtx, 96.0f);
-  }
-  else
-  {
-    pango_cairo_context_set_resolution(pangoCtx,
-                                       (float) dpi / (float) PANGO_SCALE);
-  }
+  pango_cairo_context_set_font_options(pangoCtx, gdk_screen_get_font_options(screen));
+  pango_cairo_context_set_resolution(pangoCtx, 96.0 * Settings::Instance().font_scaling());
+  pango_layout_context_changed(layout);
 
   Size result;
-  pango_layout_context_changed(layout);
   pango_layout_get_pixel_size(layout, &result.width, &result.height);
 
   if (std::ceil(result.width * scale_) > parent_->GetMaximumWidth())

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-03-19 13:22:07 +0000
+++ unity-shared/UScreen.cpp	2014-03-21 23:09:12 +0000
@@ -36,10 +36,10 @@
   size_changed_signal_.Connect(screen_, "size-changed", sigc::mem_fun(this, &UScreen::Changed));
   monitors_changed_signal_.Connect(screen_, "monitors-changed", sigc::mem_fun(this, &UScreen::Changed));
   proxy_.Connect("PrepareForSleep", [this] (GVariant* data) { 
-    bool val;
+    gboolean val;
     g_variant_get(data, "(b)", &val);
     if (!val)
-      resuming.emit(); 
+      resuming.emit();
   });
 
   Refresh();

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-02-28 16:56:19 +0000
+++ unity-shared/UnitySettings.cpp	2014-03-21 23:09:12 +0000
@@ -37,12 +37,26 @@
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
-const std::string SCALE_FACTOR = "scale-factor";
 const std::string LIM_KEY = "integrated-menus";
+
 const std::string LIM_SETTINGS = "com.canonical.Unity.IntegratedMenus";
 const std::string CLICK_MOVEMENT_THRESHOLD = "click-movement-threshold";
 const std::string DOUBLE_CLICK_WAIT = "double-click-wait";
-const std::string UI_SETTINGS = "com.ubuntu.user-interface";
+
+const std::string UI_SETTINGS = "com.canonical.Unity.Interface";
+const std::string TEXT_SCALE_FACTOR = "text-scale-factor";
+const std::string CURSOR_SCALE_FACTOR = "cursor-scale-factor";
+const std::string APP_SCALE_MONITOR = "app-scale-factor-monitor";
+const std::string APP_USE_MAX_SCALE = "app-fallback-to-maximum-scale-factor";
+
+const std::string UBUNTU_UI_SETTINGS = "com.ubuntu.user-interface";
+const std::string SCALE_FACTOR = "scale-factor";
+
+const std::string GNOME_UI_SETTINGS = "org.gnome.desktop.interface";
+const std::string GNOME_FONT_NAME = "font-name";
+const std::string GNOME_CURSOR_SIZE = "cursor-size";
+const std::string GNOME_SCALE_FACTOR = "scaling-factor";
+const std::string GNOME_TEXT_SCALE_FACTOR = "text-scaling-factor";
 
 const int DEFAULT_LAUNCHER_WIDTH = 64;
 const double DEFAULT_DPI = 96.0f;
@@ -56,42 +70,85 @@
 public:
   Impl(Settings* owner)
     : parent_(owner)
-    , gsettings_(g_settings_new(SETTINGS_NAME.c_str()))
-    , ubuntu_settings_(g_settings_new(UI_SETTINGS.c_str()))
     , usettings_(g_settings_new(SETTINGS_NAME.c_str()))
     , lim_settings_(g_settings_new(LIM_SETTINGS.c_str()))
+    , ui_settings_(g_settings_new(UI_SETTINGS.c_str()))
+    , ubuntu_ui_settings_(g_settings_new(UBUNTU_UI_SETTINGS.c_str()))
+    , gnome_ui_settings_(g_settings_new(GNOME_UI_SETTINGS.c_str()))
     , launcher_widths_(monitors::MAX, DEFAULT_LAUNCHER_WIDTH)
     , cached_form_factor_(FormFactor::DESKTOP)
+    , cursor_scale_(1.0)
     , cached_double_click_activate_(true)
+    , changing_gnome_settings_(false)
     , lowGfx_(false)
   {
+    parent_->form_factor.SetGetterFunction(sigc::mem_fun(this, &Impl::GetFormFactor));
+    parent_->form_factor.SetSetterFunction(sigc::mem_fun(this, &Impl::SetFormFactor));
+    parent_->double_click_activate.SetGetterFunction(sigc::mem_fun(this, &Impl::GetDoubleClickActivate));
+
     for (unsigned i = 0; i < monitors::MAX; ++i)
-      em_converters_.push_back(std::make_shared<EMConverter>());
+      em_converters_.emplace_back(std::make_shared<EMConverter>());
 
     CacheFormFactor();
     CacheDoubleClickActivate();
-    UpdateEMConverter();
+
+    // The order is important here, DPI is the last thing to be updated
     UpdateLimSetting();
+    UpdateTextScaleFactor();
+    UpdateCursorScaleFactor();
+    UpdateFontSize();
+    UpdateDPI();
 
-    UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateEMConverter))));
+    UScreen::GetDefault()->changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateDPI))));
 
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + FORM_FACTOR, [this] (GSettings*, const gchar*) {
       CacheFormFactor();
-      parent_->form_factor.changed.emit(cached_form_factor_);
     });
 
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + DOUBLE_CLICK_ACTIVATE, [this] (GSettings*, const gchar*) {
       CacheDoubleClickActivate();
       parent_->double_click_activate.changed.emit(cached_double_click_activate_);
     });
-    signals_.Add<void, GSettings*, const gchar*>(ubuntu_settings_, "changed::" + SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
-      UpdateEMConverter();
-    });
 
     signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
     });
 
+    signals_.Add<void, GSettings*, const gchar*>(ubuntu_ui_settings_, "changed::" + SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(ui_settings_, "changed::" + TEXT_SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
+      UpdateTextScaleFactor();
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(ui_settings_, "changed::" + CURSOR_SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
+      UpdateCursorScaleFactor();
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(ui_settings_, "changed::" + APP_SCALE_MONITOR, [this] (GSettings*, const gchar* t) {
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(ui_settings_, "changed::" + APP_USE_MAX_SCALE, [this] (GSettings*, const gchar* t) {
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(gnome_ui_settings_, "changed::" + GNOME_FONT_NAME, [this] (GSettings*, const gchar* t) {
+      UpdateFontSize();
+      UpdateDPI();
+    });
+
+    signals_.Add<void, GSettings*, const gchar*>(gnome_ui_settings_, "changed::" + GNOME_TEXT_SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
+      if (!changing_gnome_settings_)
+      {
+        double new_scale_factor = g_settings_get_double(gnome_ui_settings_, GNOME_TEXT_SCALE_FACTOR.c_str());
+        g_settings_set_double(ui_settings_, TEXT_SCALE_FACTOR.c_str(), new_scale_factor);
+      }
+    });
+
     signals_.Add<void, GSettings*, const gchar*>(lim_settings_, "changed", [this] (GSettings*, const gchar*) {
       UpdateLimSetting();
     });
@@ -100,6 +157,7 @@
   void CacheFormFactor()
   {
     int raw_from_factor = g_settings_get_enum(usettings_, FORM_FACTOR.c_str());
+    FormFactor new_form_factor;
 
     if (raw_from_factor == 0) //Automatic
     {
@@ -107,11 +165,17 @@
       int primary_monitor = uscreen->GetMonitorWithMouse();
       auto const& geo = uscreen->GetMonitorGeometry(primary_monitor);
 
-      cached_form_factor_ = geo.height > 799 ? FormFactor::DESKTOP : FormFactor::NETBOOK;
+      new_form_factor = geo.height > 799 ? FormFactor::DESKTOP : FormFactor::NETBOOK;
     }
     else
     {
-      cached_form_factor_ = static_cast<FormFactor>(raw_from_factor);
+      new_form_factor = static_cast<FormFactor>(raw_from_factor);
+    }
+
+    if (new_form_factor != cached_form_factor_)
+    {
+      cached_form_factor_ = new_form_factor;
+      parent_->form_factor.changed.emit(cached_form_factor_);
     }
   }
 
@@ -135,7 +199,7 @@
   bool SetFormFactor(FormFactor factor)
   {
     g_settings_set_enum(usettings_, FORM_FACTOR.c_str(), static_cast<int>(factor));
-    return true;
+    return false;
   }
 
   bool GetDoubleClickActivate() const
@@ -148,30 +212,14 @@
     gint font_size;
     PangoFontDescription* desc;
 
-    desc = pango_font_description_from_string(decoration::Style::Get()->font().c_str());
+    glib::String font_name(g_settings_get_string(gnome_ui_settings_, GNOME_FONT_NAME.c_str()));
+    desc = pango_font_description_from_string(font_name);
     font_size = pango_font_description_get_size(desc);
     pango_font_description_free(desc);
 
     return font_size / 1024;
   }
 
-  int GetDPI(glib::Variant const& dict, int monitor) const
-  {
-    auto* uscreen = UScreen::GetDefault();
-
-    if (monitor < 0 || monitor >= uscreen->GetPluggedMonitorsNumber())
-      return DEFAULT_DPI;
-
-    auto const& monitor_name = UScreen::GetDefault()->GetMonitorName(monitor);
-    double ui_scale = 1.0f;
-    int value;
-
-    if (g_variant_lookup(dict, monitor_name.c_str(), "i", &value))
-      ui_scale = static_cast<double>(value)/8.0f;
-
-    return (DEFAULT_DPI * ui_scale);
-  }
-
   void UpdateFontSize()
   {
     int font_size = GetFontSize();
@@ -180,41 +228,91 @@
       em->SetFontSize(font_size);
   }
 
+  void UpdateTextScaleFactor()
+  {
+    parent_->font_scaling = g_settings_get_double(ui_settings_, TEXT_SCALE_FACTOR.c_str());
+    decoration::Style::Get()->font_scale = parent_->font_scaling();
+  }
+
+  void UpdateCursorScaleFactor()
+  {
+    cursor_scale_ = g_settings_get_double(ui_settings_, CURSOR_SCALE_FACTOR.c_str());
+  }
+
   void UpdateDPI()
   {
+    auto* uscreen = UScreen::GetDefault();
+    double min_scale = 4.0;
+    double max_scale = 0.0;
+    bool any_changed = false;
+
     glib::Variant dict;
-    g_settings_get(ubuntu_settings_, SCALE_FACTOR.c_str(), "@a{si}", &dict);
-    bool any_changed = false;
-
-    for (unsigned i = 0; i < em_converters_.size(); ++i)
+    g_settings_get(ubuntu_ui_settings_, SCALE_FACTOR.c_str(), "@a{si}", &dict);
+
+    glib::String app_target_monitor(g_settings_get_string(ui_settings_, APP_SCALE_MONITOR.c_str()));
+    double app_target_scale = 0;
+
+    for (unsigned monitor = 0; monitor < em_converters_.size(); ++monitor)
     {
-      int dpi = GetDPI(dict, i);
-
-      if (em_converters_[i]->SetDPI(dpi))
+      int dpi = DEFAULT_DPI;
+
+      if (monitor < uscreen->GetMonitors().size())
+      {
+        auto const& monitor_name = uscreen->GetMonitorName(monitor);
+        double ui_scale = 1.0f;
+        int value;
+
+        if (g_variant_lookup(dict, monitor_name.c_str(), "i", &value))
+          ui_scale = static_cast<double>(value)/8.0f;
+
+        if (app_target_monitor.Str() == monitor_name)
+          app_target_scale = ui_scale;
+
+        dpi = DEFAULT_DPI * ui_scale;
+        min_scale = std::min(min_scale, ui_scale);
+        max_scale = std::max(max_scale, ui_scale);
+      }
+
+      if (em_converters_[monitor]->SetDPI(dpi))
         any_changed = true;
     }
 
+    if (app_target_scale == 0)
+      app_target_scale = (g_settings_get_boolean(ui_settings_, APP_USE_MAX_SCALE.c_str())) ? max_scale : min_scale;
+
+    UpdateAppsScaling(app_target_scale);
+
     if (any_changed)
       parent_->dpi_changed.emit();
   }
 
-  void UpdateEMConverter()
+  void UpdateAppsScaling(double scale)
   {
-    UpdateFontSize();
-    UpdateDPI();
+    changing_gnome_settings_ = true;
+    unsigned integer_scaling = std::max<unsigned>(1, scale);
+    double point_scaling = scale / static_cast<double>(integer_scaling);
+    double text_scale_factor = parent_->font_scaling() * point_scaling;
+    glib::Variant default_cursor_size(g_settings_get_default_value(gnome_ui_settings_, GNOME_CURSOR_SIZE.c_str()), glib::StealRef());
+    int cursor_size = std::round(default_cursor_size.GetInt32() * point_scaling * cursor_scale_);
+    g_settings_set_int(gnome_ui_settings_, GNOME_CURSOR_SIZE.c_str(), cursor_size);
+    g_settings_set_uint(gnome_ui_settings_, GNOME_SCALE_FACTOR.c_str(), integer_scaling);
+    g_settings_set_double(gnome_ui_settings_, GNOME_TEXT_SCALE_FACTOR.c_str(), text_scale_factor);
+    changing_gnome_settings_ = false;
   }
 
   Settings* parent_;
-  glib::Object<GSettings> gsettings_;
-  glib::Object<GSettings> ubuntu_settings_;
   glib::Object<GSettings> usettings_;
   glib::Object<GSettings> lim_settings_;
-  glib::Object<GSettings> gnome_settings_;
+  glib::Object<GSettings> ui_settings_;
+  glib::Object<GSettings> ubuntu_ui_settings_;
+  glib::Object<GSettings> gnome_ui_settings_;
   glib::SignalManager signals_;
   std::vector<EMConverter::Ptr> em_converters_;
   std::vector<int> launcher_widths_;
   FormFactor cached_form_factor_;
+  double cursor_scale_;
   bool cached_double_click_activate_;
+  bool changing_gnome_settings_;
   bool lowGfx_;
 };
 
@@ -229,17 +327,10 @@
   if (settings_instance)
   {
     LOG_ERROR(logger) << "More than one unity::Settings created.";
-  }
-
-  else
-  {
-    form_factor.SetGetterFunction(sigc::mem_fun(*pimpl, &Impl::GetFormFactor));
-    form_factor.SetSetterFunction(sigc::mem_fun(*pimpl, &Impl::SetFormFactor));
-
-    double_click_activate.SetGetterFunction(sigc::mem_fun(*pimpl, &Impl::GetDoubleClickActivate));
-
-    settings_instance = this;
-  }
+    return;
+  }
+
+  settings_instance = this;
 }
 
 Settings::~Settings()

=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2014-02-25 22:10:53 +0000
+++ unity-shared/UnitySettings.h	2014-03-21 23:09:12 +0000
@@ -54,6 +54,7 @@
   nux::ROProperty<bool> double_click_activate;
   nux::Property<unsigned> lim_movement_thresold;
   nux::Property<unsigned> lim_double_click_wait;
+  nux::Property<double> font_scaling;
 
   sigc::signal<void> dpi_changed;