[Xfce4-commits] <xfce4-settings:master> Add option to enable assistive technologies during login.

Nick Schermer noreply at xfce.org
Thu Feb 17 21:32:01 CET 2011


Updating branch refs/heads/master
         to 97f2823edcddaaf9b9d51d5f8e725779e7394e80 (commit)
       from 3cf812d8d732c5cab9151acf1c07511f8b76eeca (commit)

commit 97f2823edcddaaf9b9d51d5f8e725779e7394e80
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Feb 17 21:29:51 2011 +0100

    Add option to enable assistive technologies during login.
    
    Bit of an empty tab, but we probably also want to handle
    autostart there for screen readers and magnifiers.

 .../accessibility-dialog.glade                     |   61 ++++++++++++++++----
 dialogs/accessibility-settings/main.c              |   11 +++-
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/dialogs/accessibility-settings/accessibility-dialog.glade b/dialogs/accessibility-settings/accessibility-dialog.glade
index 9e57791..3d6c3d0 100644
--- a/dialogs/accessibility-settings/accessibility-dialog.glade
+++ b/dialogs/accessibility-settings/accessibility-dialog.glade
@@ -1,54 +1,53 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires libxfce4ui 4.5 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="slow-keys-delay">
+    <property name="value">500</property>
     <property name="lower">50</property>
     <property name="upper">1000</property>
-    <property name="value">500</property>
     <property name="step_increment">10</property>
     <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="bounce-keys-delay">
+    <property name="value">500</property>
     <property name="lower">50</property>
     <property name="upper">1000</property>
-    <property name="value">500</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="mouse-emulation-delay">
+    <property name="value">150</property>
     <property name="lower">1</property>
     <property name="upper">1000</property>
-    <property name="value">150</property>
     <property name="step_increment">10</property>
     <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="mouse-emulation-interval">
+    <property name="value">20</property>
     <property name="lower">10</property>
     <property name="upper">1000</property>
-    <property name="value">20</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="mouse-emulation-curve">
     <property name="lower">-1000</property>
     <property name="upper">1000</property>
-    <property name="value">0</property>
     <property name="step_increment">10</property>
     <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="mouse-emulation-max-speed">
+    <property name="value">1000</property>
     <property name="lower">1</property>
     <property name="upper">2000</property>
-    <property name="value">1000</property>
     <property name="step_increment">10</property>
     <property name="page_increment">100</property>
   </object>
   <object class="GtkAdjustment" id="mouse-emulation-time-to-max">
+    <property name="value">3000</property>
     <property name="lower">100</property>
     <property name="upper">10000</property>
-    <property name="value">3000</property>
     <property name="step_increment">10</property>
     <property name="page_increment">100</property>
   </object>
@@ -57,7 +56,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="icon_name">preferences-desktop-accessibility</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <property name="subtitle" translatable="yes">Configure keyboard and mouse accessibility</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
@@ -73,6 +71,43 @@
                 <property name="can_focus">True</property>
                 <property name="border_width">6</property>
                 <child>
+                  <object class="GtkVBox" id="vbox1">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkCheckButton" id="start-at">
+                        <property name="label" translatable="yes">_Enable assistive technologies</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="tooltip_text" translatable="yes">If enabled, the session manager will start the required applications for screen readers and magnifiers</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label17">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Assistive Technologies</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="border_width">12</property>
@@ -368,6 +403,9 @@
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label1">
@@ -376,6 +414,7 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
+                    <property name="position">1</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
@@ -668,7 +707,7 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child type="tab">
@@ -678,7 +717,7 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
diff --git a/dialogs/accessibility-settings/main.c b/dialogs/accessibility-settings/main.c
index fefc4ff..d6f217e 100644
--- a/dialogs/accessibility-settings/main.c
+++ b/dialogs/accessibility-settings/main.c
@@ -50,6 +50,7 @@ static GOptionEntry entries[] =
 
 /* global xfconf channel */
 static XfconfChannel *accessibility_channel = NULL;
+static XfconfChannel *session_channel = NULL;
 
 
 
@@ -68,6 +69,10 @@ accessibility_settings_dialog_configure_widgets (GtkBuilder *builder)
 {
     GObject *box, *object;
 
+    /* assistive technologies */
+    object = gtk_builder_get_object (builder, "start-at");
+    xfconf_g_property_bind (session_channel, "/general/StartAt", G_TYPE_BOOLEAN, object, "active");
+
     /* Sticky keys */
     object = gtk_builder_get_object (builder, "sticky-keys-enabled");
     box = gtk_builder_get_object (builder, "sticky-keys-box");
@@ -176,8 +181,9 @@ main (gint argc, gchar **argv)
         return EXIT_FAILURE;
     }
 
-    /* open the channel */
+    /* open the channels */
     accessibility_channel = xfconf_channel_new ("accessibility");
+    session_channel = xfconf_channel_new ("xfce4-session");
 
     /* hook to make sure the libxfce4ui library is linked */
     if (xfce_titled_dialog_get_type () == 0)
@@ -237,8 +243,9 @@ main (gint argc, gchar **argv)
     /* Release Builder */
     g_object_unref (G_OBJECT (builder));
 
-    /* release the channel */
+    /* release the channels */
     g_object_unref (G_OBJECT (accessibility_channel));
+    g_object_unref (G_OBJECT (session_channel));
 
     /* shutdown xfconf */
     xfconf_shutdown();



More information about the Xfce4-commits mailing list