Delta Between Two Patch Sets: chrome/content/ui/overlay.xul
Issue 5294633391226880:
issue 1435 - Port popup.html from Chrome/Safari/Opera to Firefox (Closed)
Left Patch Set:
Created Oct. 17, 2014, 11:23 a.m.
Right Patch Set:
Created Oct. 27, 2014, 9:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« chrome/content/ui/i18n.js ('k')
|
chrome/content/ui/popup.html » ('j')
|
chrome/content/ui/utils.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0"?> | 1 <?xml version="1.0"?> |
| 2 | 2 |
| 3 <!-- | 3 <!-- |
| 4 - This file is part of Adblock Plus <http://adblockplus.org/>, | 4 - This file is part of Adblock Plus <http://adblockplus.org/>, |
| 5 - Copyright (C) 2006-2014 Eyeo GmbH | 5 - Copyright (C) 2006-2014 Eyeo GmbH |
| 6 - | 6 - |
| 7 - Adblock Plus is free software: you can redistribute it and/or modify | 7 - Adblock Plus is free software: you can redistribute it and/or modify |
| 8 - it under the terms of the GNU General Public License version 3 as | 8 - it under the terms of the GNU General Public License version 3 as |
| 9 - published by the Free Software Foundation. | 9 - published by the Free Software Foundation. |
| 10 - | 10 - |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 <label id="abp-tooltip-filters-label" value="&filters.tooltip;" hidden="tr ue"/> | 42 <label id="abp-tooltip-filters-label" value="&filters.tooltip;" hidden="tr ue"/> |
| 43 <vbox id="abp-tooltip-filters" hidden="true"/> | 43 <vbox id="abp-tooltip-filters" hidden="true"/> |
| 44 <description id="abp-tooltip-more-filters" value="…" hidden="true"/> | 44 <description id="abp-tooltip-more-filters" value="…" hidden="true"/> |
| 45 </tooltip> | 45 </tooltip> |
| 46 </popupset> | 46 </popupset> |
| 47 | 47 |
| 48 <!-- Icon's context menu --> | 48 <!-- Icon's context menu --> |
| 49 <panel id="abp-status-popup" type="arrow"> | 49 <panel id="abp-status-popup" type="arrow"> |
| 50 <iframe id="abp-status-popup-browser" src="about:blank" flex="1"/> | 50 <iframe id="abp-status-popup-browser" src="about:blank" flex="1"/> |
| 51 </panel> | 51 </panel> |
| 52 | 52 |
| 53 <!-- Tools menu --> | |
| 53 <menu id="abp-menuitem" label="&toolbarbutton.label;"> | 54 <menu id="abp-menuitem" label="&toolbarbutton.label;"> |
|
Thomas Greiner
2014/10/17 15:02:21
You removed the comment "Tools menu". Please add i
saroyanm
2014/10/21 13:39:21
Done.
| |
| 54 <menupopup id="abp-menuitem-popup" context=""> | 55 <menupopup id="abp-menuitem-popup" context=""> |
| 55 <menuitem id="abp-menuitem-sendReport" label="&sendReport.label;…" key="ab p-key-sendReport" command="abp-command-sendReport"/> | 56 <menuitem id="abp-menuitem-sendReport" label="&sendReport.label;…" key="ab p-key-sendReport" command="abp-command-sendReport"/> |
| 56 <menuitem id="abp-menuitem-openbottombar" label="&opensidebar.label;" key= "abp-key-sidebar" command="abp-command-sidebar"/> | 57 <menuitem id="abp-menuitem-openbottombar" label="&opensidebar.label;" key= "abp-key-sidebar" command="abp-command-sidebar"/> |
| 57 <menuitem id="abp-menuitem-closebottombar" label="&closesidebar.label;" ke y="abp-key-sidebar" command="abp-command-sidebar"/> | 58 <menuitem id="abp-menuitem-closebottombar" label="&closesidebar.label;" ke y="abp-key-sidebar" command="abp-command-sidebar"/> |
| 58 <menuitem id="abp-menuitem-filters" label="&filters.label;…" key="abp-key- filters" command="abp-command-filters"/> | 59 <menuitem id="abp-menuitem-filters" label="&filters.label;…" key="abp-key- filters" command="abp-command-filters"/> |
| 59 <menuseparator id="abp-menuitem-whitelist-sep"/> | 60 <menuseparator id="abp-menuitem-whitelist-sep"/> |
| 60 <menuitem id="abp-menuitem-whitelistsite" labeltempl="&whitelist.site.labe l;" type="checkbox" command="abp-command-togglesitewhitelist"/> | 61 <menuitem id="abp-menuitem-whitelistsite" labeltempl="&whitelist.site.labe l;" type="checkbox" command="abp-command-togglesitewhitelist"/> |
| 61 <menuitem id="abp-menuitem-whitelistpage" label="&whitelist.page.label;" t ype="checkbox" command="abp-command-togglepagewhitelist"/> | 62 <menuitem id="abp-menuitem-whitelistpage" label="&whitelist.page.label;" t ype="checkbox" command="abp-command-togglepagewhitelist"/> |
| 62 <menuitem id="abp-menuitem-disabled" label="&disable.label;" type="checkbo x" key="abp-key-enable" command="abp-command-enable"/> | 63 <menuitem id="abp-menuitem-disabled" label="&disable.label;" type="checkbo x" key="abp-key-enable" command="abp-command-enable"/> |
| 63 <menuseparator/> | 64 <menuseparator/> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 127 xmlns:html="http://www.w3.org/1999/xhtml"> | 128 xmlns:html="http://www.w3.org/1999/xhtml"> |
| 128 <label id="abp-notification-title" class="header"/> | 129 <label id="abp-notification-title" class="header"/> |
| 129 <html:p id="abp-notification-message"/> | 130 <html:p id="abp-notification-message"/> |
| 130 <hbox id="abp-notification-question"> | 131 <hbox id="abp-notification-question"> |
| 131 <button id="abp-notification-yes" label="¬ification.button.yes;"/> | 132 <button id="abp-notification-yes" label="¬ification.button.yes;"/> |
| 132 <button id="abp-notification-no" label="¬ification.button.no;"/> | 133 <button id="abp-notification-no" label="¬ification.button.no;"/> |
| 133 <toolbarbutton id="abp-notification-close" label="¬ification.button.clo se;"></toolbarbutton> | 134 <toolbarbutton id="abp-notification-close" label="¬ification.button.clo se;"></toolbarbutton> |
| 134 </hbox> | 135 </hbox> |
| 135 </panel> | 136 </panel> |
| 136 </overlay> | 137 </overlay> |
| LEFT | RIGHT |
« chrome/content/ui/i18n.js ('k')
|
chrome/content/ui/popup.html » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
