Bug 873298 - Change "Filter scripts" string to "Search scripts" in debugger; r=harth
authorSumedh Shekhar <sumedhhere@gmail.com>
Fri, 19 Jul 2013 13:47:23 -0700
changeset 151597 6e8ad2f613ffc16b0e0040bfc82970a36d9b079c
parent 151596 24b00dfb20de69913706c4f4831ce803830f0916
child 151598 57a91fe1cebc0020762a17b52a6ce1df85527d22
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersharth
bugs873298
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 873298 - Change "Filter scripts" string to "Search scripts" in debugger; r=harth
browser/devtools/debugger/debugger-toolbar.js
browser/devtools/debugger/debugger.xul
browser/locales/en-US/chrome/browser/devtools/debugger.dtd
browser/locales/en-US/chrome/browser/devtools/debugger.properties
browser/themes/linux/devtools/debugger.css
browser/themes/osx/devtools/debugger.css
browser/themes/windows/devtools/debugger.css
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -702,16 +702,17 @@ FilterView.prototype = {
   /**
    * Initialization function, called when the debugger is started.
    */
   initialize: function() {
     dumpn("Initializing the FilterView");
 
     this._searchbox = document.getElementById("searchbox");
     this._searchboxHelpPanel = document.getElementById("searchbox-help-panel");
+    this._filterLabel = document.getElementById("filter-label");
     this._globalOperatorButton = document.getElementById("global-operator-button");
     this._globalOperatorLabel = document.getElementById("global-operator-label");
     this._functionOperatorButton = document.getElementById("function-operator-button");
     this._functionOperatorLabel = document.getElementById("function-operator-label");
     this._tokenOperatorButton = document.getElementById("token-operator-button");
     this._tokenOperatorLabel = document.getElementById("token-operator-label");
     this._lineOperatorButton = document.getElementById("line-operator-button");
     this._lineOperatorLabel = document.getElementById("line-operator-label");
@@ -732,16 +733,18 @@ FilterView.prototype = {
     this._searchbox.addEventListener("blur", this._onBlur, false);
 
     this._globalOperatorButton.setAttribute("label", SEARCH_GLOBAL_FLAG);
     this._functionOperatorButton.setAttribute("label", SEARCH_FUNCTION_FLAG);
     this._tokenOperatorButton.setAttribute("label", SEARCH_TOKEN_FLAG);
     this._lineOperatorButton.setAttribute("label", SEARCH_LINE_FLAG);
     this._variableOperatorButton.setAttribute("label", SEARCH_VARIABLE_FLAG);
 
+    this._filterLabel.setAttribute("value",
+      L10N.getFormatStr("searchPanelFilter", this._fileSearchKey));
     this._globalOperatorLabel.setAttribute("value",
       L10N.getFormatStr("searchPanelGlobal", this._globalSearchKey));
     this._functionOperatorLabel.setAttribute("value",
       L10N.getFormatStr("searchPanelFunction", this._filteredFunctionsKey));
     this._tokenOperatorLabel.setAttribute("value",
       L10N.getFormatStr("searchPanelToken", this._tokenSearchKey));
     this._lineOperatorLabel.setAttribute("value",
       L10N.getFormatStr("searchPanelLine", this._lineSearchKey));
@@ -775,17 +778,17 @@ FilterView.prototype = {
    */
   set target(aView) {
     let placeholder = "";
     switch (aView) {
       case DebuggerView.ChromeGlobals:
         placeholder = L10N.getFormatStr("emptyChromeGlobalsFilterText", this._fileSearchKey);
         break;
       case DebuggerView.Sources:
-        placeholder = L10N.getFormatStr("emptyFilterText", this._fileSearchKey);
+        placeholder = L10N.getFormatStr("emptySearchText", this._fileSearchKey);
         break;
     }
     this._searchbox.setAttribute("placeholder", placeholder);
     this._target = aView;
   },
 
   /**
    * Gets the target container to be currently filtered.
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -305,18 +305,21 @@
   </vbox>
 
   <panel id="searchbox-help-panel"
          level="top"
          type="arrow"
          noautofocus="true"
          position="before_start">
     <vbox>
-      <label id="searchbox-panel-description"
-             value="&debuggerUI.searchPanelTitle;"/>
+      <hbox>
+        <label id="filter-label"/>
+      </hbox>
+      <label id="searchbox-panel-operators"
+             value="&debuggerUI.searchPanelOperators;"/>
       <hbox align="center">
         <button id="global-operator-button"
                 class="searchbox-panel-operator-button"
                 command="globalSearchCommand"/>
         <label id="global-operator-label"
                class="plain searchbox-panel-operator-label"/>
       </hbox>
       <hbox align="center">
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
@@ -46,19 +46,19 @@
 <!ENTITY debuggerUI.showOnlyEnum.key    "P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource      "Show original sources">
 <!ENTITY debuggerUI.showOriginalSource.key  "O">
 
-<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
-  -  appears in the filter panel popup as a description. -->
-<!ENTITY debuggerUI.searchPanelTitle    "Operators">
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
+  -  appears in the filter panel popup as a header for the operators part. -->
+<!ENTITY debuggerUI.searchPanelOperators    "Operators:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile          "Filter scripts">
 <!ENTITY debuggerUI.searchFile.key      "P">
 <!ENTITY debuggerUI.searchFile.altkey   "O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -68,29 +68,33 @@ noSourcesText=This page has no sources.
 # LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
 # sources menu when there are no matching scripts after filtering.
 noMatchingSourcesText=No matching sources.
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText=No matches found
 
-# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
-emptyFilterText=Filter scripts (%S)
+emptySearchText=Search scripts (%S)
 
 # LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
 # appears in the filter text box when it is empty and the chrome globals
 # container is selected.
 emptyChromeGlobalsFilterText=Filter chrome globals (%S)
 
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText=Filter variables
 
+# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the
+# filter panel popup for the filter scripts operation.
+searchPanelFilter=Filter scripts (%S)
+
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal=Search in all files (%S)
 
 # LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the
 # filter panel popup for the function search operation.
 searchPanelFunction=Search for function definition (%S)
 
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -98,18 +98,22 @@
 
 /* Searchbox and the search operations help panel */
 
 .devtools-searchinput {
   min-width: 220px;
   -moz-margin-start: 1px;
 }
 
-#searchbox-panel-description {
-  margin-top: 0;
+#filter-label {
+  -moz-margin-start: 2px;
+}
+
+#searchbox-panel-operators {
+  margin-top: 5px;
   margin-bottom: 8px;
   -moz-margin-start: 2px;
 }
 
 .searchbox-panel-operator-button {
   min-width: 26px;
   margin-top: 0;
   margin-bottom: 0;
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -100,18 +100,22 @@
 
 /* Searchbox and the search operations help panel */
 
 .devtools-searchinput {
   min-width: 220px;
   -moz-margin-start: 1px;
 }
 
-#searchbox-panel-description {
-  margin-top: 0;
+#filter-label {
+  -moz-margin-start: 2px;
+}
+
+#searchbox-panel-operators {
+  margin-top: 5px;
   margin-bottom: 8px;
   -moz-margin-start: 2px;
 }
 
 .searchbox-panel-operator-button {
   min-width: 26px;
   margin-top: 0;
   margin-bottom: 0;
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -98,18 +98,22 @@
 
 /* Searchbox and the search operations help panel */
 
 .devtools-searchinput {
   min-width: 220px;
   -moz-margin-start: 1px;
 }
 
-#searchbox-panel-description {
-  margin-top: 0;
+#filter-label {
+  -moz-margin-start: 2px;
+}
+
+#searchbox-panel-operators {
+  margin-top: 5px;
   margin-bottom: 8px;
   -moz-margin-start: 2px;
 }
 
 .searchbox-panel-operator-button {
   min-width: 26px;
   margin-top: 0;
   margin-bottom: 0;