font work: Use Cabin and Cantatell fonts instead of Ubuntu and Ubuntu Light.

7 files changed, 13 insertions, 11 deletions

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index 1c7d19a..70b4e38 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -38,7 +38,7 @@
       <summary>Icon theme to use</summary>
     </key>
     <key name="font-name" type="s">
-      <default>'Cantarell 11'</default>
+      <default>'Cabin 11'</default>
       <summary>Font to use</summary>
     </key>
     <key name="xft-antialias" type="b">
diff --git a/debian/control b/debian/control
index c9b5211..f53e89a 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Package: arctica-greeter
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         fonts-cantarell,
+         fonts-cabin,
          lightdm,
          network-manager,
          upstart-bin,
diff --git a/src/dash-button.vala b/src/dash-button.vala
index c562a28..5a486f7 100644
--- a/src/dash-button.vala
+++ b/src/dash-button.vala
@@ -29,7 +29,7 @@ public class DashButton : FlatButton, Fadable
         set
         {
             _text = value;
-            text_label.set_markup ("<span font=\"Ubuntu 13\">%s</span>".printf (value));
+            text_label.set_markup ("<span font=\"Cabin 13\">%s</span>".printf (value));
         }
     }
 
diff --git a/src/dash-entry.vala b/src/dash-entry.vala
index b8aab69..f39d2cc 100644
--- a/src/dash-entry.vala
+++ b/src/dash-entry.vala
@@ -23,7 +23,7 @@ extern bool gtk_style_context_lookup_color (Gtk.StyleContext ctx, string color_n
 
 public class DashEntry : Gtk.Entry, Fadable
 {
-    public static string font = "Ubuntu 14";
+    public static string font = "Cabin 14";
     public signal void respond ();
 
     public string constant_placeholder_text { get; set; }
@@ -163,7 +163,7 @@ public class DashEntry : Gtk.Entry, Fadable
 
         /* Draw text */
         var layout = create_pango_layout (constant_placeholder_text);
-        layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 13"));
+        layout.set_font_description (Pango.FontDescription.from_string ("Cabin 13"));
         Pango.cairo_show_layout (c, layout);
 
         c.restore ();
diff --git a/src/prompt-box.vala b/src/prompt-box.vala
index 50c46d1..ecc7ef1 100644
--- a/src/prompt-box.vala
+++ b/src/prompt-box.vala
@@ -172,7 +172,7 @@ public class PromptBox : FadableBox
         name_grid.hexpand = true;
 
         name_label = new FadingLabel ("");
-        name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
+        name_label.override_font (Pango.FontDescription.from_string ("Cabin 13"));
         name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         name_label.valign = Gtk.Align.START;
         name_label.vexpand = true;
@@ -236,7 +236,7 @@ public class PromptBox : FadableBox
         small_name_grid.column_spacing = 4;
 
         small_name_label = new FadingLabel ("");
-        small_name_label.override_font (Pango.FontDescription.from_string ("Ubuntu 13"));
+        small_name_label.override_font (Pango.FontDescription.from_string ("Cabin 13"));
         small_name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         small_name_label.yalign = 0.5f;
         small_name_label.xalign = 0.0f;
@@ -436,7 +436,7 @@ public class PromptBox : FadableBox
     {
         var label = new FadingLabel (text);
 
-        label.override_font (Pango.FontDescription.from_string ("Ubuntu 10"));
+        label.override_font (Pango.FontDescription.from_string ("Cabin 10"));
 
         Gdk.RGBA color = { 1.0f, 1.0f, 1.0f, 1.0f };
         if (is_error)
diff --git a/src/shutdown-dialog.vala b/src/shutdown-dialog.vala
index cccd534..bf0a2b4 100644
--- a/src/shutdown-dialog.vala
+++ b/src/shutdown-dialog.vala
@@ -104,7 +104,7 @@ public class ShutdownDialog : Gtk.Fixed
         {
             var title_label = new Gtk.Label (_("Shut Down"));
             title_label.visible = true;
-            title_label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 15"));
+            title_label.override_font (Pango.FontDescription.from_string ("Cantarell 15"));
             title_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
             title_label.set_alignment (0.0f, 0.5f);
             vbox.pack_start (title_label, false, false, 0);
@@ -138,7 +138,7 @@ public class ShutdownDialog : Gtk.Fixed
 
         var label = new Gtk.Label (text);
         label.set_line_wrap (true);
-        label.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+        label.override_font (Pango.FontDescription.from_string ("Cantarell 12"));
         label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f });
         label.set_alignment (0.0f, 0.5f);
         label.visible = true;
@@ -558,7 +558,7 @@ private class DialogButton : Gtk.Button
         if (l != null)
         {
             l.visible = true;
-            l.override_font (Pango.FontDescription.from_string ("Ubuntu Light 12"));
+            l.override_font (Pango.FontDescription.from_string ("Cantarell 12"));
             l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f });
             l.override_color (Gtk.StateFlags.FOCUSED, { 1.0f, 1.0f, 1.0f, 1.0f });
             l.override_color (Gtk.StateFlags.ACTIVE, { 1.0f, 1.0f, 1.0f, 1.0f });
diff --git a/src/toggle-box.vala b/src/toggle-box.vala
index 1862951..f93cdea 100644
--- a/src/toggle-box.vala
+++ b/src/toggle-box.vala
@@ -94,7 +94,7 @@ public class ToggleBox : Gtk.Box
         }
 
         var label = new Gtk.Label (null);
-        label.set_markup ("<span font=\"Ubuntu 13\">%s</span>".printf (name));
+        label.set_markup ("<span font=\"Cabin 13\">%s</span>".printf (name));
         label.halign = Gtk.Align.START;
         hbox.pack_start (label, true, true, 0);