Unified Diff: chrome/content/ui/overlay.xul
Issue 5294633391226880:
issue 1435 - Port popup.html from Chrome/Safari/Opera to Firefox (Closed)
Patch Set:
Created Oct. 17, 2014, 11:23 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« chrome/content/ui/ext/popup.js ('K')
|
« chrome/content/ui/i18n.js ('k')
|
chrome/content/ui/popup.html » ('j')
|
chrome/content/ui/popup.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: chrome/content/ui/overlay.xul |
| =================================================================== |
| --- a/chrome/content/ui/overlay.xul |
| +++ b/chrome/content/ui/overlay.xul |
| @@ -46,36 +46,41 @@ |
| </popupset> |
| <!-- Icon's context menu --> |
| - <menupopup id="abp-status-popup" context=""> |
| - <menuitem id="abp-status-sendReport" label="&sendReport.label;…" key="abp-key-sendReport" command="abp-command-sendReport"/> |
| - <menuitem id="abp-status-openbottombar" label="&opensidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/> |
| - <menuitem id="abp-status-closebottombar" label="&closesidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/> |
| - <menuitem id="abp-status-filters" label="&filters.label;…" key="abp-key-filters" command="abp-command-filters"/> |
| - <menuseparator id="abp-status-whitelist-sep"/> |
| - <menuitem id="abp-status-whitelistsite" labeltempl="&whitelist.site.label;" type="checkbox" command="abp-command-togglesitewhitelist"/> |
| - <menuitem id="abp-status-whitelistpage" label="&whitelist.page.label;" type="checkbox" command="abp-command-togglepagewhitelist"/> |
| - <menuitem id="abp-status-disabled" label="&disable.label;" type="checkbox" key="abp-key-enable" command="abp-command-enable"/> |
| - <menuseparator/> |
| - <menu id="abp-status-options" label="&options.label;"> |
| - <menupopup id="abp-status-options-popup"> |
| - <menuitem id="abp-status-frameobjects" label="&objecttabs.label;" type="checkbox" command="abp-command-toggleobjtabs"/> |
| - <menuitem id="abp-status-slowcollapse" label="&hideplaceholders.label;" type="checkbox" command="abp-command-togglecollapse"/> |
| - <menuitem id="abp-status-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/> |
| - <menuitem id="abp-status-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/> |
| - <menuseparator id="abp-status-iconSettingsSeparator"/> |
| - <menuitem id="abp-status-showintoolbar" label="&showintoolbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/> |
| - <menuitem id="abp-status-showinstatusbar" label="&showinstatusbar.label;" type="checkbox" command="abp-command-toggleshowinstatusbar"/> |
| - </menupopup> |
| - </menu> |
| + <panel id="abp-status-popup" type="arrow"> |
| + <iframe id="abp-status-popup-browser" src="about:blank" flex="1"/> |
| + </panel> |
| + |
| + <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.
|
| + <menupopup id="abp-menuitem-popup" context=""> |
| + <menuitem id="abp-menuitem-sendReport" label="&sendReport.label;…" key="abp-key-sendReport" command="abp-command-sendReport"/> |
| + <menuitem id="abp-menuitem-openbottombar" label="&opensidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/> |
| + <menuitem id="abp-menuitem-closebottombar" label="&closesidebar.label;" key="abp-key-sidebar" command="abp-command-sidebar"/> |
| + <menuitem id="abp-menuitem-filters" label="&filters.label;…" key="abp-key-filters" command="abp-command-filters"/> |
| + <menuseparator id="abp-menuitem-whitelist-sep"/> |
| + <menuitem id="abp-menuitem-whitelistsite" labeltempl="&whitelist.site.label;" type="checkbox" command="abp-command-togglesitewhitelist"/> |
| + <menuitem id="abp-menuitem-whitelistpage" label="&whitelist.page.label;" type="checkbox" command="abp-command-togglepagewhitelist"/> |
| + <menuitem id="abp-menuitem-disabled" label="&disable.label;" type="checkbox" key="abp-key-enable" command="abp-command-enable"/> |
| + <menuseparator/> |
| + <menu id="abp-menuitem-options" label="&options.label;"> |
| + <menupopup id="abp-menuitem-options-popup"> |
| + <menuitem id="abp-menuitem-frameobjects" label="&objecttabs.label;" type="checkbox" command="abp-command-toggleobjtabs"/> |
| + <menuitem id="abp-menuitem-slowcollapse" label="&hideplaceholders.label;" type="checkbox" command="abp-command-togglecollapse"/> |
| + <menuitem id="abp-menuitem-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/> |
| + <menuitem id="abp-menuitem-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/> |
| + <menuseparator id="abp-menuitem-iconSettingsSeparator"/> |
| + <menuitem id="abp-menuitem-showintoolbar" label="&showintoolbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/> |
| + <menuitem id="abp-menuitem-showinstatusbar" label="&showinstatusbar.label;" type="checkbox" command="abp-command-toggleshowinstatusbar"/> |
| + </menupopup> |
| + </menu> |
| - <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center" align="center"> |
| - <!-- noautoclose attribute tells Australis menu that it shouldn't close when |
| - these are clicked, see https://bugzilla.mozilla.org/show_bug.cgi?id=940693 --> |
| - <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1" noautoclose="true"/> |
| - <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide" noautoclose="true"/> |
| - </hbox> |
| - </menupopup> |
| - |
| + <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center" align="center"> |
| + <!-- noautoclose attribute tells Australis menu that it shouldn't close when |
| + these are clicked, see https://bugzilla.mozilla.org/show_bug.cgi?id=940693 --> |
| + <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1" noautoclose="true"/> |
| + <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide" noautoclose="true"/> |
| + </hbox> |
| + </menupopup> |
| + </menu> |
| <keyset id="abp-keyset"/> |
| <!-- Dummy oncommand attributes are work-arounds for bug 371900 --> |
| @@ -103,9 +108,6 @@ |
| <toolbarbutton id="abp-toolbarbutton" class="toolbarbutton-1" label="&toolbarbutton.label;" |
| tooltip="abp-tooltip"/> |
| - <!-- Tools menu --> |
| - <menu id="abp-menuitem" label="&toolbarbutton.label;"/> |
| - |
| <!-- Bottom bar --> |
| <hbox id="abp-bottombar-container"> |
| <splitter id="abp-bottombar-splitter"/> |
« chrome/content/ui/ext/popup.js ('K')
|
« chrome/content/ui/i18n.js ('k')
|
chrome/content/ui/popup.html » ('j')
|
chrome/content/ui/popup.js » ('J')
