commit ce346d069afa5f1a42dfa13eb8fce2a23cfbf679 Author: Alex Catarineu acat@torproject.org Date: Mon May 13 18:31:58 2019 +0200
Remove ported overlays --- chrome/content/aboutDialog.xul | 56 --------------------------------- chrome/content/menu-items-overlay.xul | 31 ------------------ chrome/content/menu-overlay.xul | 29 ----------------- chrome/content/tor-circuit-display.xul | 34 -------------------- chrome/content/torbutton-extensions.xul | 28 ----------------- chrome/content/torbutton.xul | 46 --------------------------- 6 files changed, 224 deletions(-)
diff --git a/chrome/content/aboutDialog.xul b/chrome/content/aboutDialog.xul deleted file mode 100644 index 5b89a811..00000000 --- a/chrome/content/aboutDialog.xul +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- --> -<?xml-stylesheet href="chrome://torbutton/skin/aboutDialog.css" type="text/css"?> - -<!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > -%brandDTD; -<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd" > -%aboutDialogDTD; -]> - -<overlay id="main-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E - <vbox id="rightBox"> - <vbox id="detailsBox"> - <description class="text-blurb" id="projectDesc"> - &project.start; - <label class="text-link" - href="https://www.torproject.org/%22%3E - &project.tpoLink; - </label>&project.end; - </description> - <description class="text-blurb" id="helpDesc"> - &help.start; - <label class="text-link" - href="https://www.torproject.org/donate/donate.html.en%22%3E - &help.donateLink; - </label> - &help.or; - <label class="text-link" - href="https://www.torproject.org/getinvolved/volunteer.html.en%22%3E - &help.getInvolvedLink; - </label>&help.end; - </description> - </vbox> - </vbox> - - <vbox id="bottomBox"> - <hbox id="newBottom" pack="center" position="1"> - <label class="text-link bottom-link" - href="https://www.torproject.org/docs/faq.html.en%22%3E - &bottomLinks.questions; - </label> - <label class="text-link bottom-link" - href="https://www.torproject.org/getinvolved/relays%22%3E - &bottomLinks.grow; - </label> - <label class="text-link bottom-link" - href="about:license"> - &bottomLinks.license; - </label> - </hbox> - <description id="trademarkTor" insertafter="trademark"> - &tor.TrademarkStatement; - </description> - </vbox> -</overlay> diff --git a/chrome/content/menu-items-overlay.xul b/chrome/content/menu-items-overlay.xul deleted file mode 100644 index b2e862b3..00000000 --- a/chrome/content/menu-items-overlay.xul +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- --> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - -<overlay id="torbutton-menu-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E - <menuitem id="menu_newIdentity" - accesskey="&torbutton.context_menu.new_identity_key;" - key="torbutton-new-identity-key" - label="&torbutton.context_menu.new_identity;" - oncommand="torbutton_new_identity();"/> - <menuitem id="menu_newCircuit" - accesskey="&torbutton.context_menu.new_circuit_key;" - key="torbutton-new-circuit-key" - label="&torbutton.context_menu.new_circuit;" - oncommand="torbutton_new_circuit();"/> - <toolbarbutton id="appMenuNewIdentity" - class="subviewbutton subviewbutton-iconic" - key="torbutton-new-identity-key" - label="&torbutton.context_menu.new_identity;" - oncommand="torbutton_new_identity();"/> - <toolbarbutton id="appMenuNewCircuit" - class="subviewbutton subviewbutton-iconic" - key="torbutton-new-circuit-key" - label="&torbutton.context_menu.new_circuit;" - oncommand="torbutton_new_circuit();"/> - <toolbarbutton id="appMenu-private-window-button" - hidden="true"/> - <toolbarbutton id="appMenuRestoreLastSession" - hidden="true"/> -</overlay> diff --git a/chrome/content/menu-overlay.xul b/chrome/content/menu-overlay.xul deleted file mode 100644 index 1e812cce..00000000 --- a/chrome/content/menu-overlay.xul +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- --> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> - -<overlay id="torbutton-menu-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E - <menupopup id="menu_HelpPopup"> - <!-- Bug 18905: Hide unused help menu items --> - <menuitem id="menu_openHelp" removeelement="true"/> - <menuitem id="menu_openTour" removeelement="true"/> - <menuitem id="healthReport" removeelement="true"/> - <menuitem id="feedbackPage" removeelement="true"/> - <menuitem id="helpSafeMode" removeelement="true"/> - <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> - <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/> - <!-- dummy elements to avoid 'getElementById' errors --> - <box id="feedbackPage"/> - <box id="helpSafeMode"/> - <box id="menu_HelpPopup_reportPhishingtoolmenu"/> - <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> - <!-- Add Tor Browser manual link --> - <menuitem name="torBrowserUserManual" - id="torBrowserUserManual" - position="1" - label="&aboutTor.torbrowser_user_manual.label;" - accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.getRequestedLocale())" /> - </menupopup> -</overlay> diff --git a/chrome/content/tor-circuit-display.xul b/chrome/content/tor-circuit-display.xul deleted file mode 100644 index b4d4ac7b..00000000 --- a/chrome/content/tor-circuit-display.xul +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - -<overlay id="circuit-display-overlay" - xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml%22%3E - <panelview id="identity-popup-mainView"> - <!-- Circuit display section --> - <xul:hbox id="circuit-display-container" - class="identity-popup-section" - insertafter="identity-popup-security"> - <xul:vbox id="circuit-display-content" flex="1"> - <xul:label id="circuit-display-headline" - class="identity-popup-headline" - value="&torbutton.circuit_display.title;"/> - <html:ul id="circuit-display-nodes" dir="auto"> - <li>example A</li> - <li>example B</li> - <li>example C</li> - </html:ul> - </xul:vbox> - <xul:vbox id="circuit-reload-content" flex="1"> - <html:button id="circuit-reload-button" - onclick="torbutton_new_circuit()"> - &torbutton.circuit_display.new_circuit; - </html:button> - <xul:hbox id="circuit-guard-note-container"> - </xul:hbox> - </xul:vbox> - </xul:hbox> - </panelview> -</overlay> diff --git a/chrome/content/torbutton-extensions.xul b/chrome/content/torbutton-extensions.xul deleted file mode 100644 index 060594df..00000000 --- a/chrome/content/torbutton-extensions.xul +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/brand.dtd"> - -<overlay id="torbutton-extensions-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E - - <vbox id="plugin-enable-button" class="alert-container" flex="1" - hidden="true"> - <spacer class="alert-spacer-before"/> - <vbox class="alert"> - <label value="&plugins.installed.find;"/> - <button class="button-plugin-enable" - label="&plugins.installed.enable;" - command="cmd_pluginEnable"/> - </vbox> - <spacer class="alert-spacer-after"/> - </vbox> - - <vbox id="plugin-disable-button" class="global-info" flex="1" align="end"> - <button class="button-plugin-disable" - label="&plugins.installed.disable;" - tooltiptext="&plugins.installed.disable.tip;" - command="cmd_pluginDisable"/> - <spacer flex="5000"/> - </vbox> - -</overlay> diff --git a/chrome/content/torbutton.xul b/chrome/content/torbutton.xul deleted file mode 100644 index 2f6e72e4..00000000 --- a/chrome/content/torbutton.xul +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> -<?xul-overlay href="chrome://torbutton/content/popup.xul"?> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - -<overlay id="torbutton-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E - - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/content-sizer.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" /> - <script language="JavaScript"> - //onLoad Hander - try{window.addEventListener("load", torbutton_init, false);}catch(e){} - </script> - - <stringbundleset id="torbutton-stringbundleset"> - <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> - </stringbundleset> - - <!-- Place the context menu in the nav bar, so that the lack - of the status bar on FF4 doesn't make it invisible --> - <toolbar id="nav-bar"> - <menupopup id="torbutton-context-menu"/> - </toolbar> - - <toolbarpalette id="BrowserToolbarPalette"> - <toolbarbutton - id="torbutton-button" - class="toolbarbutton-1 chromeclass-toolbar-additional" - type="menu" - orient="horizontal" - label="Torbutton" - tooltiptext="&torbutton.button.tooltip;" - menu="torbutton-context-menu" - context="torbutton-context-menu"/> - </toolbarpalette> - -<!-- Global keyboard shortcuts for new identity and new circuit. --> - <keyset> - <key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/> - <key id="torbutton-new-circuit-key" modifiers="accel shift" key="L" oncommand="torbutton_new_circuit()"/> - </keyset> -</overlay>