lightdm-gtk-greeter-team team mailing list archive

["Andrew P." <pan.pav.7c5@xxxxxxxxx>]

Andrew P. has proposed merging lp:~kalgasnik/lightdm-gtk-greeter/hotkeys into lp:lightdm-gtk-greeter.

Requested reviews:
  LightDM Gtk+ Greeter Development Team (lightdm-gtk-greeter-team)

For more details, see:
https://code.launchpad.net/~kalgasnik/lightdm-gtk-greeter/hotkeys/+merge/197100

Hotkeys for accessibility menu: F1, F2, F3
-- 
https://code.launchpad.net/~kalgasnik/lightdm-gtk-greeter/hotkeys/+merge/197100
Your team LightDM Gtk+ Greeter Development Team is requested to review the proposed merge of lp:~kalgasnik/lightdm-gtk-greeter/hotkeys into lp:lightdm-gtk-greeter.

=== modified file 'src/lightdm-gtk-greeter.glade'
--- src/lightdm-gtk-greeter.glade	2013-06-01 12:24:14 +0000
+++ src/lightdm-gtk-greeter.glade	2013-11-28 16:43:40 +0000
@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAccelGroup" id="a11y_accelgroup"/>
+  <object class="GtkActionGroup" id="a11y_actiongroup">
+    <child>
+      <object class="GtkAction" id="large_font_action">
+        <signal name="activate" handler="a11y_font_cb" object="large_font_menuitem" swapped="yes"/>
+      </object>
+      <accelerator key="F1"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="high_contrast_action">
+        <signal name="activate" handler="a11y_contrast_cb" object="high_contrast_menuitem" swapped="yes"/>
+      </object>
+      <accelerator key="F2"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="keyboard_action">
+        <signal name="activate" handler="a11y_keyboard_cb" object="keyboard_menuitem" swapped="yes"/>
+      </object>
+      <accelerator key="F3"/>
+    </child>
+  </object>
   <object class="GtkWindow" id="login_window">
     <property name="name">login_window</property>
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="decorated">False</property>
+    <accel-groups>
+      <group name="a11y_accelgroup"/>
+    </accel-groups>
     <child>
       <object class="GtkTable" id="table1">
         <property name="visible">True</property>
@@ -152,6 +176,9 @@
     <property name="name">panel_window</property>
     <property name="can_focus">False</property>
     <property name="decorated">False</property>
+    <accel-groups>
+      <group name="a11y_accelgroup"/>
+    </accel-groups>
     <child>
       <object class="GtkHButtonBox" id="buttonbox1">
         <property name="visible">True</property>
@@ -243,29 +270,33 @@
                   <object class="GtkMenu" id="a11y_menu">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="accel_group">a11y_accelgroup</property>
                     <child>
                       <object class="GtkCheckMenuItem" id="large_font_menuitem">
+                        <property name="use_action_appearance">False</property>
+                        <property name="related_action">large_font_action</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Large Font</property>
-                        <signal name="toggled" handler="a11y_font_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" id="high_contrast_menuitem">
+                        <property name="use_action_appearance">False</property>
+                        <property name="related_action">high_contrast_action</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">High Contrast</property>
-                        <signal name="toggled" handler="a11y_contrast_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" id="keyboard_menuitem">
+                        <property name="use_action_appearance">False</property>
+                        <property name="related_action">keyboard_action</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">On Screen Keyboard</property>
                         <property name="use_underline">True</property>
-                        <signal name="toggled" handler="a11y_keyboard_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>