Merge branch 'sunweaver-mr/drop-big-font-code'

Attributes GH PR #82: https://github.com/ArcticaProject/arctica-greeter/pull/82

3 files changed, 6 insertions, 54 deletions

diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index 3fcd956..cd10529 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -154,10 +154,6 @@
       <default>false</default>
       <summary>Whether to use a high contrast theme</summary>
     </key>
-    <key name="big-font" type="b">
-      <default>false</default>
-      <summary>Whether to use big fonts throughout the application</summary>
-    </key>
     <key name="screen-reader" type="b">
       <default>false</default>
       <summary>Whether to enable the screen reader</summary>
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 16b8a16..fc6f0cc 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -34,7 +34,6 @@ public class ArcticaGreeter : Object
     public Gtk.Window? pKeyboardWindow { get; set; default = null; }
     public bool test_mode { get; construct; default = false; }
     public bool test_highcontrast { get; construct; default = false; }
-    public bool test_bigfont { get; construct; default = false; }
     private string state_file;
     private KeyFile state;
     private DBusServer pServer;
@@ -127,12 +126,10 @@ public class ArcticaGreeter : Object
      * additionally avoid changing it in later calls of our constructor.
      */
     public ArcticaGreeter (bool test_mode_ = false,
-                           bool test_highcontrast_ = false,
-                           bool test_bigfont_ = false)
+                           bool test_highcontrast_ = false)
     {
         Object (test_mode: test_mode_,
-                test_highcontrast: test_highcontrast_,
-                test_bigfont: test_bigfont_
+                test_highcontrast: test_highcontrast_
         );
     }
 
@@ -429,10 +426,8 @@ public class ArcticaGreeter : Object
         var agsettings = new AGSettings ();
         if (!test_mode) {
             agsettings.high_contrast = !(!(agsettings.high_contrast));
-            agsettings.big_font = !(!(agsettings.big_font));
         } else {
             agsettings.high_contrast = test_highcontrast;
-            agsettings.big_font = test_bigfont;
         }
 
         /*
@@ -459,17 +454,6 @@ public class ArcticaGreeter : Object
 
             return true;
         });
-        Timeout.add_full (GLib.Priority.HIGH_IDLE, 302, () => {
-            var agsettings_intimer = new AGSettings ();
-            /*
-            if (0 == GLib.Random.int_range (0, 10)) {
-                debug ("Syncing up big font value via timer: %s", agsettings_intimer.big_font.to_string ());
-            }
-            */
-            switch_font (agsettings_intimer.big_font);
-
-            return true;
-        });
 
         return false;
     }
@@ -660,11 +644,6 @@ public class ArcticaGreeter : Object
         // debug ("Time passed: %" + int64.FORMAT + " s, %" + int64.FORMAT + " ms, %" + int64.FORMAT + " us", time_diff_sec, time_diff_msec, time_diff_usec);
     }
 
-    public void switch_font (bool big)
-    {
-        iterate_children_generic (main_window, switch_generic, "big_font", big);
-    }
-
     private Gdk.FilterReturn focus_upon_map (Gdk.XEvent gxevent, Gdk.Event event)
     {
         var xevent = (X.Event*)gxevent;
@@ -961,7 +940,6 @@ public class ArcticaGreeter : Object
         bool do_show_version = false;
         bool do_test_mode = false;
         bool do_test_highcontrast = false;
-        bool do_test_bigfont = false;
 
         OptionEntry versionOption = { "version", 'v', 0, OptionArg.NONE, ref do_show_version,
                 /* Help string for command line --version flag */
@@ -972,17 +950,16 @@ public class ArcticaGreeter : Object
         OptionEntry highcontrastOption =  { "test-highcontrast", 0, 0, OptionArg.NONE, ref do_test_highcontrast,
                 /* Help string for command line --test-highcontrast flag */
                 N_("Run in test mode with a11y highcontrast theme enabled"), null };
-        OptionEntry bigfontOption =  { "test-bigfont", 0, 0, OptionArg.NONE, ref do_test_bigfont,
-                /* Help string for command line --test-bigfont flag */
-                N_("Run in test mode with a11y big font feature enabled"), null };
         OptionEntry nullOption = { null };
-        OptionEntry[] options = { versionOption, testOption, highcontrastOption, bigfontOption, nullOption };
+        OptionEntry[] options = { versionOption, testOption, highcontrastOption, nullOption };
 
         debug ("Loading command line options");
         var c = new OptionContext (/* Arguments and description for --help text */
                                    _("- Arctica Greeter"));
+
         c.add_main_entries (options, Config.GETTEXT_PACKAGE);
         c.add_group (Gtk.get_option_group (true));
+
         try
         {
             c.parse (ref args);
@@ -1020,9 +997,6 @@ public class ArcticaGreeter : Object
             if (do_test_highcontrast) {
                 debug ("Switching on highcontrast theme for test mode");
             }
-            if (do_test_bigfont) {
-                debug ("Switching on big font feature for test mode");
-            }
         }
 
         if (!do_test_mode) {
@@ -1144,7 +1118,7 @@ public class ArcticaGreeter : Object
             settings.set ("gtk-xft-rgba", value, null);
 
         debug ("Creating Arctica Greeter");
-        var greeter = new ArcticaGreeter (do_test_mode, do_test_highcontrast, do_test_bigfont);
+        var greeter = new ArcticaGreeter (do_test_mode, do_test_highcontrast);
         greeter.go();
 
         Pid nmapplet_pid = 0;
diff --git a/src/settings.vala b/src/settings.vala
index efc72f2..c5d59ca 100644
--- a/src/settings.vala
+++ b/src/settings.vala
@@ -52,7 +52,6 @@ public class AGSettings : Object
     public const string KEY_ONSCREEN_KEYBOARD_THEME = "onscreen-keyboard-theme";
     public const string KEY_HIGH_CONTRAST_ONSCREEN_KEYBOARD_THEME = "high-contrast-onscreen-keyboard-theme";
     public const string KEY_HIGH_CONTRAST = "high-contrast";
-    public const string KEY_BIG_FONT = "big-font";
     public const string KEY_SCREEN_READER = "screen-reader";
     public const string KEY_PLAY_READY_SOUND = "play-ready-sound";
     public const string KEY_INDICATORS = "indicators";
@@ -202,23 +201,6 @@ public class AGSettings : Object
         }
     }
 
-    public bool big_font {
-        get {
-            return this.big_font_;
-        }
-
-        set {
-            this.big_font_ = value;
-
-            /* Also sync back to dconf, so that this state is persistent. */
-            set_boolean (AGSettings.KEY_BIG_FONT, value);
-
-            var greeter = new ArcticaGreeter ();
-            greeter.switch_font (value);
-        }
-    }
-
     private const string SCHEMA = "org.ArcticaProject.arctica-greeter";
     private bool high_contrast_ = AGSettings.get_boolean (AGSettings.KEY_HIGH_CONTRAST);
-    private bool big_font_ = AGSettings.get_boolean (AGSettings.KEY_BIG_FONT);
 }