Bug 460694 - Make use of emptytext attribute in search textboxes (Password Manager part). r+sr=Neil.
authorstefanh@inbox.com
Sun, 01 Feb 2009 01:04:30 +0100
changeset 1815 926acda4ef6d81da41bd84c14edd10c7a43360db
parent 1814 198927925c9148ec5f98f69826976ee7bb6c9c3e
child 1816 a62cac409cf7fc103c22462a9db8d90be0c9be2f
push idunknown
push userunknown
push dateunknown
bugs460694
Bug 460694 - Make use of emptytext attribute in search textboxes (Password Manager part). r+sr=Neil.
suite/common/passwordManager.xul
suite/locales/en-US/chrome/common/passwordManager.dtd
--- a/suite/common/passwordManager.xul
+++ b/suite/common/passwordManager.xul
@@ -65,31 +65,35 @@
           src="chrome://passwordmgr/content/passwordManager.js"/>
   <script type="application/javascript"
           src="chrome://passwordmgr/content/passwordManagerExceptions.js"/>
   <script type="application/javascript"
           src="chrome://help/content/contextHelp.js"/>
 
   <stringbundle id="signonBundle"
                 src="chrome://passwordmgr/locale/passwordmgr.properties"/>
+  <keyset>
+    <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
+    <key key="&focusSearch1.key;" modifiers="accel"
+         oncommand="if (document.getElementById('signonsTab').selected) FocusFilterBox();"/>
+  </keyset>
 
   <tabbox flex="1">
     <tabs>
       <tab id="signonsTab" label="&tab.signonsstored.label;"/>
       <tab id="signonsitesTab" label="&tab.signonsnotstored.label;"/>
     </tabs>
     <tabpanels flex="1">
 
     <!-- saved signons -->
       <vbox id="savedsignons" flex="1">
         <!-- filter -->
         <hbox align="center">
-          <label value="&filter.label;" accesskey="&filter.accesskey;"
-                 control="filter"/>
           <textbox id="filter" flex="1" type="search"
+                   emptytext="&search.emptytext;"
                    oncommand="_filterPasswords();"/>
         </hbox>
         <separator class="thin"/>
 
         <description control="signonsTree" id="signonsIntro"/>
         <separator class="thin"/>
         <tree id="signonsTree" flex="1"
               style="height: 20em;" hidecolumnpicker="true"
--- a/suite/locales/en-US/chrome/common/passwordManager.dtd
+++ b/suite/locales/en-US/chrome/common/passwordManager.dtd
@@ -33,8 +33,9 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY      windowtitle.label               "Password Manager">
 <!ENTITY      tab.signonsstored.label         "Passwords Saved">
 <!ENTITY      tab.signonsnotstored.label      "Passwords Never Saved">
+<!ENTITY      search.emptytext                "Search">