author | Wolfgang Rosenauer <wr@rosenauer.org> |
Mon, 29 Oct 2018 15:08:22 +0100 | |
branch | firefox63 |
changeset 1075 | 0831123bc28a |
parent 1074 | 4b99400f6d17 |
child 1082 | 821cfbe8efcc |
permissions | -rw-r--r-- |
823 | 1 |
# HG changeset patch |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
2 |
# Parent fdf78810e83396d10418791fbe32bed6bfe1558b |
823 | 3 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/browser/base/content/browser-kde.xul |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
8 |
@@ -0,0 +1,1317 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+#filter substitution |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
+<?xml version="1.0"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
+# -*- Mode: HTML -*- |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
+# |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
13 |
+# This Source Code Form is subject to the terms of the Mozilla Public |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
14 |
+# License, v. 2.0. If a copy of the MPL was not distributed with this |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
15 |
+# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
+ |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
17 |
+<!-- The "global.css" stylesheet is imported first to allow other stylesheets to |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
18 |
+ override rules using selectors with the same specificity. This applies to |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
19 |
+ both "content" and "skin" packages, which bug 1385444 will unify later. --> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
20 |
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
21 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
23 |
+<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
24 |
+<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
929 | 26 |
+<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
27 |
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
881 | 28 |
+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
932 | 29 |
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
30 |
+<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
31 |
+<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
32 |
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
33 |
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
34 |
+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
+# All DTD information is stored in a separate file so that it can be shared by |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
+# hiddenWindow.xul. |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
38 |
+<!DOCTYPE window [ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
+#include browser-doctype.inc |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
40 |
+]> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
+<window id="main-window" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
+ xmlns:svg="http://www.w3.org/2000/svg" |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
45 |
+ xmlns:html="http://www.w3.org/1999/xhtml" |
985 | 46 |
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
703 | 48 |
+ title="&mainWindow.title;" |
49 |
+ title_normal="&mainWindow.title;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
+#ifdef XP_MACOSX |
703 | 51 |
+ title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;" |
52 |
+ titledefault="&mainWindow.title;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
+ titlemodifier="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
+ titlemodifier_normal="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
+ titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
+#else |
703 | 57 |
+ title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" |
58 |
+ titlemodifier="&mainWindow.titlemodifier;" |
|
59 |
+ titlemodifier_normal="&mainWindow.titlemodifier;" |
|
60 |
+ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
+#endif |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
62 |
+#ifdef XP_WIN |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
63 |
+ chromemargin="0,2,2,2" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
64 |
+#else |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
65 |
+ chromemargin="0,-1,-1,-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
66 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
67 |
+ tabsintitlebar="true" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
+ titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
+ windowtype="navigator:browser" |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
70 |
+ macanimationtype="document" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
+ screenX="4" screenY="4" |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
72 |
+ fullscreenbutton="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
73 |
+ sizemode="normal" |
885 | 74 |
+ retargetdocumentfocus="urlbar" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
75 |
+ persist="screenX screenY width height sizemode"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
+ |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
77 |
+# All JS files which are needed by browser.xul and other top level windows to |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
78 |
+# support MacOS specific features *must* go into the global-scripts.inc file so |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
79 |
+# that they can be shared with macWindow.inc.xul. |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
+#include global-scripts.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
+ |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
82 |
+<script type="application/javascript" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
83 |
+#ifdef BROWSER_XHTML |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
84 |
+xmlns="http://www.w3.org/1999/xhtml" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
85 |
+#endif |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
86 |
+> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
87 |
+ Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this); |
1045 | 88 |
+ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this); |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
89 |
+ |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
90 |
+ window.onload = gBrowserInit.onLoad.bind(gBrowserInit); |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
91 |
+ window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
92 |
+ window.onclose = WindowIsClosing; |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
93 |
+#ifdef BROWSER_XHTML |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
94 |
+ window.addEventListener("DOMContentLoaded", |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
95 |
+ gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true }); |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
96 |
+#else |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
97 |
+ window.addEventListener("MozBeforeInitialXULLayout", |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
98 |
+ gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true }); |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
99 |
+#endif |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
100 |
+ // The listener of DOMContentLoaded must be set on window, rather than |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
101 |
+ // document, because the window can go away before the event is fired. |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
102 |
+ // In that case, we don't want to initialize anything, otherwise we |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
103 |
+ // may be leaking things because they will never be destroyed after. |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
104 |
+ window.addEventListener("DOMContentLoaded", |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
105 |
+ gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true }); |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
106 |
+</script> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
+ |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
108 |
+# All sets except for popupsets (commands, keys, and stringbundles) |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
109 |
+# *must* go into the browser-sets.inc file so that they can be shared with other |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
110 |
+# top level windows in macWindow.inc.xul. |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
+#include browser-sets.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
+ <popupset id="mainPopupSet"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
114 |
+ <menupopup id="tabContextMenu" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
115 |
+ onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
116 |
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
117 |
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
118 |
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
119 |
+ <menuitem id="context_reloadSelectedTabs" label="&reloadSelectedTabs.label;" hidden="true" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
120 |
+ accesskey="&reloadSelectedTabs.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
121 |
+ oncommand="gBrowser.reloadMultiSelectedTabs();"/> |
889 | 122 |
+ <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
123 |
+ <menuitem id="context_toggleMuteSelectedTabs" hidden="true" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
124 |
+ oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
125 |
+ <menuseparator/> |
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
126 |
+ <menuitem id="context_pinTab" label="&pinTab.label;" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
127 |
+ accesskey="&pinTab.accesskey;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
128 |
+ oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
129 |
+ <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
130 |
+ accesskey="&unpinTab.accesskey;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
131 |
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
132 |
+ <menuitem id="context_pinSelectedTabs" label="&pinSelectedTabs.label;" hidden="true" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
133 |
+ accesskey="&pinSelectedTabs.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
134 |
+ oncommand="gBrowser.pinMultiSelectedTabs();"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
135 |
+ <menuitem id="context_unpinSelectedTabs" label="&unpinSelectedTabs.label;" hidden="true" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
136 |
+ accesskey="&unpinSelectedTabs.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
137 |
+ oncommand="gBrowser.unpinMultiSelectedTabs();"/> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
138 |
+ <menuitem id="context_duplicateTab" label="&duplicateTab.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
139 |
+ accesskey="&duplicateTab.accesskey;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
140 |
+ oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
141 |
+ <menu id="context_reopenInContainer" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
142 |
+ label="&reopenInContainer.label;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
143 |
+ accesskey="&reopenInContainer.accesskey;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
144 |
+ hidden="true"> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
145 |
+ <menupopup oncommand="TabContextMenu.reopenInContainer(event);" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
146 |
+ onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
147 |
+ </menu> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
148 |
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
149 |
+ accesskey="&moveToNewWindow.accesskey;" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
150 |
+ tbattr="tabbrowser-multiple" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
151 |
+ oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/> |
1045 | 152 |
+ <menuseparator id="context_sendTabToDevice_separator" class="sync-ui-item"/> |
932 | 153 |
+ <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
1045 | 154 |
+ class="sync-ui-item" |
994 | 155 |
+ accesskey="&sendTabToDevice.accesskey;"> |
932 | 156 |
+ <menupopup id="context_sendTabToDevicePopupMenu" |
985 | 157 |
+ onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
932 | 158 |
+ </menu> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
159 |
+ <menuseparator/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
160 |
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
291 | 161 |
+ tbattr="tabbrowser-multiple-visible" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
162 |
+ oncommand="gBrowser.reloadAllTabs();"/> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
163 |
+ <menuitem id="context_bookmarkSelectedTabs" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
164 |
+ hidden="true" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
165 |
+ label="&bookmarkSelectedTabs.label;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
166 |
+ accesskey="&bookmarkSelectedTabs.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
167 |
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
168 |
+ <menuitem id="context_bookmarkAllTabs" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
169 |
+ label="&bookmarkAllTabs.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
170 |
+ accesskey="&bookmarkAllTabs.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
171 |
+ command="Browser:BookmarkAllTabs"/> |
662 | 172 |
+ <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;" |
904 | 173 |
+ oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
174 |
+ <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
175 |
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
176 |
+ <menuseparator/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
177 |
+ <menuitem id="context_undoCloseTab" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
178 |
+ label="&undoCloseTab.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
179 |
+ accesskey="&undoCloseTab.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
180 |
+ observes="History:UndoCloseTab"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
181 |
+ <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
182 |
+ oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
183 |
+ <menuitem id="context_closeSelectedTabs" label="&closeSelectedTabs.label;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
184 |
+ hidden="true" accesskey="&closeSelectedTabs.accesskey;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
185 |
+ oncommand="gBrowser.removeMultiSelectedTabs();"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
186 |
+ </menupopup> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
187 |
+ |
193 | 188 |
+ <!-- bug 415444/582485: event.stopPropagation is here for the cloned version |
189 |
+ of this menupopup --> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
+ <menupopup id="backForwardMenu" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
+ onpopupshowing="return FillHistoryMenu(event.target);" |
193 | 192 |
+ oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
+ onclick="checkForMiddleClick(this, event);"/> |
650 | 194 |
+ <tooltip id="aHTMLTooltip" page="true"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
195 |
+ <tooltip id="remoteBrowserTooltip"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
+ <!-- for search and content formfill/pw manager --> |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
198 |
+ |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
199 |
+ <panel type="autocomplete-richlistbox" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
200 |
+ id="PopupAutoComplete" |
1045 | 201 |
+ role="group" |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
202 |
+ noautofocus="true" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
203 |
+ hidden="true" |
943 | 204 |
+ overflowpadding="4" |
982 | 205 |
+ norolluponanchor="true" |
206 |
+ nomaxresults="true" /> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ |
817 | 208 |
+ <!-- for search with one-off buttons --> |
1045 | 209 |
+ <panel type="autocomplete-richlistbox" |
210 |
+ id="PopupSearchAutoComplete" |
|
211 |
+ role="group" |
|
212 |
+ noautofocus="true" |
|
213 |
+ hidden="true" /> |
|
817 | 214 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
+ <!-- for url bar autocomplete --> |
923 | 216 |
+ <panel type="autocomplete-richlistbox" |
217 |
+ id="PopupAutoCompleteRichResult" |
|
1045 | 218 |
+ role="group" |
923 | 219 |
+ noautofocus="true" |
220 |
+ hidden="true" |
|
221 |
+ flip="none" |
|
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
222 |
+ level="parent" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
223 |
+ overflowpadding="15" /> |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
224 |
+ |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
225 |
+ <!-- for date/time picker. consumeoutsideclicks is set to never, so that |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
226 |
+ clicks on the anchored input box are never consumed. --> |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
227 |
+ <panel id="DateTimePickerPanel" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
228 |
+ type="arrow" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
229 |
+ hidden="true" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
230 |
+ orient="vertical" |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
231 |
+ noautofocus="true" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
232 |
+ norolluponanchor="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
233 |
+ consumeoutsideclicks="never" |
982 | 234 |
+ level="parent" |
235 |
+ tabspecific="true"> |
|
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
236 |
+ </panel> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
237 |
+ |
850 | 238 |
+ <!-- for select dropdowns. The menupopup is what shows the list of options, |
239 |
+ and the popuponly menulist makes things like the menuactive attributes |
|
240 |
+ work correctly on the menupopup. ContentSelectDropdown expects the |
|
241 |
+ popuponly menulist to be its immediate parent. --> |
|
242 |
+ <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
|
881 | 243 |
+ <menupopup rolluponmousewheel="true" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
244 |
+ activateontab="true" position="after_start" |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
953
diff
changeset
|
245 |
+ level="parent" |
881 | 246 |
+#ifdef XP_WIN |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
247 |
+ consumeoutsideclicks="false" ignorekeys="shortcuts" |
881 | 248 |
+#endif |
249 |
+ /> |
|
850 | 250 |
+ </menulist> |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
251 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
252 |
+ <!-- for invalid form error message --> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
253 |
+ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
193 | 254 |
+ <description/> |
255 |
+ </panel> |
|
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
256 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
257 |
+ <panel id="editBookmarkPanel" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
258 |
+ type="arrow" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
259 |
+ orient="vertical" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
+ ignorekeys="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
+ hidden="true" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
262 |
+ tabspecific="true" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
+ aria-labelledby="editBookmarkPanelTitle"> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
264 |
+ <box class="panel-header"> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
265 |
+ <label id="editBookmarkPanelTitle"/> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
266 |
+ </box> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
267 |
+ <html:div id="editBookmarkPanelFaviconContainer"> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
268 |
+ <html:img id="editBookmarkPanelFavicon"/> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
269 |
+ </html:div> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
270 |
+ <box id="editBookmarkPanelImage"/> |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
271 |
+#include ../../components/places/content/editBookmarkPanel.inc.xul |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
272 |
+ <vbox id="editBookmarkPanelBottomContent" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
273 |
+ flex="1"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
274 |
+ <checkbox id="editBookmarkPanel_showForNewBookmarks" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
275 |
+ label="&editBookmark.showForNewBookmarks.label;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
276 |
+ accesskey="&editBookmark.showForNewBookmarks.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
277 |
+ oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
278 |
+ </vbox> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
279 |
+ <hbox id="editBookmarkPanelBottomButtons" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
280 |
+ style="min-width: &editBookmark.panel.width;;"> |
885 | 281 |
+#ifdef XP_UNIX |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
283 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
+ oncommand="StarUI.panel.hidePopup();"/> |
916 | 287 |
+ <button id="editBookmarkPanelRemoveButton" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
+ class="editBookmarkPanelBottomButton" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
289 |
+ oncommand="StarUI.removeBookmarkButtonCommand();"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
290 |
+#else |
916 | 291 |
+ <button id="editBookmarkPanelRemoveButton" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
+ class="editBookmarkPanelBottomButton" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
293 |
+ oncommand="StarUI.removeBookmarkButtonCommand();"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
294 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
295 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
296 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
297 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
298 |
+ oncommand="StarUI.panel.hidePopup();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
299 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
300 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
301 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
302 |
+ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
303 |
+ <!-- UI tour experience --> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
304 |
+ <panel id="UITourTooltip" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
305 |
+ type="arrow" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
306 |
+ hidden="true" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
307 |
+ noautofocus="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
308 |
+ noautohide="true" |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
309 |
+ align="start" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
310 |
+ orient="vertical" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
311 |
+ role="alert"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
312 |
+ <vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
313 |
+ <hbox id="UITourTooltipBody"> |
923 | 314 |
+ <image id="UITourTooltipIcon"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
315 |
+ <vbox flex="1"> |
923 | 316 |
+ <hbox id="UITourTooltipTitleContainer"> |
317 |
+ <label id="UITourTooltipTitle" flex="1"/> |
|
318 |
+ <toolbarbutton id="UITourTooltipClose" class="close-icon" |
|
319 |
+ tooltiptext="&uiTour.infoPanel.close;"/> |
|
320 |
+ </hbox> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
321 |
+ <description id="UITourTooltipDescription" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
322 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
323 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
324 |
+ <hbox id="UITourTooltipButtons" flex="1" align="center"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
325 |
+ </vbox> |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
326 |
+ </panel> |
766 | 327 |
+ <!-- type="default" forces frames to be created so that the panel's size can be determined --> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
328 |
+ <panel id="UITourHighlightContainer" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
329 |
+ type="default" |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
330 |
+ hidden="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
331 |
+ noautofocus="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
332 |
+ noautohide="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
333 |
+ flip="none" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
334 |
+ consumeoutsideclicks="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
335 |
+ mousethrough="always"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
336 |
+ <box id="UITourHighlight"></box> |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
337 |
+ </panel> |
817 | 338 |
+ |
985 | 339 |
+ <panel id="sidebarMenu-popup" |
340 |
+ class="cui-widget-panel" |
|
341 |
+ role="group" |
|
342 |
+ type="arrow" |
|
343 |
+ hidden="true" |
|
344 |
+ flip="slide" |
|
345 |
+ orient="vertical" |
|
346 |
+ position="bottomcenter topleft"> |
|
347 |
+ <toolbarbutton id="sidebar-switcher-bookmarks" |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
348 |
+ type="checkbox" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
349 |
+ label="&bookmarksButton.label;" |
985 | 350 |
+ class="subviewbutton subviewbutton-iconic" |
351 |
+ key="viewBookmarksSidebarKb" |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
352 |
+ oncommand="SidebarUI.show('viewBookmarksSidebar');"/> |
985 | 353 |
+ <toolbarbutton id="sidebar-switcher-history" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
354 |
+ type="checkbox" |
985 | 355 |
+ label="&historyButton.label;" |
356 |
+ class="subviewbutton subviewbutton-iconic" |
|
357 |
+ key="key_gotoHistory" |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
358 |
+ oncommand="SidebarUI.show('viewHistorySidebar');"/> |
985 | 359 |
+ <toolbarbutton id="sidebar-switcher-tabs" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
360 |
+ type="checkbox" |
985 | 361 |
+ label="&syncedTabs.sidebar.label;" |
1045 | 362 |
+ class="subviewbutton subviewbutton-iconic sync-ui-item" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
363 |
+ oncommand="SidebarUI.show('viewTabsSidebar');"/> |
985 | 364 |
+ <toolbarseparator/> |
1036 | 365 |
+ <!-- Extension toolbarbuttons go here. --> |
366 |
+ <toolbarseparator id="sidebar-extensions-separator"/> |
|
985 | 367 |
+ <toolbarbutton id="sidebar-reverse-position" |
368 |
+ class="subviewbutton" |
|
369 |
+ oncommand="SidebarUI.reversePosition()"/> |
|
370 |
+ <toolbarseparator/> |
|
371 |
+ <toolbarbutton label="&sidebarMenuClose.label;" |
|
372 |
+ class="subviewbutton" |
|
373 |
+ oncommand="SidebarUI.hide()"/> |
|
374 |
+ </panel> |
|
515 | 375 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
376 |
+ <menupopup id="toolbar-context-menu" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
377 |
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); UpdateDownloadsAutoHide(this); UpdateManageExtension(this)"> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
378 |
+ <menuitem oncommand="openAboutAddonsForContextAction(this.parentElement)" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
379 |
+ accesskey="&customizeMenu.manageExtension.accesskey;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
380 |
+ label="&customizeMenu.manageExtension.label;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
381 |
+ contexttype="toolbaritem" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
382 |
+ class="customize-context-manageExtension"/> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
383 |
+ <menuseparator/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
384 |
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
385 |
+ accesskey="&customizeMenu.pinToOverflowMenu.accesskey;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
386 |
+ label="&customizeMenu.pinToOverflowMenu.label;" |
766 | 387 |
+ contexttype="toolbaritem" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
388 |
+ class="customize-context-moveToPanel"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
389 |
+ <menuitem oncommand="onDownloadsAutoHideChange(event)" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
390 |
+ type="checkbox" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
391 |
+ accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
392 |
+ label="&customizeMenu.autoHideDownloadsButton.label;" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
393 |
+ contexttype="toolbaritem" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
394 |
+ class="customize-context-autoHide"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
395 |
+ <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
396 |
+ accesskey="&customizeMenu.removeFromToolbar.accesskey;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
397 |
+ label="&customizeMenu.removeFromToolbar.label;" |
766 | 398 |
+ contexttype="toolbaritem" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
399 |
+ class="customize-context-removeFromToolbar"/> |
766 | 400 |
+ <menuitem id="toolbar-context-reloadAllTabs" |
401 |
+ class="toolbaritem-tabsmenu" |
|
402 |
+ contexttype="tabbar" |
|
403 |
+ oncommand="gBrowser.reloadAllTabs();" |
|
404 |
+ label="&toolbarContextMenu.reloadAllTabs.label;" |
|
405 |
+ accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/> |
|
406 |
+ <menuitem id="toolbar-context-bookmarkAllTabs" |
|
407 |
+ class="toolbaritem-tabsmenu" |
|
408 |
+ contexttype="tabbar" |
|
409 |
+ command="Browser:BookmarkAllTabs" |
|
410 |
+ label="&toolbarContextMenu.bookmarkAllTabs.label;" |
|
411 |
+ accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/> |
|
412 |
+ <menuitem id="toolbar-context-undoCloseTab" |
|
413 |
+ class="toolbaritem-tabsmenu" |
|
414 |
+ contexttype="tabbar" |
|
415 |
+ label="&toolbarContextMenu.undoCloseTab.label;" |
|
416 |
+ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;" |
|
417 |
+ observes="History:UndoCloseTab"/> |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
418 |
+ <menuseparator/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
419 |
+ <menuseparator id="viewToolbarsMenuSeparator"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
420 |
+ <!-- XXXgijs: we're using oncommand handler here to avoid the event being |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
421 |
+ redirected to the command element, thus preventing |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
422 |
+ listeners on the menupopup or further up the tree from |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
423 |
+ seeing the command event pass by. The observes attribute is |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
424 |
+ here so that the menuitem is still disabled and re-enabled |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
425 |
+ correctly. --> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
426 |
+ <menuitem oncommand="gCustomizeMode.enter()" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
427 |
+ observes="cmd_CustomizeToolbars" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
428 |
+ class="viewCustomizeToolbar" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
429 |
+ label="&viewCustomizeToolbar.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
430 |
+ accesskey="&viewCustomizeToolbar.accesskey;"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
431 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
432 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
433 |
+ <menupopup id="blockedPopupOptions" |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
434 |
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
435 |
+ onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);"> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
436 |
+ <menuitem id="blockedPopupAllowSite" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
437 |
+ accesskey="&allowPopups.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
438 |
+ oncommand="gPopupBlockerObserver.toggleAllowPopupsForSite(event);"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
439 |
+ <menuitem |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
440 |
+#ifdef XP_WIN |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
441 |
+ label="&editPopupSettings.label;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
442 |
+#else |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
443 |
+ label="&editPopupSettingsUnix.label;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
444 |
+#endif |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
445 |
+ accesskey="&editPopupSettings.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
446 |
+ oncommand="gPopupBlockerObserver.editPopupSettings();"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
447 |
+ <menuitem id="blockedPopupDontShowMessage" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
448 |
+ accesskey="&dontShowMessage.accesskey;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
449 |
+ type="checkbox" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
450 |
+ oncommand="gPopupBlockerObserver.dontShowMessage();"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
451 |
+ <menuseparator id="blockedPopupsSeparator"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
452 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
453 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
454 |
+ <menupopup id="autohide-context" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
455 |
+ onpopupshowing="FullScreen.getAutohide(this.firstChild);"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
456 |
+ <menuitem type="checkbox" label="&fullScreenAutohide.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
457 |
+ accesskey="&fullScreenAutohide.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
458 |
+ oncommand="FullScreen.setAutohide();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
459 |
+ <menuseparator/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
460 |
+ <menuitem label="&fullScreenExit.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
461 |
+ accesskey="&fullScreenExit.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
462 |
+ oncommand="BrowserFullScreen();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
463 |
+ </menupopup> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
464 |
+ |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
465 |
+ <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
466 |
+ onpopupshowing="if (event.target != this) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
467 |
+ return true; |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
468 |
+ gContextMenu = new nsContextMenu(this, event.shiftKey); |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
469 |
+ if (gContextMenu.shouldDisplay) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
470 |
+ updateEditUIVisibility(); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
471 |
+ return gContextMenu.shouldDisplay;" |
400 | 472 |
+ onpopuphiding="if (event.target != this) |
473 |
+ return; |
|
474 |
+ gContextMenu.hiding(); |
|
475 |
+ gContextMenu = null; |
|
476 |
+ updateEditUIVisibility();"> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
477 |
+#include browser-context.inc |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
478 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
479 |
+ |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
480 |
+#include ../../components/places/content/placesContextMenu.inc.xul |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
481 |
+ |
932 | 482 |
+ <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top"> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
483 |
+ <hbox id="ctrlTab-previews"/> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
484 |
+ <hbox id="ctrlTab-showAll-container" pack="center"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
485 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
486 |
+ |
994 | 487 |
+ <panel id="pageActionPanel" |
985 | 488 |
+ class="cui-widget-panel" |
489 |
+ role="group" |
|
490 |
+ type="arrow" |
|
491 |
+ hidden="true" |
|
492 |
+ flip="slide" |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
493 |
+ photon="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
494 |
+ position="bottomcenter topright" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
495 |
+ tabspecific="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
496 |
+ noautofocus="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
497 |
+ copyURL-title="&pageAction.copyLink.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
498 |
+ emailLink-title="&emailPageCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
499 |
+ sendToDevice-title="&pageAction.sendTabToDevice.label;" |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
500 |
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
501 |
+ shareURL-title="&pageAction.shareUrl.label;" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
502 |
+ shareMore-label="&pageAction.shareMore.label;"> |
1036 | 503 |
+ <panelmultiview id="pageActionPanelMultiView" |
504 |
+ mainViewId="pageActionPanelMainView" |
|
505 |
+ viewCacheId="appMenu-viewCache"> |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
506 |
+ <panelview id="pageActionPanelMainView" |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
507 |
+ context="pageActionContextMenu" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
508 |
+ class="PanelUI-subView"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
509 |
+ <vbox class="panel-subview-body"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
510 |
+ </panelview> |
1036 | 511 |
+ </panelmultiview> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
512 |
+ </panel> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
513 |
+ |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
514 |
+ <panel id="confirmation-hint" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
515 |
+ role="alert" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
516 |
+ type="arrow" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
517 |
+ hidden="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
518 |
+ flip="slide" |
985 | 519 |
+ position="bottomcenter topright" |
994 | 520 |
+ tabspecific="true" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
521 |
+ noautofocus="true"> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
522 |
+ <hbox id="confirmation-hint-checkmark-animation-container"> |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
523 |
+ <image id="confirmation-hint-checkmark-image"/> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
524 |
+ </hbox> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
525 |
+ <label id="confirmation-hint-message"/> |
985 | 526 |
+ </panel> |
527 |
+ |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
528 |
+ <menupopup id="pageActionContextMenu" |
994 | 529 |
+ onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);"> |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
530 |
+ <menuitem class="pageActionContextMenuItem builtInUnpinned" |
994 | 531 |
+ label="&pageAction.addToUrlbar.label;" |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
532 |
+ oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
533 |
+ <menuitem class="pageActionContextMenuItem builtInPinned" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
534 |
+ label="&pageAction.removeFromUrlbar.label;" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
535 |
+ oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
536 |
+ <menuitem class="pageActionContextMenuItem extensionUnpinned" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
537 |
+ label="&pageAction.allowInUrlbar.label;" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
538 |
+ oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
539 |
+ <menuitem class="pageActionContextMenuItem extensionPinned" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
540 |
+ label="&pageAction.disallowInUrlbar.label;" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
541 |
+ oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
542 |
+ <menuseparator class="pageActionContextMenuItem extensionPinned extensionUnpinned"/> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
543 |
+ <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
544 |
+ label="&pageAction.manageExtension.label;" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
545 |
+ oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/> |
994 | 546 |
+ </menupopup> |
547 |
+ |
|
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
548 |
+#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
549 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
550 |
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
551 |
+ |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
552 |
+ <tooltip id="back-button-tooltip"> |
410 | 553 |
+ <label class="tooltip-label" value="&backButton.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
554 |
+#ifdef XP_MACOSX |
410 | 555 |
+ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
556 |
+#else |
410 | 557 |
+ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
558 |
+#endif |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
559 |
+ </tooltip> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
560 |
+ |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
561 |
+ <tooltip id="forward-button-tooltip"> |
410 | 562 |
+ <label class="tooltip-label" value="&forwardButton.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
563 |
+#ifdef XP_MACOSX |
410 | 564 |
+ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
565 |
+#else |
410 | 566 |
+ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
567 |
+#endif |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
568 |
+ </tooltip> |
612 | 569 |
+ |
662 | 570 |
+#include popup-notifications.inc |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
571 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
572 |
+#include ../../components/customizableui/content/panelUI.inc.xul |
881 | 573 |
+#include ../../components/controlcenter/content/panel.inc.xul |
1045 | 574 |
+#include ../../components/downloads/content/downloadsPanel.inc.xul |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
575 |
+#include browser-allTabsMenu.inc.xul |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
576 |
+ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
577 |
+ <hbox id="downloads-animation-container" mousethrough="always"> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
578 |
+ <vbox id="downloads-notification-anchor" hidden="true"> |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
579 |
+ <vbox id="downloads-indicator-notification"/> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
580 |
+ </vbox> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
581 |
+ </hbox> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
582 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
583 |
+ <tooltip id="dynamic-shortcut-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
584 |
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
916 | 585 |
+ |
586 |
+ <menupopup id="SyncedTabsSidebarContext"> |
|
923 | 587 |
+ <menuitem label="&syncedTabs.context.open.label;" |
588 |
+ accesskey="&syncedTabs.context.open.accesskey;" |
|
589 |
+ id="syncedTabsOpenSelected" where="current"/> |
|
590 |
+ <menuitem label="&syncedTabs.context.openInNewTab.label;" |
|
591 |
+ accesskey="&syncedTabs.context.openInNewTab.accesskey;" |
|
592 |
+ id="syncedTabsOpenSelectedInTab" where="tab"/> |
|
593 |
+ <menuitem label="&syncedTabs.context.openInNewWindow.label;" |
|
594 |
+ accesskey="&syncedTabs.context.openInNewWindow.accesskey;" |
|
595 |
+ id="syncedTabsOpenSelectedInWindow" where="window"/> |
|
596 |
+ <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;" |
|
597 |
+ accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;" |
|
598 |
+ id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/> |
|
599 |
+ <menuseparator/> |
|
916 | 600 |
+ <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;" |
601 |
+ accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;" |
|
602 |
+ id="syncedTabsBookmarkSelected"/> |
|
923 | 603 |
+ <menuitem label="&syncedTabs.context.copy.label;" |
604 |
+ accesskey="&syncedTabs.context.copy.accesskey;" |
|
605 |
+ id="syncedTabsCopySelected"/> |
|
916 | 606 |
+ <menuseparator/> |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
953
diff
changeset
|
607 |
+ <menuitem label="&syncedTabs.context.openAllInTabs.label;" |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
953
diff
changeset
|
608 |
+ accesskey="&syncedTabs.context.openAllInTabs.accesskey;" |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
953
diff
changeset
|
609 |
+ id="syncedTabsOpenAllInTabs"/> |
985 | 610 |
+ <menuitem label="&syncedTabs.context.managedevices.label;" |
611 |
+ accesskey="&syncedTabs.context.managedevices.accesskey;" |
|
612 |
+ id="syncedTabsManageDevices" |
|
613 |
+ oncommand="gSync.openDevicesManagementPage('syncedtabs-sidebar');"/> |
|
916 | 614 |
+ <menuitem label="&syncSyncNowItem.label;" |
615 |
+ accesskey="&syncSyncNowItem.accesskey;" |
|
616 |
+ id="syncedTabsRefresh"/> |
|
617 |
+ </menupopup> |
|
618 |
+ <menupopup id="SyncedTabsSidebarTabsFilterContext" |
|
619 |
+ class="textbox-contextmenu"> |
|
620 |
+ <menuitem label="&undoCmd.label;" |
|
621 |
+ accesskey="&undoCmd.accesskey;" |
|
622 |
+ cmd="cmd_undo"/> |
|
623 |
+ <menuseparator/> |
|
624 |
+ <menuitem label="&cutCmd.label;" |
|
625 |
+ accesskey="&cutCmd.accesskey;" |
|
626 |
+ cmd="cmd_cut"/> |
|
627 |
+ <menuitem label="©Cmd.label;" |
|
628 |
+ accesskey="©Cmd.accesskey;" |
|
629 |
+ cmd="cmd_copy"/> |
|
630 |
+ <menuitem label="&pasteCmd.label;" |
|
631 |
+ accesskey="&pasteCmd.accesskey;" |
|
632 |
+ cmd="cmd_paste"/> |
|
633 |
+ <menuitem label="&deleteCmd.label;" |
|
634 |
+ accesskey="&deleteCmd.accesskey;" |
|
635 |
+ cmd="cmd_delete"/> |
|
636 |
+ <menuseparator/> |
|
637 |
+ <menuitem label="&selectAllCmd.label;" |
|
638 |
+ accesskey="&selectAllCmd.accesskey;" |
|
639 |
+ cmd="cmd_selectAll"/> |
|
640 |
+ <menuseparator/> |
|
641 |
+ <menuitem label="&syncSyncNowItem.label;" |
|
642 |
+ accesskey="&syncSyncNowItem.accesskey;" |
|
643 |
+ id="syncedTabsRefreshFilter"/> |
|
644 |
+ </menupopup> |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
645 |
+ |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
646 |
+ <hbox id="statuspanel" inactive="true" layer="true"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
647 |
+ <hbox id="statuspanel-inner"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
648 |
+ <label id="statuspanel-label" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
649 |
+ role="status" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
650 |
+ aria-live="off" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
651 |
+ flex="1" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
652 |
+ crop="end"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
653 |
+ </hbox> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
654 |
+ </hbox> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
655 |
+ </popupset> |
985 | 656 |
+ <box id="appMenu-viewCache" hidden="true"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
657 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
658 |
+<vbox id="titlebar"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
659 |
+ <hbox id="titlebar-content"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
660 |
+ <spacer id="titlebar-spacer" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
661 |
+ <hbox id="titlebar-buttonbox-container"> |
1045 | 662 |
+ <hbox id="titlebar-buttonbox" class="titlebar-color"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
663 |
+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
664 |
+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
665 |
+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
666 |
+ </hbox> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
667 |
+ </hbox> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
668 |
+#ifdef XP_MACOSX |
718 | 669 |
+ <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary |
670 |
+ buttonbox from reversing order in RTL by forcing an LTR direction. --> |
|
671 |
+ <hbox id="titlebar-secondary-buttonbox" dir="ltr"> |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
672 |
+ <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/> |
718 | 673 |
+ <hbox class="private-browsing-indicator"/> |
674 |
+ <hbox id="titlebar-fullscreen-button"/> |
|
675 |
+ </hbox> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
676 |
+#endif |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
677 |
+ </hbox> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
678 |
+</vbox> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
679 |
+ |
1036 | 680 |
+ <toolbox id="navigator-toolbox"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
681 |
+ <!-- Menu --> |
1045 | 682 |
+ <toolbar type="menubar" id="toolbar-menubar" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
683 |
+ class="browser-toolbar chromeclass-menubar titlebar-color" |
1045 | 684 |
+ customizable="true" |
1036 | 685 |
+ mode="icons" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
686 |
+#ifdef MENUBAR_CAN_AUTOHIDE |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
687 |
+ toolbarname="&menubarCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
688 |
+ accesskey="&menubarCmd.accesskey;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
689 |
+ autohide="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
690 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
691 |
+ context="toolbar-context-menu"> |
766 | 692 |
+ <toolbaritem id="menubar-items" align="center"> |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
693 |
+# The entire main menubar is placed into browser-menubar.inc, so that it can be |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
694 |
+# shared with other top level windows in macWindow.inc.xul. |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
695 |
+#include browser-menubar.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
696 |
+ </toolbaritem> |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
697 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
698 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
699 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
700 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
701 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
702 |
+ </toolbar> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
703 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
704 |
+ <toolbar id="TabsToolbar" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
705 |
+ class="browser-toolbar titlebar-color" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
706 |
+ fullscreentoolbar="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
707 |
+ customizable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
708 |
+ mode="icons" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
709 |
+ aria-label="&tabsToolbar.label;" |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
710 |
+ context="toolbar-context-menu"> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
711 |
+ <hbox class="titlebar-placeholder" type="pre-tabs" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
712 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
713 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
714 |
+ <tabs id="tabbrowser-tabs" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
715 |
+ flex="1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
716 |
+ setfocus="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
717 |
+ tooltip="tabbrowser-tab-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
718 |
+ stopwatchid="FX_TAB_CLICK_MS"> |
863 | 719 |
+ <tab class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
720 |
+ </tabs> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
721 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
722 |
+ <toolbarbutton id="new-tab-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
723 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
724 |
+ label="&tabCmd.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
725 |
+ command="cmd_newNavigatorTab" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
726 |
+ onclick="checkForMiddleClick(this, event);" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
727 |
+ tooltip="dynamic-shortcut-tooltip" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
728 |
+ ondrop="newTabButtonObserver.onDrop(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
729 |
+ ondragover="newTabButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
730 |
+ ondragenter="newTabButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
731 |
+ ondragexit="newTabButtonObserver.onDragExit(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
732 |
+ cui-areatype="toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
733 |
+ removable="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
734 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
735 |
+ <toolbarbutton id="alltabs-button" |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
736 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
737 |
+ oncommand="gTabsPanel.showAllTabsPanel();" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
738 |
+ label="&listAllTabs.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
739 |
+ tooltiptext="&listAllTabs.label;" |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
740 |
+ removable="false"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
741 |
+ |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
742 |
+ <hbox class="titlebar-placeholder" type="post-tabs" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
743 |
+ ordinal="1000" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
744 |
+ skipintoolbarset="true"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
745 |
+ |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
746 |
+ <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
747 |
+ ordinal="1000" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
748 |
+ aria-live="polite" skipintoolbarset="true"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
749 |
+ <hbox class="private-browsing-indicator" skipintoolbarset="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
750 |
+ ordinal="1000"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
751 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
752 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
753 |
+ ordinal="1000" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
754 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
755 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
756 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
757 |
+#ifdef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
758 |
+ <hbox class="titlebar-placeholder" type="fullscreen-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
759 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
760 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
761 |
+ </toolbar> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
762 |
+ |
837 | 763 |
+ <toolbar id="nav-bar" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
764 |
+ class="browser-toolbar" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
765 |
+ aria-label="&navbarCmd.label;" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
766 |
+ fullscreentoolbar="true" mode="icons" customizable="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
767 |
+ customizationtarget="nav-bar-customization-target" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
768 |
+ overflowable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
769 |
+ overflowbutton="nav-bar-overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
770 |
+ overflowtarget="widget-overflow-list" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
771 |
+ overflowpanel="widget-overflow" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
772 |
+ context="toolbar-context-menu"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
773 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
774 |
+ <hbox id="nav-bar-customization-target" flex="1"> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
775 |
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
776 |
+ label="&backCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
777 |
+ removable="false" overflows="false" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
778 |
+ keepbroadcastattributeswhencustomizing="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
779 |
+ command="Browser:BackOrBackDuplicate" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
780 |
+ onclick="checkForMiddleClick(this, event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
781 |
+ tooltip="back-button-tooltip" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
782 |
+ context="backForwardMenu"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
783 |
+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
784 |
+ label="&forwardCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
785 |
+ removable="false" overflows="false" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
786 |
+ keepbroadcastattributeswhencustomizing="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
787 |
+ command="Browser:ForwardOrForwardDuplicate" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
788 |
+ onclick="checkForMiddleClick(this, event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
789 |
+ tooltip="forward-button-tooltip" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
790 |
+ context="backForwardMenu"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
791 |
+ <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
792 |
+ title="&reloadCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
793 |
+ removable="true" overflows="false"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
794 |
+ <toolbarbutton id="reload-button" class="toolbarbutton-1" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
795 |
+ label="&reloadCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
796 |
+ command="Browser:ReloadOrDuplicate" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
797 |
+ onclick="checkForMiddleClick(this, event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
798 |
+ tooltip="dynamic-shortcut-tooltip"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
799 |
+ <box class="toolbarbutton-animatable-box"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
800 |
+ <image class="toolbarbutton-animatable-image"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
801 |
+ </box> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
802 |
+ </toolbarbutton> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
803 |
+ <toolbarbutton id="stop-button" class="toolbarbutton-1" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
804 |
+ label="&stopCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
805 |
+ command="Browser:Stop" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
806 |
+ tooltip="dynamic-shortcut-tooltip"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
807 |
+ <box class="toolbarbutton-animatable-box"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
808 |
+ <image class="toolbarbutton-animatable-image"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
809 |
+ </box> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
810 |
+ </toolbarbutton> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
811 |
+ </toolbaritem> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
812 |
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
813 |
+ removable="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
814 |
+ label="&homeButton.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
815 |
+ ondragover="homeButtonObserver.onDragOver(event)" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
816 |
+ ondragenter="homeButtonObserver.onDragOver(event)" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
817 |
+ ondrop="homeButtonObserver.onDrop(event)" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
818 |
+ ondragexit="homeButtonObserver.onDragExit(event)" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
819 |
+ key="goHome" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
820 |
+ onclick="BrowserGoHome(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
821 |
+ cui-areatype="toolbar" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
822 |
+ tooltiptext="&homeButton.defaultPage.tooltip;"/> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
823 |
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
824 |
+ <toolbaritem id="urlbar-container" flex="400" persist="width" |
899 | 825 |
+ removable="false" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
826 |
+ class="chromeclass-location" overflows="false"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
827 |
+ <textbox id="urlbar" flex="1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
828 |
+ placeholder="&urlbar.placeholder2;" |
1046 | 829 |
+ defaultPlaceholder="&urlbar.placeholder2;" |
1045 | 830 |
+ focused="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
831 |
+ type="autocomplete" |
923 | 832 |
+ autocompletesearch="unifiedcomplete" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
833 |
+ autocompletesearchparam="enable-actions" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
834 |
+ autocompletepopup="PopupAutoCompleteRichResult" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
835 |
+ completeselectedindex="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
836 |
+ tabscrolling="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
837 |
+ newlines="stripsurroundingwhitespace" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
838 |
+ ontextentered="this.handleCommand(param);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
839 |
+ ontextreverted="return this.handleRevert();" |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
840 |
+ pageproxystate="invalid"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
841 |
+ <!-- Use onclick instead of normal popup= syntax since the popup |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
842 |
+ code fires onmousedown, and hence eats our favicon drag events. --> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
843 |
+ <box id="identity-box" role="button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
844 |
+ align="center" |
899 | 845 |
+ aria-label="&urlbar.viewSiteInfo.label;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
846 |
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
847 |
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
848 |
+ ondragstart="gIdentityHandler.onDragStart(event);"> |
904 | 849 |
+ <image id="identity-icon" |
850 |
+ consumeanchor="identity-box" |
|
851 |
+ onclick="PageProxyClickHandler(event);"/> |
|
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
852 |
+ <image id="sharing-icon" mousethrough="always"/> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
853 |
+ <box id="tracking-protection-icon-box" animationsenabled="true"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
854 |
+ <image id="tracking-protection-icon"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
855 |
+ <box id="tracking-protection-icon-animatable-box" flex="1"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
856 |
+ <image id="tracking-protection-icon-animatable-image" flex="1"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
857 |
+ </box> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
858 |
+ </box> |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
859 |
+ <box id="blocked-permissions-container" align="center"> |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
860 |
+ <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
861 |
+ tooltiptext="&urlbar.geolocationBlocked.tooltip;"/> |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
862 |
+ <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
863 |
+ tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/> |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
864 |
+ <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
865 |
+ tooltiptext="&urlbar.cameraBlocked.tooltip;"/> |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
866 |
+ <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
867 |
+ tooltiptext="&urlbar.microphoneBlocked.tooltip;"/> |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
868 |
+ <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
869 |
+ tooltiptext="&urlbar.screenBlocked.tooltip;"/> |
985 | 870 |
+ <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button" |
871 |
+ tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/> |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
872 |
+ <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
873 |
+ tooltiptext="&urlbar.popupBlocked.tooltip;"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
874 |
+ <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
875 |
+ tooltiptext="&urlbar.autoplayMediaBlocked.tooltip;"/> |
1036 | 876 |
+ <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button" |
877 |
+ tooltiptext="&urlbar.canvasBlocked.tooltip;"/> |
|
1045 | 878 |
+ <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button" |
879 |
+ tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/> |
|
880 |
+ <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button" |
|
881 |
+ tooltiptext="&urlbar.midiBlocked.tooltip;"/> |
|
932 | 882 |
+ </box> |
883 |
+ <box id="notification-popup-box" |
|
884 |
+ hidden="true" |
|
994 | 885 |
+ onmouseover="document.getElementById('identity-box').classList.add('no-hover');" |
886 |
+ onmouseout="document.getElementById('identity-box').classList.remove('no-hover');" |
|
932 | 887 |
+ align="center"> |
888 |
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
|
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
889 |
+ tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> |
932 | 890 |
+ <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
891 |
+ tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
892 |
+ <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button" |
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
893 |
+ tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/> |
932 | 894 |
+ <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
895 |
+ tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/> |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
896 |
+ <image id="canvas-notification-icon" class="notification-anchor-icon" role="button" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
897 |
+ tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/> |
932 | 898 |
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
899 |
+ tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/> |
932 | 900 |
+ <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
901 |
+ tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/> |
985 | 902 |
+ <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" |
903 |
+ tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;"> |
|
904 |
+ <image class="plugin-icon" /> |
|
905 |
+ <image id="plugin-icon-badge" /> |
|
906 |
+ </stack> |
|
932 | 907 |
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
908 |
+ tooltiptext="&urlbar.webNotificationAnchor.tooltip;"/> |
932 | 909 |
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
910 |
+ tooltiptext="&urlbar.webRTCShareDevicesNotificationAnchor.tooltip;"/> |
932 | 911 |
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
912 |
+ tooltiptext="&urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip;"/> |
932 | 913 |
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
914 |
+ tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/> |
932 | 915 |
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
916 |
+ tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/> |
932 | 917 |
+ <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
918 |
+ tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/> |
932 | 919 |
+ <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
920 |
+ tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/> |
932 | 921 |
+ <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
922 |
+ tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/> |
985 | 923 |
+ <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button" |
924 |
+ tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/> |
|
1045 | 925 |
+ <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button" |
926 |
+ tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/> |
|
927 |
+ <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button" |
|
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
928 |
+ tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/> |
932 | 929 |
+ </box> |
904 | 930 |
+ <image id="connection-icon"/> |
985 | 931 |
+ <image id="extension-icon"/> |
932 |
+ <image id="remote-control-icon" |
|
933 |
+ tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
934 |
+ <hbox id="identity-icon-labels"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
935 |
+ <label id="identity-icon-label" class="plain" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
936 |
+ <label id="identity-icon-country-label" class="plain"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
937 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
938 |
+ </box> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
939 |
+ <box id="urlbar-display-box" align="center"> |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
940 |
+ <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> |
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
941 |
+ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
942 |
+ </box> |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
943 |
+ <hbox id="page-action-buttons" context="pageActionContextMenu"> |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
944 |
+ <hbox id="contextual-feature-recommendation" role="button" hidden="true"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
945 |
+ <hbox id="cfr-label-container"> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
946 |
+ <label id="cfr-label"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
947 |
+ </hbox> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
948 |
+ <image id="cfr-button" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
949 |
+ class="urlbar-icon urlbar-page-action" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
950 |
+ role="presentation"/> |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
951 |
+ </hbox> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
952 |
+ <hbox id="userContext-icons" hidden="true"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
953 |
+ <label id="userContext-label"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
954 |
+ <image id="userContext-indicator"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
955 |
+ </hbox> |
850 | 956 |
+ <image id="reader-mode-button" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
957 |
+ class="urlbar-icon urlbar-page-action" |
1045 | 958 |
+ tooltip="dynamic-shortcut-tooltip" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
959 |
+ role="button" |
850 | 960 |
+ hidden="true" |
961 |
+ onclick="ReaderParent.buttonClick(event);"/> |
|
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
962 |
+ <toolbarbutton id="urlbar-zoom-button" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
963 |
+ onclick="FullZoom.reset();" |
985 | 964 |
+ tooltip="dynamic-shortcut-tooltip" |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
965 |
+ hidden="true"/> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
966 |
+ <box id="pageActionSeparator" class="urlbar-page-action"/> |
994 | 967 |
+ <image id="pageActionButton" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
968 |
+ class="urlbar-icon urlbar-page-action" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
969 |
+ role="button" |
994 | 970 |
+ tooltiptext="&pageActionButton.tooltip;" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
971 |
+ onmousedown="BrowserPageActions.mainButtonClicked(event);"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
972 |
+ <hbox id="star-button-box" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
973 |
+ hidden="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
974 |
+ class="urlbar-icon-wrapper urlbar-page-action" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
975 |
+ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);"> |
994 | 976 |
+ <image id="star-button" |
977 |
+ class="urlbar-icon" |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
978 |
+ role="button"/> |
994 | 979 |
+ <hbox id="star-button-animatable-box"> |
980 |
+ <image id="star-button-animatable-image" |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
981 |
+ role="presentation"/> |
994 | 982 |
+ </hbox> |
983 |
+ </hbox> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
984 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
985 |
+ </textbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
986 |
+ </toolbaritem> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
987 |
+ |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
988 |
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
989 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
990 |
+ <!-- This is a placeholder for the Downloads Indicator. It is visible |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
991 |
+ during the customization of the toolbar, in the palette, and before |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
992 |
+ the Downloads Indicator overlay is loaded. --> |
923 | 993 |
+ <toolbarbutton id="downloads-button" |
994 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional badged-button" |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
995 |
+ key="key_openDownloads" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
996 |
+ onmousedown="DownloadsIndicatorView.onCommand(event);" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
997 |
+ ondrop="DownloadsIndicatorView.onDrop(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
998 |
+ ondragover="DownloadsIndicatorView.onDragOver(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
999 |
+ ondragenter="DownloadsIndicatorView.onDragOver(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1000 |
+ label="&downloads.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1001 |
+ removable="true" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1002 |
+ overflows="false" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1003 |
+ cui-areatype="toolbar" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1004 |
+ hidden="true" |
1045 | 1005 |
+ tooltip="dynamic-shortcut-tooltip" |
1006 |
+ indicator="true"> |
|
1007 |
+ <!-- The panel's anchor area is smaller than the outer button, but must |
|
1008 |
+ always be visible and must not move or resize when the indicator |
|
1009 |
+ state changes, otherwise the panel could change its position or lose |
|
1010 |
+ its arrow unexpectedly. --> |
|
1011 |
+ <stack id="downloads-indicator-anchor" |
|
1012 |
+ consumeanchor="downloads-button"> |
|
1013 |
+ <box id="downloads-indicator-icon"/> |
|
1014 |
+ <stack id="downloads-indicator-progress-outer"> |
|
1015 |
+ <box id="downloads-indicator-progress-inner"/> |
|
1016 |
+ </stack> |
|
1017 |
+ </stack> |
|
1018 |
+ </toolbarbutton> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1019 |
+ |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1020 |
+ <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav" |
889 | 1021 |
+ removable="true" |
1036 | 1022 |
+ onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1023 |
+ closemenu="none" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1024 |
+ cui-areatype="toolbar" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1025 |
+ tooltiptext="&libraryButton.tooltip;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1026 |
+ label="&places.library.title;"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1027 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1028 |
+ </hbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1029 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1030 |
+ <toolbarbutton id="nav-bar-overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1031 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1032 |
+ skipintoolbarset="true" |
994 | 1033 |
+ tooltiptext="&navbarOverflow.label;"> |
1034 |
+ <box class="toolbarbutton-animatable-box"> |
|
1035 |
+ <image class="toolbarbutton-animatable-image"/> |
|
1036 |
+ </box> |
|
1037 |
+ </toolbarbutton> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1038 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1039 |
+ <toolbaritem id="PanelUI-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1040 |
+ removable="false"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1041 |
+ <toolbarbutton id="PanelUI-menu-button" |
885 | 1042 |
+ class="toolbarbutton-1 badged-button" |
766 | 1043 |
+ consumeanchor="PanelUI-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1044 |
+ label="&brandShortName;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1045 |
+ tooltiptext="&appmenu.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1046 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1047 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1048 |
+ <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1049 |
+ ordinal="1000"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1050 |
+ <toolbarbutton id="minimize-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1051 |
+ tooltiptext="&fullScreenMinimize.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1052 |
+ oncommand="window.minimize();"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1053 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1054 |
+ <toolbarbutton id="restore-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1055 |
+#ifdef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1056 |
+# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1057 |
+# to exit fullscreen and want it to behave like other toolbar buttons. |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1058 |
+ class="toolbarbutton-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1059 |
+#endif |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1060 |
+ tooltiptext="&fullScreenRestore.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1061 |
+ oncommand="BrowserFullScreen();"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1062 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1063 |
+ <toolbarbutton id="close-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1064 |
+ tooltiptext="&fullScreenClose.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1065 |
+ oncommand="BrowserTryToCloseWindow();"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1066 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1067 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1068 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1069 |
+ <toolbar id="PersonalToolbar" |
1036 | 1070 |
+ mode="icons" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1071 |
+ class="browser-toolbar chromeclass-directories" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1072 |
+ context="toolbar-context-menu" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1073 |
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1074 |
+ collapsed="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1075 |
+ customizable="true"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1076 |
+ <toolbaritem id="personal-bookmarks" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1077 |
+ title="&bookmarksToolbarItem.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1078 |
+ cui-areatype="toolbar" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1079 |
+ removable="true"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1080 |
+ <toolbarbutton id="bookmarks-toolbar-placeholder" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1081 |
+ class="bookmark-item" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1082 |
+ label="&bookmarksToolbarItem.label;"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1083 |
+ <toolbarbutton id="bookmarks-toolbar-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1084 |
+ class="toolbarbutton-1" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1085 |
+ flex="1" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1086 |
+ label="&bookmarksToolbarItem.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1087 |
+ oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1088 |
+ <hbox flex="1" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1089 |
+ id="PlacesToolbar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1090 |
+ context="placesContext" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1091 |
+ onmouseup="BookmarksEventHandler.onMouseUp(event);" |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1092 |
+ onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
994 | 1093 |
+ oncommand="BookmarksEventHandler.onCommand(event);" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1094 |
+ tooltip="bhTooltip" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1095 |
+ popupsinherittooltip="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1096 |
+ <hbox flex="1"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1097 |
+ <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1098 |
+ <image id="PlacesToolbarDropIndicator" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1099 |
+ mousethrough="always" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1100 |
+ collapsed="true"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1101 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1102 |
+ <scrollbox orient="horizontal" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1103 |
+ id="PlacesToolbarItems" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1104 |
+ flex="1"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1105 |
+ <toolbarbutton type="menu" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1106 |
+ id="PlacesChevron" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1107 |
+ class="toolbarbutton-1" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1108 |
+ mousethrough="never" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1109 |
+ collapsed="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1110 |
+ tooltiptext="&bookmarksToolbarChevron.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1111 |
+ onpopupshowing="document.getElementById('PlacesToolbar') |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1112 |
+ ._placesView._onChevronPopupShowing(event);"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1113 |
+ <menupopup id="PlacesChevronPopup" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1114 |
+ placespopup="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1115 |
+ tooltip="bhTooltip" popupsinherittooltip="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1116 |
+ context="placesContext"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1117 |
+ </toolbarbutton> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1118 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1119 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1120 |
+ </toolbaritem> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1121 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1122 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1123 |
+ <toolbarpalette id="BrowserToolbarPalette"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1124 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1125 |
+ <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1126 |
+#ifdef XP_MACOSX |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1127 |
+ command="cmd_print" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1128 |
+ tooltip="dynamic-shortcut-tooltip" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1129 |
+#else |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1130 |
+ command="cmd_printPreview" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1131 |
+ tooltiptext="&printButton.tooltip;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1132 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1133 |
+ label="&printButton.label;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1134 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1135 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1136 |
+ <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1137 |
+ label="&newNavigatorCmd.label;" |
985 | 1138 |
+ command="cmd_newNavigator" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1139 |
+ tooltip="dynamic-shortcut-tooltip" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1140 |
+ ondrop="newWindowButtonObserver.onDrop(event)" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1141 |
+ ondragover="newWindowButtonObserver.onDragOver(event)" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1142 |
+ ondragenter="newWindowButtonObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1143 |
+ ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1144 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1145 |
+ <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1146 |
+ observes="View:FullScreen" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1147 |
+ type="checkbox" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1148 |
+ label="&fullScreenCmd.label;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1149 |
+ tooltip="dynamic-shortcut-tooltip"/> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1150 |
+ |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1151 |
+ <toolbarbutton id="bookmarks-menu-button" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1152 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1153 |
+ type="menu" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1154 |
+ label="&bookmarksMenuButton2.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1155 |
+ tooltip="dynamic-shortcut-tooltip" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1156 |
+ anchor="dropmarker" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1157 |
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1158 |
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1159 |
+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1160 |
+ ondrop="PlacesMenuDNDHandler.onDrop(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1161 |
+ oncommand="BookmarkingUI.onCommand(event);"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1162 |
+ <menupopup id="BMB_bookmarksPopup" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1163 |
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1164 |
+ placespopup="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1165 |
+ context="placesContext" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1166 |
+ openInTabs="children" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1167 |
+ side="top" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1168 |
+ onmouseup="BookmarksEventHandler.onMouseUp(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1169 |
+ oncommand="BookmarksEventHandler.onCommand(event);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1170 |
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1171 |
+ onpopupshowing="BookmarkingUI.onPopupShowing(event); |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1172 |
+ BookmarkingUI.attachPlacesView(event, this);" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1173 |
+ tooltip="bhTooltip" popupsinherittooltip="true"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1174 |
+ <menuitem id="BMB_viewBookmarksSidebar" |
1046 | 1175 |
+ class="menuitem-iconic subviewbutton" |
1176 |
+ label-show="&viewBookmarksSidebar2.label;" |
|
1177 |
+ label-hide="&hideBookmarksSidebar.label;" |
|
1178 |
+ oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/> |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1179 |
+ <!-- NB: temporary solution for bug 985024, this should go away soon. --> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1180 |
+ <menuitem id="BMB_bookmarksShowAllTop" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1181 |
+ class="menuitem-iconic subviewbutton" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1182 |
+ label="&showAllBookmarks2.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1183 |
+ command="Browser:ShowAllBookmarks" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1184 |
+ key="manBookmarkKb"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1185 |
+ <menuseparator/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1186 |
+ <menu id="BMB_bookmarksToolbar" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1187 |
+ class="menu-iconic bookmark-item subviewbutton" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1188 |
+ label="&personalbarCmd.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1189 |
+ container="true"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1190 |
+ <menupopup id="BMB_bookmarksToolbarPopup" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1191 |
+ placespopup="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1192 |
+ context="placesContext" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1193 |
+ onpopupshowing="if (!this.parentNode._placesView) |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1194 |
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`, |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1195 |
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1196 |
+ <menuitem id="BMB_viewBookmarksToolbar" |
1046 | 1197 |
+ class="menuitem-iconic subviewbutton" |
1198 |
+ label-show="&viewBookmarksToolbar.label;" |
|
1199 |
+ label-hide="&hideBookmarksToolbar.label;" |
|
1200 |
+ oncommand="BookmarkingUI.toggleBookmarksToolbar();"/> |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1201 |
+ <menuseparator/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1202 |
+ <!-- Bookmarks toolbar items --> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1203 |
+ </menupopup> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1204 |
+ </menu> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1205 |
+ <menu id="BMB_unsortedBookmarks" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1206 |
+ class="menu-iconic bookmark-item subviewbutton" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1207 |
+ label="&bookmarksMenuButton.other.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1208 |
+ container="true"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1209 |
+ <menupopup id="BMB_unsortedBookmarksPopup" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1210 |
+ placespopup="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1211 |
+ context="placesContext" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1212 |
+ onpopupshowing="if (!this.parentNode._placesView) |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1213 |
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`, |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1214 |
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1215 |
+ </menu> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1216 |
+ <menu id="BMB_mobileBookmarks" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1217 |
+ class="menu-iconic bookmark-item subviewbutton" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1218 |
+ label="&bookmarksMenuButton.mobile.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1219 |
+ hidden="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1220 |
+ container="true"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1221 |
+ <menupopup id="BMB_mobileBookmarksPopup" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1222 |
+ placespopup="true" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1223 |
+ context="placesContext" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1224 |
+ onpopupshowing="if (!this.parentNode._placesView) |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1225 |
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.mobileGuid}`, |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1226 |
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1227 |
+ </menu> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1228 |
+ |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1229 |
+ <menuseparator/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1230 |
+ <!-- Bookmarks menu items will go here --> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1231 |
+ <menuitem id="BMB_bookmarksShowAll" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1232 |
+ class="subviewbutton panel-subview-footer" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1233 |
+ label="&showAllBookmarks2.label;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1234 |
+ command="Browser:ShowAllBookmarks" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1235 |
+ key="manBookmarkKb"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1236 |
+ </menupopup> |
994 | 1237 |
+ </toolbarbutton> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1238 |
+ |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1239 |
+ <toolbaritem id="search-container" |
1036 | 1240 |
+ class="chromeclass-toolbar-additional" |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1241 |
+ title="&searchItem.title;" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1242 |
+ align="center" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1243 |
+ flex="100" |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1244 |
+ persist="width"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1245 |
+ <searchbar id="searchbar" flex="1"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1246 |
+ </toolbaritem> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1247 |
+ </toolbarpalette> |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1248 |
+ <box id="library-animatable-box" class="toolbarbutton-animatable-box"> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1249 |
+ <image class="toolbarbutton-animatable-image"/> |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1250 |
+ </box> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1251 |
+ </toolbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1252 |
+ |
817 | 1253 |
+ <hbox id="fullscr-toggler" hidden="true"/> |
612 | 1254 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1255 |
+ <deck id="content-deck" flex="1"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1256 |
+ <hbox flex="1" id="browser"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1257 |
+ <vbox id="browser-border-start" hidden="true" layer="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1258 |
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1259 |
+ <sidebarheader id="sidebar-header" align="center"> |
985 | 1260 |
+ <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable"> |
1261 |
+ <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/> |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1262 |
+ <label id="sidebar-title" crop="end" flex="1" control="sidebar"/> |
985 | 1263 |
+ <image id="sidebar-switcher-arrow"/> |
1264 |
+ </toolbarbutton> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1265 |
+ <image id="sidebar-throbber"/> |
985 | 1266 |
+# To ensure the button label's intrinsic width doesn't expand the sidebar |
1267 |
+# if the label is long, the button needs flex=1. |
|
1268 |
+# To ensure the button doesn't expand unnecessarily for short labels, the |
|
1269 |
+# spacer should significantly out-flex the button. |
|
1270 |
+ <spacer flex="1000"/> |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
1271 |
+ <toolbarbutton id="sidebar-close" class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1272 |
+ </sidebarheader> |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1273 |
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true" |
850 | 1274 |
+ style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1275 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1276 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1277 |
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1278 |
+ <vbox id="appcontent" flex="1"> |
899 | 1279 |
+ <notificationbox id="high-priority-global-notificationbox" notificationside="top"/> |
1045 | 1280 |
+ <tabbox id="tabbrowser-tabbox" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1281 |
+ flex="1" tabcontainer="tabbrowser-tabs"> |
1068
70cd69cfa868
update KDE XUL variants
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1282 |
+ <tabpanels id="tabbrowser-tabpanels" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1283 |
+ flex="1" class="plain" selectedIndex="0"/> |
1045 | 1284 |
+ </tabbox> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1285 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1286 |
+ <vbox id="browser-border-end" hidden="true" layer="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1287 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1288 |
+#include ../../components/customizableui/content/customizeMode.inc.xul |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1289 |
+ </deck> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1290 |
+ |
932 | 1291 |
+ <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true"> |
1292 |
+ <html:div class="pointerlockfswarning-domain-text"> |
|
889 | 1293 |
+ &fullscreenWarning.beforeDomain.label; |
932 | 1294 |
+ <html:span class="pointerlockfswarning-domain"/> |
889 | 1295 |
+ &fullscreenWarning.afterDomain.label; |
1296 |
+ </html:div> |
|
932 | 1297 |
+ <html:div class="pointerlockfswarning-generic-text"> |
889 | 1298 |
+ &fullscreenWarning.generic.label; |
1299 |
+ </html:div> |
|
1300 |
+ <html:button id="fullscreen-exit-button" |
|
1301 |
+ onclick="FullScreen.exitDomFullScreen();"> |
|
1302 |
+#ifdef XP_MACOSX |
|
1303 |
+ &exitDOMFullscreenMac.button; |
|
1304 |
+#else |
|
1305 |
+ &exitDOMFullscreen.button; |
|
1306 |
+#endif |
|
1307 |
+ </html:button> |
|
1308 |
+ </html:div> |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1309 |
+ |
932 | 1310 |
+ <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true"> |
1311 |
+ <html:div class="pointerlockfswarning-domain-text"> |
|
1312 |
+ &pointerlockWarning.beforeDomain.label; |
|
1313 |
+ <html:span class="pointerlockfswarning-domain"/> |
|
1314 |
+ &pointerlockWarning.afterDomain.label; |
|
1315 |
+ </html:div> |
|
1316 |
+ <html:div class="pointerlockfswarning-generic-text"> |
|
1317 |
+ &pointerlockWarning.generic.label; |
|
1318 |
+ </html:div> |
|
1319 |
+ </html:div> |
|
1320 |
+ |
|
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1321 |
+ <vbox id="browser-bottombox" layer="true"> |
899 | 1322 |
+ <notificationbox id="global-notificationbox" notificationside="bottom"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1323 |
+ </vbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1324 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1325 |
+</window> |
961
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1326 |
diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1327 |
--- a/browser/base/jar.mn |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1328 |
+++ b/browser/base/jar.mn |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1329 |
@@ -28,16 +28,18 @@ browser.jar: |
961
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1330 |
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1331 |
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1332 |
* content/browser/browser.css (content/browser.css) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1333 |
content/browser/browser.js (content/browser.js) |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1334 |
#ifdef MOZ_BROWSER_XHTML |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1335 |
* content/browser/browser.xhtml (content/browser.xhtml) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1336 |
#endif |
961
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1337 |
* content/browser/browser.xul (content/browser.xul) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1338 |
+* content/browser/browser-kde.xul (content/browser-kde.xul) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1339 |
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1340 |
content/browser/browser-addons.js (content/browser-addons.js) |
1067 | 1341 |
content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js) |
961
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1342 |
content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1343 |
content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1344 |
content/browser/browser-customization.js (content/browser-customization.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1345 |
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
1346 |
content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1347 |
content/browser/browser-contentblocking.js (content/browser-contentblocking.js) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1348 |
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1349 |
--- a/browser/components/build/nsModule.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1350 |
+++ b/browser/components/build/nsModule.cpp |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1351 |
@@ -8,17 +8,17 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1352 |
#include "nsBrowserCompsCID.h" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1353 |
#include "DirectoryProvider.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1354 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1355 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1356 |
#include "nsWindowsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1357 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1358 |
#include "nsMacShellService.h" |
659 | 1359 |
#elif defined(MOZ_WIDGET_GTK) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1360 |
-#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1361 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1362 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1363 |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1364 |
#if defined(MOZ_WIDGET_COCOA) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1365 |
#include "nsMacAttribution.h" |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
1366 |
#endif |
409 | 1367 |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1368 |
#if defined(XP_WIN) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1369 |
#include "nsIEHistoryEnumerator.h" |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1370 |
@@ -34,18 +34,16 @@ using namespace mozilla::browser; |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1371 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1372 |
///////////////////////////////////////////////////////////////////////////// |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1373 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1374 |
NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1375 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1376 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1377 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1378 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
659 | 1379 |
-#elif defined(MOZ_WIDGET_GTK) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1380 |
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1381 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1382 |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1383 |
#if defined(MOZ_WIDGET_COCOA) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1384 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacAttributionService) |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
1385 |
#endif |
409 | 1386 |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1387 |
#if defined(XP_WIN) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1388 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1389 |
@@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1390 |
NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSERVICE_CID); |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1391 |
#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1392 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1393 |
static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1394 |
{ &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1395 |
#if defined(XP_WIN) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1396 |
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, |
659 | 1397 |
#elif defined(MOZ_WIDGET_GTK) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1398 |
- { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor }, |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1399 |
+ { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor }, |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1400 |
#endif |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1401 |
{ &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor }, |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1402 |
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create }, |
515 | 1403 |
#if defined(XP_WIN) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1404 |
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor }, |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1405 |
#elif defined(XP_MACOSX) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1406 |
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
904 | 1407 |
#endif |
885 | 1408 |
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1409 |
--- a/browser/components/preferences/in-content/main.js |
|
1410 |
+++ b/browser/components/preferences/in-content/main.js |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1411 |
@@ -327,16 +327,23 @@ var gMainPane = { |
1005 | 1412 |
this._backoffIndex++ : backoffTimes.length - 1]); |
1413 |
}; |
|
1414 |
||
1415 |
window.setTimeout(() => { |
|
1416 |
window.requestIdleCallback(pollForDefaultBrowser); |
|
1417 |
}, backoffTimes[this._backoffIndex]); |
|
952
8094e6bba260
rebased patches for 53.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
943
diff
changeset
|
1418 |
} |
985 | 1419 |
|
223 | 1420 |
+ var env = Components.classes["@mozilla.org/process/environment;1"] |
985 | 1421 |
+ .getService(Components.interfaces.nsIEnvironment); |
223 | 1422 |
+ var kde_session = 0; |
956 | 1423 |
+ if (env.get('KDE_FULL_SESSION') == "true") { |
985 | 1424 |
+ kde_session = 1; |
952
8094e6bba260
rebased patches for 53.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
943
diff
changeset
|
1425 |
+ } |
985 | 1426 |
+ |
1005 | 1427 |
this.initBrowserContainers(); |
985 | 1428 |
this.buildContentProcessCountMenuList(); |
916 | 1429 |
|
1005 | 1430 |
let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1431 |
let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
|
1432 |
performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
|
1433 |
||
1434 |
this.updateDefaultPerformanceSettingsPref(); |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1435 |
@@ -962,16 +969,27 @@ var gMainPane = { |
1005 | 1436 |
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1437 |
this._backoffIndex = 0; |
|
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1438 |
|
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1439 |
let shellSvc = getShellService(); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1440 |
if (!shellSvc) |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1441 |
return; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1442 |
try { |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1443 |
shellSvc.setDefaultBrowser(true, false); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1444 |
+ if (kde_session == 1) { |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1445 |
+ var shellObj = Components.classes["@mozilla.org/file/local;1"] |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1446 |
+ .createInstance(Components.interfaces.nsILocalFile); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1447 |
+ shellObj.initWithPath("/usr/bin/kwriteconfig"); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1448 |
+ var process = Components.classes["@mozilla.org/process/util;1"] |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1449 |
+ .createInstance(Components.interfaces.nsIProcess); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1450 |
+ process.init(shellObj); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1451 |
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1452 |
+ "BrowserApplication", "firefox"]; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1453 |
+ process.run(false, args, args.length); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1454 |
+ } |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1455 |
} catch (ex) { |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1456 |
Cu.reportError(ex); |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1457 |
return; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1458 |
} |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1459 |
|
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1460 |
let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1461 |
document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
1462 |
} |
779 | 1463 |
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1464 |
--- a/browser/components/shell/moz.build |
|
1465 |
+++ b/browser/components/shell/moz.build |
|
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1466 |
@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1467 |
] |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1468 |
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1469 |
SOURCES += [ |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1470 |
'nsMacShellService.cpp', |
659 | 1471 |
] |
923 | 1472 |
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1473 |
SOURCES += [ |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1474 |
'nsGNOMEShellService.cpp', |
923 | 1475 |
+ 'nsKDEShellService.cpp', |
1476 |
+ 'nsUnixShellService.cpp', |
|
659 | 1477 |
] |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1478 |
|
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1479 |
if SOURCES: |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1480 |
FINAL_LIBRARY = 'browsercomps' |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1481 |
|
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1482 |
EXTRA_JS_MODULES += [ |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1483 |
'HeadlessShell.jsm', |
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1484 |
'ShellService.jsm', |
779 | 1485 |
diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1486 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1487 |
--- /dev/null |
779 | 1488 |
+++ b/browser/components/shell/nsKDEShellService.cpp |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1489 |
@@ -0,0 +1,204 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1490 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
548 | 1491 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1492 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1493 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1494 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1495 |
+#include "mozilla/ArrayUtils.h" |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1496 |
+ |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1497 |
+#include "nsCOMPtr.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1498 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1499 |
+#include "nsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1500 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1501 |
+#include "nsIPrefService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1502 |
+#include "nsIProcess.h" |
515 | 1503 |
+#include "nsIFile.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1504 |
+#include "nsServiceManagerUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1505 |
+#include "nsComponentManagerUtils.h" |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1506 |
+#include "nsIMutableArray.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1507 |
+#include "nsISupportsPrimitives.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1508 |
+#include "nsArrayUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1509 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1510 |
+using namespace mozilla; |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1511 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1512 |
+nsresult |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1513 |
+nsKDEShellService::Init() |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1514 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1515 |
+ if( !nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1516 |
+ return NS_ERROR_NOT_AVAILABLE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1517 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1518 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1519 |
+ |
911 | 1520 |
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1521 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1522 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1523 |
+nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, |
548 | 1524 |
+ bool aForAllTypes, |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1525 |
+ bool* aIsDefaultBrowser) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1526 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1527 |
+ *aIsDefaultBrowser = false; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1528 |
+ if (aStartupCheck) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1529 |
+ mCheckedThisSession = true; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1530 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1531 |
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1532 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1533 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1534 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1535 |
+ nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1536 |
+ if (!str) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1537 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1538 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1539 |
+ str->SetData( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1540 |
+ command->AppendElement( str ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1541 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1542 |
+ if( nsKDEUtils::command( command )) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1543 |
+ *aIsDefaultBrowser = true; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1544 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1545 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1546 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1547 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1548 |
+nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes, |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1549 |
+ bool aForAllUsers) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1550 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1551 |
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1552 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1553 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1554 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1555 |
+ nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1556 |
+ nsCOMPtr<nsISupportsCString> paramstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1557 |
+ if (!cmdstr || !paramstr) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1558 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1559 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1560 |
+ cmdstr->SetData( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1561 |
+ command->AppendElement( cmdstr ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1562 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1563 |
+ paramstr->SetData( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1564 |
+ command->AppendElement( paramstr ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1565 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1566 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1567 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1568 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1569 |
+NS_IMETHODIMP |
910
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1570 |
+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult) |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1571 |
+{ |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1572 |
+ *aResult = true; |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1573 |
+ return NS_OK; |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1574 |
+} |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1575 |
+ |
a3615665211f
readd accidentally removed getter method
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
909
diff
changeset
|
1576 |
+NS_IMETHODIMP |
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1577 |
+nsKDEShellService::SetDesktopBackground(dom::Element* aElement, |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1578 |
+ int32_t aPosition, |
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1579 |
+ const nsACString& aImageName) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1580 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1581 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1582 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1583 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1584 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1585 |
+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1586 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1587 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1588 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1589 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1590 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1591 |
+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1592 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1593 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1594 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1595 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1596 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1597 |
+nsKDEShellService::OpenApplication(PRInt32 aApplication) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1598 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1599 |
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1600 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1601 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1602 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1603 |
+ nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1604 |
+ if (!str) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1605 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1606 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1607 |
+ if( aApplication == APPLICATION_MAIL ) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1608 |
+ str->SetData( NS_LITERAL_CSTRING( "OPENMAIL" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1609 |
+ else if( aApplication == APPLICATION_NEWS ) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1610 |
+ str->SetData( NS_LITERAL_CSTRING( "OPENNEWS" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1611 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1612 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1613 |
+ |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1614 |
+ command->AppendElement( str ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1615 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1616 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1617 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1618 |
+NS_IMETHODIMP |
515 | 1619 |
+nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1620 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1621 |
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1622 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1623 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1624 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1625 |
+ nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1626 |
+ nsCOMPtr<nsISupportsCString> appstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1627 |
+ nsCOMPtr<nsISupportsCString> uristr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1628 |
+ if (!cmdstr || !appstr || !uristr) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1629 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1630 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1631 |
+ cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" )); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1632 |
+ command->AppendElement( cmdstr ); |
609 | 1633 |
+ nsAutoCString app; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1634 |
+ nsresult rv = aApplication->GetNativePath( app ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1635 |
+ NS_ENSURE_SUCCESS( rv, rv ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1636 |
+ appstr->SetData( app ); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1637 |
+ command->AppendElement( appstr ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1638 |
+ uristr->SetData( aURI ); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1639 |
+ command->AppendElement( uristr ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1640 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1641 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1642 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1643 |
+NS_IMETHODIMP |
515 | 1644 |
+nsKDEShellService::GetDefaultFeedReader(nsIFile** _retval) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1645 |
+{ |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
1646 |
+ *_retval = nullptr; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1647 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1648 |
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1649 |
+ if( !command ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1650 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1651 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1652 |
+ nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1653 |
+ if( !str ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1654 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1655 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1656 |
+ str->SetData( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1657 |
+ command->AppendElement( str ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1658 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1659 |
+ nsCOMPtr<nsIArray> output; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1660 |
+ if( !nsKDEUtils::command( command, getter_AddRefs( output ) ) ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1661 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1662 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1663 |
+ PRUint32 length; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1664 |
+ output->GetLength( &length ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1665 |
+ if( length != 1 ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1666 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1667 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1668 |
+ nsCOMPtr<nsISupportsCString> resstr = do_QueryElementAt( output, 0 ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1669 |
+ if( !resstr ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1670 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1671 |
+ |
609 | 1672 |
+ nsAutoCString path; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1673 |
+ resstr->GetData( path ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1674 |
+ if (path.IsEmpty()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1675 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1676 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1677 |
+ nsresult rv; |
515 | 1678 |
+ nsCOMPtr<nsIFile> defaultReader = |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1679 |
+ do_CreateInstance("@mozilla.org/file/local;1", &rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1680 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1681 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1682 |
+ rv = defaultReader->InitWithNativePath(path); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1683 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1684 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1685 |
+ bool exists; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1686 |
+ rv = defaultReader->Exists(&exists); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1687 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1688 |
+ if (!exists) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1689 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1690 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1691 |
+ NS_ADDREF(*_retval = defaultReader); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1692 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1693 |
+} |
779 | 1694 |
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1695 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1696 |
--- /dev/null |
779 | 1697 |
+++ b/browser/components/shell/nsKDEShellService.h |
911 | 1698 |
@@ -0,0 +1,30 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1699 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
889 | 1700 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1701 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1702 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1703 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1704 |
+#ifndef nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1705 |
+#define nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1706 |
+ |
911 | 1707 |
+#include "nsIGNOMEShellService.h" |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
1708 |
+#include "nsString.h" |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1709 |
+#include "mozilla/Attributes.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1710 |
+ |
911 | 1711 |
+class nsKDEShellService final : public nsIGNOMEShellService |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1712 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1713 |
+public: |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1714 |
+ nsKDEShellService() : mCheckedThisSession(false) { } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1715 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1716 |
+ NS_DECL_ISUPPORTS |
1057
b70ce330958c
successfull RPM build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1055
diff
changeset
|
1717 |
+ NS_DECL_NSISHELLSERVICE |
911 | 1718 |
+ NS_DECL_NSIGNOMESHELLSERVICE |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1719 |
+ |
889 | 1720 |
+ nsresult Init(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1721 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1722 |
+private: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1723 |
+ ~nsKDEShellService() {} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1724 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1725 |
+ bool mCheckedThisSession; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1726 |
+}; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1727 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1728 |
+#endif // nskdeshellservice_h____ |
779 | 1729 |
diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1730 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1731 |
--- /dev/null |
779 | 1732 |
+++ b/browser/components/shell/nsUnixShellService.cpp |
889 | 1733 |
@@ -0,0 +1,22 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1734 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
889 | 1735 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1736 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1737 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
1738 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1739 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1740 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1741 |
+#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1742 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1743 |
+#include "nsKDEUtils.h" |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1744 |
+#include "mozilla/ModuleUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1745 |
+ |
136
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1746 |
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1747 |
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1748 |
+ |
953 | 1749 |
+NS_IMETHODIMP |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1750 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1751 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1752 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1753 |
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1754 |
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1755 |
+} |
779 | 1756 |
diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1757 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1758 |
--- /dev/null |
779 | 1759 |
+++ b/browser/components/shell/nsUnixShellService.h |
889 | 1760 |
@@ -0,0 +1,15 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1761 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
889 | 1762 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1763 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1764 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
1765 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1766 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1767 |
+#ifndef nsunixshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1768 |
+#define nsunixshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1769 |
+ |
911 | 1770 |
+#include "nsIGNOMEShellService.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1771 |
+ |
953 | 1772 |
+NS_IMETHODIMP |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1773 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1774 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1775 |
+#endif // nsunixshellservice_h____ |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1776 |
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1777 |
--- a/browser/installer/package-manifest.in |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1778 |
+++ b/browser/installer/package-manifest.in |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1068
diff
changeset
|
1779 |
@@ -462,16 +462,18 @@ |
1067 | 1780 |
@RESPATH@/browser/defaults/settings/pinning |
1781 |
@RESPATH@/browser/defaults/settings/main |
|
612 | 1782 |
|
462
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
1783 |
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
612 | 1784 |
; Technically this is an app pref file, but we are keeping it in the original |
1785 |
; gre location for now. |
|
828 | 1786 |
@RESPATH@/defaults/pref/channel-prefs.js |
985 | 1787 |
|
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1788 |
+@RESPATH@/defaults/pref/kde.js |
985 | 1789 |
+ |
612 | 1790 |
; Services (gre) prefs |
828 | 1791 |
@RESPATH@/defaults/pref/services-sync.js |
904 | 1792 |
|
985 | 1793 |
; [Layout Engine Resources] |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1794 |
; Style Sheets, Graphics and other Resources used by the layout engine. |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1795 |
@RESPATH@/res/EditorOverride.css |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1796 |
@RESPATH@/res/contenteditable.css |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1046
diff
changeset
|
1797 |
@RESPATH@/res/designmode.css |