[california] Revert "Bind non-keypad +/-/* to font adjustments: Bug #731244"



commit 3b1e1584f850602bf9feb2d3589f4e0fdae4a9b3
Author: Jim Nelson <jim yorba org>
Date:   Wed Sep 24 13:28:38 2014 -0700

    Revert "Bind non-keypad +/-/* to font adjustments: Bug #731244"
    
    This reverts commit 540c64894e2c381c39f0e5e6bd720f609eddd901 due to
    introducing (aggravating) bug #737236.

 src/host/host-main-window.vala |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/host/host-main-window.vala b/src/host/host-main-window.vala
index 04a829f..dcbfb84 100644
--- a/src/host/host-main-window.vala
+++ b/src/host/host-main-window.vala
@@ -61,15 +61,15 @@ public class MainWindow : Gtk.ApplicationWindow {
     
     private const string DETAILED_ACTION_INCREASE_FONT = "win.increase-font";
     private const string ACTION_INCREASE_FONT = "increase-font";
-    private const string[] ACCELS_INCREASE_FONT = { "KP_Add", "plus", "equal", null };
+    private const string ACCEL_INCREASE_FONT = "KP_Add";
     
     private const string DETAILED_ACTION_DECREASE_FONT = "win.decrease-font";
     private const string ACTION_DECREASE_FONT = "decrease-font";
-    private const string[] ACCELS_DECREASE_FONT = { "KP_Subtract", "minus", null };
+    private const string ACCEL_DECREASE_FONT = "KP_Subtract";
     
     private const string DETAILED_ACTION_RESET_FONT = "win.reset-font";
     private const string ACTION_RESET_FONT = "reset-font";
-    private const string[] ACCELS_RESET_FONT = { "KP_Multiply", "asterisk", null };
+    private const string ACCEL_RESET_FONT = "KP_Multiply";
     
     private static const ActionEntry[] action_entries = {
         { ACTION_QUICK_CREATE_EVENT, on_quick_create_event },
@@ -124,10 +124,9 @@ public class MainWindow : Gtk.ApplicationWindow {
             null);
         Application.instance.add_accelerator(ACCEL_MONTH, DETAILED_ACTION_MONTH, null);
         Application.instance.add_accelerator(ACCEL_WEEK, DETAILED_ACTION_WEEK, null);
-        
-        Application.instance.set_accels_for_action(DETAILED_ACTION_INCREASE_FONT, ACCELS_INCREASE_FONT);
-        Application.instance.set_accels_for_action(DETAILED_ACTION_DECREASE_FONT, ACCELS_DECREASE_FONT);
-        Application.instance.set_accels_for_action(DETAILED_ACTION_RESET_FONT, ACCELS_RESET_FONT);
+        Application.instance.add_accelerator(ACCEL_INCREASE_FONT, DETAILED_ACTION_INCREASE_FONT, null);
+        Application.instance.add_accelerator(ACCEL_DECREASE_FONT, DETAILED_ACTION_DECREASE_FONT, null);
+        Application.instance.add_accelerator(ACCEL_RESET_FONT, DETAILED_ACTION_RESET_FONT, null);
         
         // view stack settings
         view_stack.homogeneous = true;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]