Fix #22

gnunn1 · Jan 15, 2016 · f50ea9e · f50ea9e
1 parent a85f525
commit f50ea9e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/source/gx/terminix/preferences.d b/source/gx/terminix/preferences.d
@@ -14,6 +14,10 @@ import gio.Settings : GSettings = Settings;
 import gx.i18n.l10n;
 import gx.util.array;
 
+//Gnome Desktop Settings
+enum SETTINGS_DESKTOP_ID = "org.gnome.desktop.interface";
+enum SETTINGS_MONOSPACE_FONT_KEY = "monospace-font-name";
+
 //Preference Constants
 enum SETTINGS_ID = "com.gexperts.Terminix.Settings";
 enum SETTINGS_BASE_PATH = "/com/gexperts/Terminix";
@@ -53,7 +57,7 @@ enum SETTINGS_PROFILE_CURSOR_SHAPE_UNDERLINE_VALUE = "underline";
 enum SETTINGS_PROFILE_CURSOR_BLINK_MODE_KEY = "cursor-blink-mode";
 immutable string[] SETTINGS_PROFILE_CURSOR_BLINK_MODE_VALUES = ["system", "on", "off"];
 enum SETTINGS_PROFILE_USE_SYSTEM_FONT_KEY = "use-system-font";
-enum SETTINGS_PROFILE_SYSTEM_FONT_KEY = "font";
+enum SETTINGS_PROFILE_FONT_KEY = "font";
 
 enum SETTINGS_PROFILE_BG_COLOR_KEY = "background-color";
 enum SETTINGS_PROFILE_FG_COLOR_KEY = "foreground-color";

diff --git a/source/gx/terminix/profilewindow.d b/source/gx/terminix/profilewindow.d
@@ -214,7 +214,7 @@ private:
         //Font Selector
         FontButton fbFont = new FontButton();
         fbFont.setTitle(_("Choose A Terminal Font"));
-        gsProfile.bind(SETTINGS_PROFILE_SYSTEM_FONT_KEY, fbFont, "font-name", GSettingsBindFlags.DEFAULT);
+        gsProfile.bind(SETTINGS_PROFILE_FONT_KEY, fbFont, "font-name", GSettingsBindFlags.DEFAULT);
         gsProfile.bind(SETTINGS_PROFILE_USE_SYSTEM_FONT_KEY, fbFont, "sensitive", GSettingsBindFlags.GET | GSettingsBindFlags.NO_SENSITIVITY | GSettingsBindFlags
             .INVERT_BOOLEAN);
         bFont.add(fbFont);

diff --git a/source/gx/terminix/terminal/terminal.d b/source/gx/terminix/terminal/terminal.d
@@ -68,6 +68,8 @@ import gtk.TargetEntry;
 import gtk.Widget;
 import gtk.Window;
 
+import pango.PgFontDescription;
+
 import vte.Terminal : VTE = Terminal;
 import vtec.vtetypes;
 
@@ -204,6 +206,7 @@ private:
 
     GSettings gsProfile;
     GSettings gsShortcuts;
+    GSettings gsDesktop;
 
     /**
      * Create the user interface of the TerminalPane
@@ -687,6 +690,15 @@ private:
         case SETTINGS_PROFILE_TITLE_KEY:
             updateTitle();
             break;
+        case SETTINGS_PROFILE_USE_SYSTEM_FONT_KEY, SETTINGS_PROFILE_FONT_KEY:
+            PgFontDescription desc;
+            if (gsProfile.getBoolean(SETTINGS_PROFILE_USE_SYSTEM_FONT_KEY)) {
+                desc = PgFontDescription.fromString(SETTINGS_MONOSPACE_FONT_KEY);                
+            } else {
+                desc = PgFontDescription.fromString(gsProfile.getString(SETTINGS_PROFILE_FONT_KEY)); 
+            }
+            vte.setFont(desc);            
+            break;
         default:
             break;
         }
@@ -1033,6 +1045,12 @@ public:
         _profileUUID = profileUUID;
         gsProfile = prfMgr.getProfileSettings(profileUUID);
         gsShortcuts = new GSettings(SETTINGS_PROFILE_KEY_BINDINGS_ID);
+        gsDesktop = new GSettings(SETTINGS_DESKTOP_ID);
+        gsDesktop.addOnChanged(delegate(string key, GSettings) {
+            if (key == SETTINGS_MONOSPACE_FONT_KEY) {
+                applyPreference(SETTINGS_PROFILE_FONT_KEY);
+            }
+        });
         createUI();
         trace("Apply preferences");
         applyPreferences();