forked from pool/MozillaFirefox
4.0b8
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=175
This commit is contained in:
parent
a5f9931fa5
commit
f20f31833b
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 15 07:49:45 UTC 2010 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- update to version 4.0beta8
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 30 14:19:59 UTC 2010 - wr@rosenauer.org
|
Tue Nov 30 14:19:59 UTC 2010 - wr@rosenauer.org
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
Name: MozillaFirefox
|
Name: MozillaFirefox
|
||||||
%define use_xulrunner 1
|
%define use_xulrunner 1
|
||||||
%define xulrunner mozilla-xulrunner20
|
%define xulrunner mozilla-xulrunner20
|
||||||
BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip
|
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm
|
||||||
%if %suse_version > 1110
|
%if %suse_version > 1110
|
||||||
BuildRequires: libiw-devel
|
BuildRequires: libiw-devel
|
||||||
%else
|
%else
|
||||||
@ -33,10 +33,10 @@ BuildRequires: %{xulrunner}-devel = 2.0b
|
|||||||
%endif
|
%endif
|
||||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||||
Version: 4.0b
|
Version: 4.0b
|
||||||
Release: 1
|
|
||||||
Provides: web_browser
|
Provides: web_browser
|
||||||
Provides: firefox = %{version}
|
Provides: firefox = %{version}
|
||||||
%define releasedate 2010110500
|
Release: 1
|
||||||
|
%define releasedate 2010121400
|
||||||
Summary: Mozilla Firefox Web Browser
|
Summary: Mozilla Firefox Web Browser
|
||||||
Url: http://www.mozilla.org/
|
Url: http://www.mozilla.org/
|
||||||
Group: Productivity/Networking/Web/Browsers
|
Group: Productivity/Networking/Web/Browsers
|
||||||
@ -52,6 +52,7 @@ Source8: firefox-mimeinfo.xml
|
|||||||
Source9: firefox-lockdown.js
|
Source9: firefox-lockdown.js
|
||||||
Source10: compare-locales.tar.bz2
|
Source10: compare-locales.tar.bz2
|
||||||
Source11: firefox.1
|
Source11: firefox.1
|
||||||
|
Patch0: mozilla-firefox-sync.patch
|
||||||
Patch1: toolkit-download-folder.patch
|
Patch1: toolkit-download-folder.patch
|
||||||
Patch2: firefox-linkorder.patch
|
Patch2: firefox-linkorder.patch
|
||||||
Patch3: firefox-browser-css.patch
|
Patch3: firefox-browser-css.patch
|
||||||
@ -99,7 +100,6 @@ plethora of extensions.
|
|||||||
|
|
||||||
|
|
||||||
%if %localize
|
%if %localize
|
||||||
|
|
||||||
%package translations-common
|
%package translations-common
|
||||||
Summary: Common translations for MozillaFirefox
|
Summary: Common translations for MozillaFirefox
|
||||||
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
|
||||||
@ -152,6 +152,7 @@ This package provides upstream look and feel for MozillaFirefox.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n mozilla -b 7 -b 10
|
%setup -q -n mozilla -b 7 -b 10
|
||||||
cd $RPM_BUILD_DIR/mozilla
|
cd $RPM_BUILD_DIR/mozilla
|
||||||
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:261463e9d13184159c52595238b930fec66c86d3251a29610715d59b4ebe0a6e
|
oid sha256:47a1baf950c41532733eb79e0d375a6e5b9936498ce88cc2fd0d8edaa92db465
|
||||||
size 22830
|
size 23407
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:fd14bbe10cd0506d4e72d1ded9bd027b62daf8c7c8701729a903f117960e5444
|
oid sha256:4ab65679521bb96e45bb0f21916a3fa9cc41df4e44c4c85d7f3f833242d8ba64
|
||||||
size 63321466
|
size 63741253
|
||||||
|
@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
|
|||||||
new file mode 100644
|
new file mode 100644
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/browser/base/content/browser-kde.xul
|
+++ b/browser/base/content/browser-kde.xul
|
||||||
@@ -0,0 +1,965 @@
|
@@ -0,0 +1,1042 @@
|
||||||
+#filter substitution
|
+#filter substitution
|
||||||
+<?xml version="1.0"?>
|
+<?xml version="1.0"?>
|
||||||
+# -*- Mode: HTML -*-
|
+# -*- Mode: HTML -*-
|
||||||
@ -62,6 +62,7 @@ new file mode 100644
|
|||||||
+# Rob Campbell <rcampbell@mozilla.com>
|
+# Rob Campbell <rcampbell@mozilla.com>
|
||||||
+# Patrick Walton <pcwalton@mozilla.com>
|
+# Patrick Walton <pcwalton@mozilla.com>
|
||||||
+# David Dahl <ddahl@mozilla.com>
|
+# David Dahl <ddahl@mozilla.com>
|
||||||
|
+# Frank Yan <fyan@mozilla.com>
|
||||||
+#
|
+#
|
||||||
+# Alternatively, the contents of this file may be used under the terms of
|
+# Alternatively, the contents of this file may be used under the terms of
|
||||||
+# either the GNU General Public License Version 2 or later (the "GPL"), or
|
+# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
@ -79,6 +80,7 @@ new file mode 100644
|
|||||||
+
|
+
|
||||||
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
|
||||||
|
+<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?>
|
||||||
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
||||||
+
|
+
|
||||||
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
||||||
@ -139,9 +141,6 @@ new file mode 100644
|
|||||||
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
|
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
|
||||||
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
|
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
|
||||||
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
|
||||||
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
|
|
||||||
+ tbattr="tabbrowser-multiple"
|
|
||||||
+ oncommand="gBrowser.reloadAllTabs();"/>
|
|
||||||
+ <menuseparator/>
|
+ <menuseparator/>
|
||||||
+ <menuitem id="context_pinTab" label="&pinAppTab.label;"
|
+ <menuitem id="context_pinTab" label="&pinAppTab.label;"
|
||||||
+ accesskey="&pinAppTab.accesskey;"
|
+ accesskey="&pinAppTab.accesskey;"
|
||||||
@ -154,7 +153,7 @@ new file mode 100644
|
|||||||
+ <menupopup id="context_tabViewMenuPopup"
|
+ <menupopup id="context_tabViewMenuPopup"
|
||||||
+ onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);">
|
+ onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);">
|
||||||
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
|
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
|
||||||
+ <menuitem label="&moveToNewGroup.label;"
|
+ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;"
|
||||||
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
|
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
|
||||||
+ </menupopup>
|
+ </menupopup>
|
||||||
+ </menu>
|
+ </menu>
|
||||||
@ -163,13 +162,16 @@ new file mode 100644
|
|||||||
+ tbattr="tabbrowser-multiple"
|
+ tbattr="tabbrowser-multiple"
|
||||||
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
|
||||||
+ <menuseparator/>
|
+ <menuseparator/>
|
||||||
|
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
|
||||||
|
+ tbattr="tabbrowser-multiple"
|
||||||
|
+ oncommand="gBrowser.reloadAllTabs();"/>
|
||||||
+ <menuitem id="context_bookmarkAllTabs"
|
+ <menuitem id="context_bookmarkAllTabs"
|
||||||
+ label="&bookmarkAllTabs.label;"
|
+ label="&bookmarkAllTabs.label;"
|
||||||
+ accesskey="&bookmarkAllTabs.accesskey;"
|
+ accesskey="&bookmarkAllTabs.accesskey;"
|
||||||
+ command="Browser:BookmarkAllTabs"/>
|
+ command="Browser:BookmarkAllTabs"/>
|
||||||
+ <menuseparator/>
|
|
||||||
+ <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
|
+ <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
|
||||||
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
|
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
|
||||||
|
+ <menuseparator/>
|
||||||
+ <menuitem id="context_undoCloseTab"
|
+ <menuitem id="context_undoCloseTab"
|
||||||
+ label="&undoCloseTab.label;"
|
+ label="&undoCloseTab.label;"
|
||||||
+ accesskey="&undoCloseTab.accesskey;"
|
+ accesskey="&undoCloseTab.accesskey;"
|
||||||
@ -193,11 +195,12 @@ new file mode 100644
|
|||||||
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
|
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
|
||||||
+
|
+
|
||||||
+ <!-- for invalid form error message -->
|
+ <!-- for invalid form error message -->
|
||||||
+ <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent">
|
+ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
|
||||||
+ <description/>
|
+ <description/>
|
||||||
+ </panel>
|
+ </panel>
|
||||||
+
|
+
|
||||||
+ <panel id="editBookmarkPanel"
|
+ <panel id="editBookmarkPanel"
|
||||||
|
+ type="arrow"
|
||||||
+ orient="vertical"
|
+ orient="vertical"
|
||||||
+ ignorekeys="true"
|
+ ignorekeys="true"
|
||||||
+ hidden="true"
|
+ hidden="true"
|
||||||
@ -357,10 +360,14 @@ new file mode 100644
|
|||||||
+
|
+
|
||||||
+ <menupopup id="placesContext"/>
|
+ <menupopup id="placesContext"/>
|
||||||
+
|
+
|
||||||
+ <panel id="notification-popup" type="arrow" position="after_start" noautofocus="true" hidden="true"/>
|
+ <panel id="notification-popup" type="arrow" position="after_start"
|
||||||
|
+ hidden="true" orient="vertical"/>
|
||||||
+
|
+
|
||||||
+ <!-- Popup for site identity information -->
|
+ <!-- Popup for site identity information -->
|
||||||
+ <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
|
+ <panel id="identity-popup"
|
||||||
|
+ type="arrow"
|
||||||
|
+ hidden="true"
|
||||||
|
+ noautofocus="true"
|
||||||
+ onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
|
+ onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
|
||||||
+ level="top">
|
+ level="top">
|
||||||
+ <hbox id="identity-popup-container" align="top">
|
+ <hbox id="identity-popup-container" align="top">
|
||||||
@ -455,29 +462,27 @@ new file mode 100644
|
|||||||
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
|
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
|
||||||
+ </popupset>
|
+ </popupset>
|
||||||
+
|
+
|
||||||
+#ifdef MENUBAR_CAN_AUTOHIDE
|
+#ifdef CAN_DRAW_IN_TITLEBAR
|
||||||
+ <vbox id="titlebar">
|
+<vbox id="titlebar">
|
||||||
+ <hbox id="titlebar-content">
|
+ <hbox id="titlebar-content">
|
||||||
+ <hbox id="appmenu-button-container" align="start">
|
+ <hbox id="appmenu-button-container">
|
||||||
+ <button id="appmenu-button"
|
+ <button id="appmenu-button"
|
||||||
+ type="menu"
|
+ type="menu"
|
||||||
+#ifdef XP_WIN
|
|
||||||
+ label="&brandShortName;"
|
+ label="&brandShortName;"
|
||||||
+#else
|
|
||||||
+ label="&appMenuButton.label;"
|
|
||||||
+#endif
|
|
||||||
+ style="-moz-user-focus: ignore;">
|
+ style="-moz-user-focus: ignore;">
|
||||||
+#include browser-appmenu.inc
|
+#include browser-appmenu.inc
|
||||||
+ </button>
|
+ </button>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ <spacer id="titlebar-spacer" flex="1"/>
|
+ <spacer id="titlebar-spacer" flex="1"/>
|
||||||
|
+ <hbox id="titlebar-buttonbox-container" align="start">
|
||||||
+ <hbox id="titlebar-buttonbox">
|
+ <hbox id="titlebar-buttonbox">
|
||||||
+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
|
+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
|
||||||
+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
|
+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
|
||||||
+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
|
+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ </vbox>
|
+ </hbox>
|
||||||
|
+</vbox>
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+<deck flex="1" id="tab-view-deck">
|
+<deck flex="1" id="tab-view-deck">
|
||||||
@ -512,10 +517,10 @@ new file mode 100644
|
|||||||
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
||||||
+#ifdef WINCE
|
+#ifdef WINCE
|
||||||
+ iconsize="small" defaulticonsize="small"
|
+ iconsize="small" defaulticonsize="small"
|
||||||
+ defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
|
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
|
||||||
+#else
|
+#else
|
||||||
+ iconsize="large"
|
+ iconsize="large"
|
||||||
+ defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,fullscreenflex,window-controls"
|
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
|
||||||
+#endif
|
+#endif
|
||||||
+ context="toolbar-context-menu">
|
+ context="toolbar-context-menu">
|
||||||
+
|
+
|
||||||
@ -534,16 +539,6 @@ new file mode 100644
|
|||||||
+ tooltiptext="&forwardButton.tooltip;"/>
|
+ tooltiptext="&forwardButton.tooltip;"/>
|
||||||
+ </toolbaritem>
|
+ </toolbaritem>
|
||||||
+
|
+
|
||||||
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
|
||||||
+ persist="class" removable="true"
|
|
||||||
+ label="&homeButton.label;"
|
|
||||||
+ ondragover="homeButtonObserver.onDragOver(event)"
|
|
||||||
+ ondragenter="homeButtonObserver.onDragOver(event)"
|
|
||||||
+ ondrop="homeButtonObserver.onDrop(event)"
|
|
||||||
+ ondragleave="homeButtonObserver.onDragLeave(event)"
|
|
||||||
+ onclick="BrowserGoHome(event);"
|
|
||||||
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
|
|
||||||
+
|
|
||||||
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
|
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
|
||||||
+ title="&locationItem.title;" class="chromeclass-location" removable="true">
|
+ title="&locationItem.title;" class="chromeclass-location" removable="true">
|
||||||
+ <textbox id="urlbar" flex="1"
|
+ <textbox id="urlbar" flex="1"
|
||||||
@ -606,13 +601,16 @@ new file mode 100644
|
|||||||
+ onclick="gURLBar.handleCommand(event);"/>
|
+ onclick="gURLBar.handleCommand(event);"/>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+ <toolbarbutton id="urlbar-go-button"
|
+ <toolbarbutton id="urlbar-go-button"
|
||||||
|
+ class="chromeclass-toolbar-additional"
|
||||||
+ onclick="gURLBar.handleCommand(event);"
|
+ onclick="gURLBar.handleCommand(event);"
|
||||||
+ tooltiptext="&goEndCap.tooltip;"/>
|
+ tooltiptext="&goEndCap.tooltip;"/>
|
||||||
+ <toolbarbutton id="urlbar-reload-button"
|
+ <toolbarbutton id="urlbar-reload-button"
|
||||||
|
+ class="chromeclass-toolbar-additional"
|
||||||
+ command="Browser:ReloadOrDuplicate"
|
+ command="Browser:ReloadOrDuplicate"
|
||||||
+ onclick="checkForMiddleClick(this, event);"
|
+ onclick="checkForMiddleClick(this, event);"
|
||||||
+ tooltiptext="&reloadButton.tooltip;"/>
|
+ tooltiptext="&reloadButton.tooltip;"/>
|
||||||
+ <toolbarbutton id="urlbar-stop-button"
|
+ <toolbarbutton id="urlbar-stop-button"
|
||||||
|
+ class="chromeclass-toolbar-additional"
|
||||||
+ command="Browser:Stop"
|
+ command="Browser:Stop"
|
||||||
+ tooltiptext="&stopButton.tooltip;"/>
|
+ tooltiptext="&stopButton.tooltip;"/>
|
||||||
+ </textbox>
|
+ </textbox>
|
||||||
@ -635,6 +633,16 @@ new file mode 100644
|
|||||||
+ <searchbar id="searchbar" flex="1"/>
|
+ <searchbar id="searchbar" flex="1"/>
|
||||||
+ </toolbaritem>
|
+ </toolbaritem>
|
||||||
+
|
+
|
||||||
|
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
|
+ persist="class" removable="true"
|
||||||
|
+ label="&homeButton.label;"
|
||||||
|
+ ondragover="homeButtonObserver.onDragOver(event)"
|
||||||
|
+ ondragenter="homeButtonObserver.onDragOver(event)"
|
||||||
|
+ ondrop="homeButtonObserver.onDrop(event)"
|
||||||
|
+ ondragexit="homeButtonObserver.onDragExit(event)"
|
||||||
|
+ onclick="BrowserGoHome(event);"
|
||||||
|
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
|
||||||
|
+
|
||||||
+ <toolbaritem id="bookmarks-menu-button-container"
|
+ <toolbaritem id="bookmarks-menu-button-container"
|
||||||
+ class="chromeclass-toolbar-additional"
|
+ class="chromeclass-toolbar-additional"
|
||||||
+ removable="true"
|
+ removable="true"
|
||||||
@ -646,7 +654,7 @@ new file mode 100644
|
|||||||
+ tooltiptext="&bookmarksMenuButton.tooltip;"
|
+ tooltiptext="&bookmarksMenuButton.tooltip;"
|
||||||
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
|
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
|
||||||
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);"
|
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);"
|
||||||
+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
|
+ ondragexit="PlacesMenuDNDHandler.onDragExit(event);"
|
||||||
+ ondrop="PlacesMenuDNDHandler.onDrop(event);">
|
+ ondrop="PlacesMenuDNDHandler.onDrop(event);">
|
||||||
+ <menupopup id="BMB_bookmarksPopup"
|
+ <menupopup id="BMB_bookmarksPopup"
|
||||||
+ placespopup="true"
|
+ placespopup="true"
|
||||||
@ -666,7 +674,7 @@ new file mode 100644
|
|||||||
+ label="&viewBookmarksToolbar.label;"/>
|
+ label="&viewBookmarksToolbar.label;"/>
|
||||||
+ <menuseparator/>
|
+ <menuseparator/>
|
||||||
+ <menuitem id="BMB_bookmarksShowAll"
|
+ <menuitem id="BMB_bookmarksShowAll"
|
||||||
+ label="&showAllBookmarks.label;"
|
+ label="&showAllBookmarks2.label;"
|
||||||
+ command="Browser:ShowAllBookmarks"
|
+ command="Browser:ShowAllBookmarks"
|
||||||
+ key="manBookmarkKb"/>
|
+ key="manBookmarkKb"/>
|
||||||
+ <menuseparator/>
|
+ <menuseparator/>
|
||||||
@ -678,11 +686,17 @@ new file mode 100644
|
|||||||
+ command="Browser:AddBookmarkAs"
|
+ command="Browser:AddBookmarkAs"
|
||||||
+ key="addBookmarkAsKb"/>
|
+ key="addBookmarkAsKb"/>
|
||||||
+ <menuitem id="BMB_subscribeToPageMenuitem"
|
+ <menuitem id="BMB_subscribeToPageMenuitem"
|
||||||
|
+#ifndef XP_MACOSX
|
||||||
|
+ class="menuitem-iconic"
|
||||||
|
+#endif
|
||||||
+ label="&subscribeToPageMenuitem.label;"
|
+ label="&subscribeToPageMenuitem.label;"
|
||||||
+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
|
+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
|
||||||
+ onclick="checkForMiddleClick(this, event);"
|
+ onclick="checkForMiddleClick(this, event);"
|
||||||
+ observes="singleFeedMenuitemState"/>
|
+ observes="singleFeedMenuitemState"/>
|
||||||
+ <menu id="BMB_subscribeToPageMenupopup"
|
+ <menu id="BMB_subscribeToPageMenupopup"
|
||||||
|
+#ifndef XP_MACOSX
|
||||||
|
+ class="menu-iconic"
|
||||||
|
+#endif
|
||||||
+ label="&subscribeToPageMenupopup.label;"
|
+ label="&subscribeToPageMenupopup.label;"
|
||||||
+ observes="multipleFeedsMenuState">
|
+ observes="multipleFeedsMenuState">
|
||||||
+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
|
+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
|
||||||
@ -780,6 +794,13 @@ new file mode 100644
|
|||||||
+ </toolbaritem>
|
+ </toolbaritem>
|
||||||
+ </toolbar>
|
+ </toolbar>
|
||||||
+
|
+
|
||||||
|
+#ifdef MENUBAR_CAN_AUTOHIDE
|
||||||
|
+#ifndef CAN_DRAW_IN_TITLEBAR
|
||||||
|
+#define APPMENU_ON_TABBAR
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
+ <toolbar id="TabsToolbar"
|
+ <toolbar id="TabsToolbar"
|
||||||
+ fullscreentoolbar="true"
|
+ fullscreentoolbar="true"
|
||||||
+ customizable="true"
|
+ customizable="true"
|
||||||
@ -787,9 +808,23 @@ new file mode 100644
|
|||||||
+ iconsize="small" defaulticonsize="small" lockiconsize="true"
|
+ iconsize="small" defaulticonsize="small" lockiconsize="true"
|
||||||
+ aria-label="&tabsToolbar.label;"
|
+ aria-label="&tabsToolbar.label;"
|
||||||
+ context="toolbar-context-menu"
|
+ context="toolbar-context-menu"
|
||||||
|
+#ifdef APPMENU_ON_TABBAR
|
||||||
|
+ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"
|
||||||
|
+#else
|
||||||
+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"
|
+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton"
|
||||||
|
+#endif
|
||||||
+ collapsed="true">
|
+ collapsed="true">
|
||||||
+
|
+
|
||||||
|
+#ifdef APPMENU_ON_TABBAR
|
||||||
|
+ <toolbarbutton id="appmenu-toolbar-button"
|
||||||
|
+ class="chromeclass-toolbar-additional"
|
||||||
|
+ type="menu"
|
||||||
|
+ label="&brandShortName;"
|
||||||
|
+ tooltiptext="&appMenuButton.tooltip;">
|
||||||
|
+#include browser-appmenu.inc
|
||||||
|
+ </toolbarbutton>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
+ <tabs id="tabbrowser-tabs"
|
+ <tabs id="tabbrowser-tabs"
|
||||||
+ class="tabbrowser-tabs"
|
+ class="tabbrowser-tabs"
|
||||||
+ tabbrowser="content"
|
+ tabbrowser="content"
|
||||||
@ -808,7 +843,7 @@ new file mode 100644
|
|||||||
+ ondrop="newTabButtonObserver.onDrop(event)"
|
+ ondrop="newTabButtonObserver.onDrop(event)"
|
||||||
+ ondragover="newTabButtonObserver.onDragOver(event)"
|
+ ondragover="newTabButtonObserver.onDragOver(event)"
|
||||||
+ ondragenter="newTabButtonObserver.onDragOver(event)"
|
+ ondragenter="newTabButtonObserver.onDragOver(event)"
|
||||||
+ ondragleave="newTabButtonObserver.onDragLeave(event)"
|
+ ondragexit="newTabButtonObserver.onDragExit(event)"
|
||||||
+ removable="true"/>
|
+ removable="true"/>
|
||||||
+
|
+
|
||||||
+ <toolbarbutton id="alltabs-button"
|
+ <toolbarbutton id="alltabs-button"
|
||||||
@ -855,7 +890,7 @@ new file mode 100644
|
|||||||
+ ondrop="DownloadsButtonDNDObserver.onDrop(event)"
|
+ ondrop="DownloadsButtonDNDObserver.onDrop(event)"
|
||||||
+ ondragover="DownloadsButtonDNDObserver.onDragOver(event)"
|
+ ondragover="DownloadsButtonDNDObserver.onDragOver(event)"
|
||||||
+ ondragenter="DownloadsButtonDNDObserver.onDragOver(event)"
|
+ ondragenter="DownloadsButtonDNDObserver.onDragOver(event)"
|
||||||
+ ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)"
|
+ ondragexit="DownloadsButtonDNDObserver.onDragExit(event)"
|
||||||
+ label="&downloads.label;"
|
+ label="&downloads.label;"
|
||||||
+ tooltiptext="&downloads.tooltip;"/>
|
+ tooltiptext="&downloads.tooltip;"/>
|
||||||
+
|
+
|
||||||
@ -869,7 +904,7 @@ new file mode 100644
|
|||||||
+ ondrop="bookmarksButtonObserver.onDrop(event)"
|
+ ondrop="bookmarksButtonObserver.onDrop(event)"
|
||||||
+ ondragover="bookmarksButtonObserver.onDragOver(event)"
|
+ ondragover="bookmarksButtonObserver.onDragOver(event)"
|
||||||
+ ondragenter="bookmarksButtonObserver.onDragOver(event)"
|
+ ondragenter="bookmarksButtonObserver.onDragOver(event)"
|
||||||
+ ondragleave="bookmarksButtonObserver.onDragLeave(event)"/>
|
+ ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
|
||||||
+
|
+
|
||||||
+ <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
+ <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
+ label="&newNavigatorCmd.label;"
|
+ label="&newNavigatorCmd.label;"
|
||||||
@ -878,7 +913,7 @@ new file mode 100644
|
|||||||
+ ondrop="newWindowButtonObserver.onDrop(event)"
|
+ ondrop="newWindowButtonObserver.onDrop(event)"
|
||||||
+ ondragover="newWindowButtonObserver.onDragOver(event)"
|
+ ondragover="newWindowButtonObserver.onDragOver(event)"
|
||||||
+ ondragenter="newWindowButtonObserver.onDragOver(event)"
|
+ ondragenter="newWindowButtonObserver.onDragOver(event)"
|
||||||
+ ondragleave="newWindowButtonObserver.onDragLeave(event)"/>
|
+ ondragexit="newWindowButtonObserver.onDragExit(event)"/>
|
||||||
+
|
+
|
||||||
+ <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
+ <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
+ label="&cutCmd.label;"
|
+ label="&cutCmd.label;"
|
||||||
@ -935,6 +970,7 @@ new file mode 100644
|
|||||||
+ </toolbox>
|
+ </toolbox>
|
||||||
+
|
+
|
||||||
+ <hbox flex="1" id="browser">
|
+ <hbox flex="1" id="browser">
|
||||||
|
+ <vbox id="browser-border-start" hidden="true" layer="true"/>
|
||||||
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
||||||
+ <sidebarheader id="sidebar-header" align="center">
|
+ <sidebarheader id="sidebar-header" align="center">
|
||||||
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
|
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
|
||||||
@ -954,6 +990,7 @@ new file mode 100644
|
|||||||
+ autocompletepopup="PopupAutoComplete"
|
+ autocompletepopup="PopupAutoComplete"
|
||||||
+ onclick="return contentAreaClick(event, false);"/>
|
+ onclick="return contentAreaClick(event, false);"/>
|
||||||
+ </vbox>
|
+ </vbox>
|
||||||
|
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
|
||||||
+ </hbox>
|
+ </hbox>
|
||||||
+
|
+
|
||||||
+ <vbox id="browser-bottombox" layer="true">
|
+ <vbox id="browser-bottombox" layer="true">
|
||||||
@ -964,7 +1001,11 @@ new file mode 100644
|
|||||||
+ context="toolbar-context-menu" toolboxid="navigator-toolbox"
|
+ context="toolbar-context-menu" toolboxid="navigator-toolbox"
|
||||||
+ mode="icons" iconsize="small" defaulticonsize="small"
|
+ mode="icons" iconsize="small" defaulticonsize="small"
|
||||||
+ lockiconsize="true"
|
+ lockiconsize="true"
|
||||||
+ customizable="true" align="right">
|
+ defaultset="addonbar-closebutton,spring,status-bar"
|
||||||
|
+ customizable="true">
|
||||||
|
+ <toolbarbutton id="addonbar-closebutton"
|
||||||
|
+ tooltiptext="&addonBarCloseButton.tooltip;"
|
||||||
|
+ oncommand="setToolbarVisibility(this.parentNode, false);"/>
|
||||||
+ <statusbar id="status-bar"/>
|
+ <statusbar id="status-bar"/>
|
||||||
+ </toolbar>
|
+ </toolbar>
|
||||||
+ </vbox>
|
+ </vbox>
|
||||||
@ -981,6 +1022,42 @@ new file mode 100644
|
|||||||
+ </svg:mask>
|
+ </svg:mask>
|
||||||
+ </svg:svg>
|
+ </svg:svg>
|
||||||
+#endif
|
+#endif
|
||||||
|
+#ifdef XP_MACOSX
|
||||||
|
+ <svg:svg height="0">
|
||||||
|
+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
|
||||||
|
+ <svg:circle cx="9" cy="3" r="3" fill="white"/>
|
||||||
|
+ <svg:rect x="9" y="0" width="3" height="3" fill="white"/>
|
||||||
|
+ <svg:rect x="6" y="3" width="6" height="19" fill="white"/>
|
||||||
|
+ <svg:rect x="1" y="17" width="5" height="5" fill="white"/>
|
||||||
|
+ <svg:circle cx="1" cy="17" r="5"/>
|
||||||
|
+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
|
||||||
|
+ </svg:mask>
|
||||||
|
+ <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse">
|
||||||
|
+ <svg:circle cx="3" cy="3" r="3" fill="white"/>
|
||||||
|
+ <svg:rect x="0" y="0" width="3" height="3" fill="white"/>
|
||||||
|
+ <svg:rect x="0" y="3" width="6" height="19" fill="white"/>
|
||||||
|
+ <svg:rect x="6" y="17" width="5" height="5" fill="white"/>
|
||||||
|
+ <svg:circle cx="11" cy="17" r="5"/>
|
||||||
|
+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
|
||||||
|
+ </svg:mask>
|
||||||
|
+ <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse">
|
||||||
|
+ <svg:circle cx="9" cy="20" r="3" fill="white"/>
|
||||||
|
+ <svg:rect x="9" y="20" width="3" height="3" fill="white"/>
|
||||||
|
+ <svg:rect x="6" y="1" width="6" height="19" fill="white"/>
|
||||||
|
+ <svg:rect x="1" y="1" width="5" height="5" fill="white"/>
|
||||||
|
+ <svg:circle cx="1" cy="6" r="5"/>
|
||||||
|
+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
|
||||||
|
+ </svg:mask>
|
||||||
|
+ <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse">
|
||||||
|
+ <svg:circle cx="3" cy="20" r="3" fill="white"/>
|
||||||
|
+ <svg:rect x="0" y="20" width="3" height="3" fill="white"/>
|
||||||
|
+ <svg:rect x="0" y="1" width="6" height="19" fill="white"/>
|
||||||
|
+ <svg:rect x="6" y="1" width="5" height="5" fill="white"/>
|
||||||
|
+ <svg:circle cx="11" cy="6" r="5"/>
|
||||||
|
+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
|
||||||
|
+ </svg:mask>
|
||||||
|
+ </svg:svg>
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+</vbox>
|
+</vbox>
|
||||||
+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
|
+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
|
||||||
@ -1466,7 +1543,7 @@ new file mode 100644
|
|||||||
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
||||||
--- a/browser/installer/package-manifest.in
|
--- a/browser/installer/package-manifest.in
|
||||||
+++ b/browser/installer/package-manifest.in
|
+++ b/browser/installer/package-manifest.in
|
||||||
@@ -432,16 +432,17 @@
|
@@ -441,16 +441,17 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:350ee36ea52a8489990ec1592baef21edd1ce66521da0468f15adb01f2f2725d
|
oid sha256:8c47f90b7b1236f1bd7914a2a3028b89dc6f71b26658ff789b1ca421ad7dc6dc
|
||||||
size 33149166
|
size 36318691
|
||||||
|
2068
mozilla-firefox-sync.patch
Normal file
2068
mozilla-firefox-sync.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user