[Pkg-mozext-commits] [gcontactsync] 07/17: Issue #50 - Preferences textbox access keys not working

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 96b1204aa870c78a1452818da249d6172deee283
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Mon Sep 1 19:20:58 2014 -0500

    Issue #50 - Preferences textbox access keys not working
    
    Conflicts:
    	src/locale/en-US/options.dtd
---
 src/content/options.xul      | 22 +++++++++++-----------
 src/locale/en-US/options.dtd |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/content/options.xul b/src/content/options.xul
index 846b40a..e1585a0 100644
--- a/src/content/options.xul
+++ b/src/content/options.xul
@@ -94,7 +94,7 @@
           </columns>
           <rows>
             <row align="center">
-              <label control="refreshInterval"
+              <label control="refreshIntervalBox"
                      value="&refreshInterval.value;"
                      accesskey="&refreshInterval.accesskey;"/>
               <textbox preference="refreshInterval"
@@ -136,11 +136,11 @@
           </columns>
           <rows>
             <row align="center">
-              <label control="accountDelay"
+              <label control="accountDelayBox"
                      value="&accountDelay.value;"
                      accesskey="&accountDelay.accesskey;"/>
               <textbox preference="accountDelay"
-                       id="accountDelay"
+                       id="accountDelayBox"
                        maxlength="6"
                        maxwidth="60"/>
             </row>
@@ -238,11 +238,11 @@
           </columns>
           <rows>
             <row align="center">
-              <label control="backupInterval"
+              <label control="backupIntervalBox"
                      value="&backupInterval.value;"
                      accesskey="&backupInterval.accesskey;"/>
               <textbox preference="backupInterval"
-                       id="backupInterval"
+                       id="backupIntervalBox"
                        maxlength="6"
                        maxwidth="60"/>
             </row>
@@ -269,36 +269,36 @@
                        maxwidth="60"/>
             </row>
             <row align="center">
-              <label control="confirmDeleteThreshold"
+              <label control="confirmDeleteThresholdBox"
                      value="&confirmDeleteThreshold.value;"
                      accesskey="&confirmDeleteThreshold.accesskey;"/>
             </row>
             <row align="center">
               <textbox preference="confirmDeleteThreshold"
-                       id="confirmDeleteThreshold"
+                       id="confirmDeleteThresholdBox"
                        maxlength="5"
                        maxwidth="60"/>
             </row>
             <row align="center">
-              <label control="httpRequestTimeout"
+              <label control="httpRequestTimeoutBox"
                      value="&httpRequestTimeout.value;"
                      accesskey="&httpRequestTimeout.accesskey;"/>
             </row>
             <row align="center">
               <textbox preference="httpRequestTimeout"
-                       id="httpRequestTimeout"
+                       id="httpRequestTimeoutBox"
                        maxlength="5"
                        maxwidth="60"/>
             </row>
             <row align="center">
-              <label control="httpRequestDelay"
+              <label control="httpRequestDelayBox"
                      value="&httpRequestDelay.value;"
                      accesskey="&httpRequestDelay.accesskey;"/>
             </row>
             <row align="center">
               <hbox>
                 <textbox preference="httpRequestDelay"
-                         id="httpRequestDelay"
+                         id="httpRequestDelayBox"
                          maxlength="5"
                          maxwidth="60"/>
                 <button id="throttleTest"
diff --git a/src/locale/en-US/options.dtd b/src/locale/en-US/options.dtd
index 0a4dd27..f49fc90 100644
--- a/src/locale/en-US/options.dtd
+++ b/src/locale/en-US/options.dtd
@@ -34,7 +34,7 @@
 <!ENTITY enableMenuLinks.label "Add some links (Error Report Form, FAQ, etc.) to the gContactSync Menu">
 <!ENTITY enableMenuLinks.accesskey "l">
 <!ENTITY addReset.label "Add Replace to and Replace from Server links to the Address Book context menu">
-<!ENTITY addReset.accesskey "R">
+<!ENTITY addReset.accesskey "A">
 <!ENTITY abResults.label "Contacts List">
 <!ENTITY phoneColLabels.label "Rename the phone column labels">
 <!ENTITY phoneColLabels.accesskey "R">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git