Updating branch refs/heads/master to 308e45a88af48b099f4e1d83e270f8dfd00efa9c (commit) from dff4b0e205d7ccfcd5ddb565a3536f1daa207a9d (commit)
commit 308e45a88af48b099f4e1d83e270f8dfd00efa9c Author: Nick Schermer <n...@xfce.org> Date: Sun Jan 2 12:30:25 2011 +0100 Make sure default values are applied in dialogs. It seems the default value in the glade files is not applied if set before upper/lower property :@. Also drop some weird defaults and ditch page-size. .../accessibility-dialog.glade | 16 ++++++-------- .../appearance-settings/appearance-dialog.glade | 2 +- dialogs/keyboard-settings/keyboard-dialog.glade | 9 ++----- dialogs/mouse-settings/mouse-dialog.glade | 21 ++++++++----------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dialogs/accessibility-settings/accessibility-dialog.glade b/dialogs/accessibility-settings/accessibility-dialog.glade index 271776c..9e57791 100644 --- a/dialogs/accessibility-settings/accessibility-dialog.glade +++ b/dialogs/accessibility-settings/accessibility-dialog.glade @@ -4,53 +4,51 @@ <!-- interface-requires libxfce4ui 4.5 --> <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="slow-keys-delay"> - <property name="value">500.00000000022351</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> - <property name="page_size">10</property> </object> <object class="GtkAdjustment" id="bounce-keys-delay"> - <property name="value">500.00000000022351</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> - <property name="page_size">10</property> </object> <object class="GtkAdjustment" id="mouse-emulation-delay"> - <property name="value">150.00000000022351</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="value">2.2351741811588166e-10</property> <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">999.99999999977649</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> diff --git a/dialogs/appearance-settings/appearance-dialog.glade b/dialogs/appearance-settings/appearance-dialog.glade index 656914a..2880429 100644 --- a/dialogs/appearance-settings/appearance-dialog.glade +++ b/dialogs/appearance-settings/appearance-dialog.glade @@ -4,9 +4,9 @@ <!-- interface-requires libxfce4ui 4.5 --> <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="xft_custom_dpi"> - <property name="value">96</property> <property name="lower">48</property> <property name="upper">1000</property> + <property name="value">96</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> diff --git a/dialogs/keyboard-settings/keyboard-dialog.glade b/dialogs/keyboard-settings/keyboard-dialog.glade index 37fa86d..e30c10b 100644 --- a/dialogs/keyboard-settings/keyboard-dialog.glade +++ b/dialogs/keyboard-settings/keyboard-dialog.glade @@ -4,28 +4,25 @@ <!-- interface-requires libxfce4ui 4.5 --> <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="xkb_key_repeat_delay"> - <property name="value">500</property> <property name="lower">10</property> <property name="upper">1000</property> + <property name="value">500</property> <property name="step_increment">1</property> <property name="page_increment">10</property> - <property name="page_size">1</property> </object> <object class="GtkAdjustment" id="xkb_key_repeat_rate"> - <property name="value">20</property> <property name="lower">1</property> <property name="upper">250</property> + <property name="value">20</property> <property name="step_increment">1</property> <property name="page_increment">10</property> - <property name="page_size">1</property> </object> <object class="GtkAdjustment" id="net_cursor_blink_time"> - <property name="value">1000</property> <property name="lower">100</property> <property name="upper">2000</property> + <property name="value">1000</property> <property name="step_increment">1</property> <property name="page_increment">10</property> - <property name="page_size">1</property> </object> <object class="XfceTitledDialog" id="keyboard-settings-dialog"> <property name="title" translatable="yes">Keyboard</property> diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade index 226ba82..68d1ff3 100644 --- a/dialogs/mouse-settings/mouse-dialog.glade +++ b/dialogs/mouse-settings/mouse-dialog.glade @@ -4,47 +4,44 @@ <!-- interface-requires libxfce4ui 4.5 --> <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="mouse-acceleration"> - <property name="value">2</property> - <property name="lower">0.10000000000000001</property> + <property name="lower">0.1</property> <property name="upper">10</property> - <property name="step_increment">0.10000000000000001</property> + <property name="value">2</property> + <property name="step_increment">0.1</property> <property name="page_increment">1</property> </object> <object class="GtkAdjustment" id="mouse-threshold"> - <property name="value">4</property> <property name="lower">1</property> <property name="upper">30</property> + <property name="value">4</property> <property name="step_increment">1</property> <property name="page_increment">5</property> - <property name="page_size">5</property> </object> <object class="GtkAdjustment" id="mouse-dnd-threshold"> - <property name="value">8</property> <property name="lower">1</property> <property name="upper">50</property> + <property name="value">8</property> <property name="step_increment">1</property> <property name="page_increment">10</property> - <property name="page_size">10</property> </object> <object class="GtkAdjustment" id="mouse-double-click-time"> - <property name="value">250</property> <property name="lower">100</property> <property name="upper">2000</property> + <property name="value">250</property> <property name="step_increment">1</property> <property name="page_increment">100</property> - <property name="page_size">100</property> </object> <object class="GtkAdjustment" id="mouse-double-click-distance"> - <property name="value">4</property> + <property name="lower">0</property> <property name="upper">20</property> + <property name="value">4</property> <property name="step_increment">1</property> <property name="page_increment">5</property> - <property name="page_size">5</property> </object> <object class="GtkAdjustment" id="adjustment6"> - <property name="value">24</property> <property name="lower">16</property> <property name="upper">48</property> + <property name="value">24</property> <property name="step_increment">1</property> <property name="page_increment">11</property> </object> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits