* - Small code fixes and additions

lainsce · Sep 14, 2017 · 49050c7 · 49050c7
1 parent 3f1442a
commit 49050c7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -24,6 +24,9 @@ namespace Quilter {
         public Widgets.SourceView view;
 
         // HeaderBar
+        public Gtk.HeaderBar toolbar;
+        public File file;
+
         private Gtk.Menu menu;
         private Gtk.Button new_button;
         private Gtk.Button open_button;
@@ -33,20 +36,17 @@ namespace Quilter {
         private Widgets.Preferences preferences_dialog;
         private Widgets.Cheatsheet cheatsheet_dialog;
 
-        public Gtk.HeaderBar toolbar;
-        public File file;
-
         private bool _is_fullscreen;
     	public bool is_fullscreen {
-    		set {
-    			_is_fullscreen = value;
-
-    			if (_is_fullscreen)
-    				fullscreen ();
-    			else
-    				unfullscreen ();
-    		}
     		get { return _is_fullscreen; }
+            set {
+                _is_fullscreen = value;
+
+                if (_is_fullscreen)
+                    fullscreen ();
+                else
+                    unfullscreen ();
+            }
     	}
 
         public MainWindow (Gtk.Application application) {

diff --git a/src/Services/FileUtils.vala b/src/Services/FileUtils.vala
@@ -16,8 +16,6 @@
  */
 
 namespace Quilter.Services.FileUtils {
-    public MainWindow window;
-
     public void save_file (File file, uint8[] buffer) throws Error {
         var output = new DataOutputStream (file.create(FileCreateFlags.REPLACE_DESTINATION));
         long written = 0;
@@ -112,10 +110,10 @@ namespace Quilter.Services.FileUtils {
             string text;
 
             try {
-                var settings = AppSettings.get_default ();
-                window.toolbar.subtitle = settings.last_file;
                 GLib.FileUtils.get_contents (file.get_path (), out text);
                 Widgets.SourceView.buffer.text = text;
+                var settings = AppSettings.get_default ();
+                settings.last_file = file.get_path ();
             } catch (Error e) {
                 warning ("Error: %s", e.message);
             }

diff --git a/src/Widgets/Preferences.vala b/src/Widgets/Preferences.vala
@@ -57,6 +57,7 @@ namespace Quilter.Widgets {
             use_custom_font.halign = Gtk.Align.START;
             main_settings.schema.bind ("use-system-font", use_custom_font, "active", SettingsBindFlags.INVERT_BOOLEAN);
             select_font = new Gtk.FontButton ();
+            select_font.use_font = true;
             select_font.hexpand = true;
             main_settings.schema.bind ("font", select_font, "font-name", SettingsBindFlags.DEFAULT);
             main_settings.schema.bind ("use-system-font", select_font, "sensitive", SettingsBindFlags.INVERT_BOOLEAN);