author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 31 Jan 2015 19:46:18 +0100 | |
branch | firefox35 |
changeset 829 | 4372fb79b4d5 |
parent 823 | bb072062aa29 |
child 828 | 59013b3a51f5 |
permissions | -rw-r--r-- |
823 | 1 |
# HG changeset patch |
2 |
# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab |
|
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 |
817 | 8 |
@@ -0,0 +1,1272 @@ |
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 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
400 | 19 |
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
20 |
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
22 |
+<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
+<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
+<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
+# 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
|
29 |
+# hiddenWindow.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
+#include browser-doctype.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
+<window id="main-window" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
+ 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
|
34 |
+ xmlns:svg="http://www.w3.org/2000/svg" |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
35 |
+ xmlns:html="http://www.w3.org/1999/xhtml" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
515 | 37 |
+ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" |
703 | 38 |
+ title="&mainWindow.title;" |
39 |
+ title_normal="&mainWindow.title;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
+#ifdef XP_MACOSX |
703 | 41 |
+ title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;" |
42 |
+ titledefault="&mainWindow.title;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+ titlemodifier="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
+ titlemodifier_normal="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
+ titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
+#else |
703 | 47 |
+ title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" |
48 |
+ titlemodifier="&mainWindow.titlemodifier;" |
|
49 |
+ titlemodifier_normal="&mainWindow.titlemodifier;" |
|
50 |
+ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
+#endif |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
52 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
53 |
+#ifdef XP_WIN |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
54 |
+ chromemargin="0,2,2,2" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
55 |
+#else |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
56 |
+ chromemargin="0,-1,-1,-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
57 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
58 |
+ tabsintitlebar="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
59 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
+ titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
+ lightweightthemes="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
+ lightweightthemesfooter="browser-bottombox" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
+ windowtype="navigator:browser" |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
64 |
+ macanimationtype="document" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
+ screenX="4" screenY="4" |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
66 |
+ fullscreenbutton="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
67 |
+ sizemode="normal" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
68 |
+ persist="screenX screenY width height sizemode"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
+# All JS files which are not content (only) dependent that browser.xul |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
+# wishes to include *must* go into the global-scripts.inc file |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
+# so that they can be shared by macBrowserOverlay.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
+#include global-scripts.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
|
74 |
+<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
76 |
+<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
+<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
80 |
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
+# browser-sets.inc file for sharing with hiddenWindow.xul. |
291 | 82 |
+#define FULL_BROWSER_WINDOW |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
+#include browser-sets.inc |
291 | 84 |
+#undef FULL_BROWSER_WINDOW |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
+ <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
|
87 |
+ <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
|
88 |
+ 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
|
89 |
+ 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
|
90 |
+ <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
|
91 |
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
92 |
+ <menuseparator/> |
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
93 |
+ <menuitem id="context_pinTab" label="&pinTab.label;" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
94 |
+ accesskey="&pinTab.accesskey;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
95 |
+ oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
96 |
+ <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
|
97 |
+ accesskey="&unpinTab.accesskey;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
98 |
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
99 |
+ <menu id="context_tabViewMenu" label="&moveToGroup.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
100 |
+ accesskey="&moveToGroup.accesskey;"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
101 |
+ <menupopup id="context_tabViewMenuPopup" |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
102 |
+ onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
103 |
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
104 |
+ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
105 |
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
106 |
+ </menupopup> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
107 |
+ </menu> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
108 |
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
109 |
+ 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
|
110 |
+ tbattr="tabbrowser-multiple" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
111 |
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
112 |
+#ifdef E10S_TESTING_ONLY |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
113 |
+ <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
114 |
+ tbattr="tabbrowser-remote" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
115 |
+ hidden="true" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
116 |
+ oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
117 |
+#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
|
118 |
+ <menuseparator/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
119 |
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
291 | 120 |
+ tbattr="tabbrowser-multiple-visible" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
121 |
+ oncommand="gBrowser.reloadAllTabs();"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
122 |
+ <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
|
123 |
+ 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
|
124 |
+ 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
|
125 |
+ command="Browser:BookmarkAllTabs"/> |
662 | 126 |
+ <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;" |
127 |
+ oncommand="gBrowser.removeTabsToTheEndFrom(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
|
128 |
+ <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
|
129 |
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
130 |
+ <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
|
131 |
+ <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
|
132 |
+ 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
|
133 |
+ 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
|
134 |
+ 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
|
135 |
+ <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
|
136 |
+ oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
137 |
+ </menupopup> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
138 |
+ |
193 | 139 |
+ <!-- bug 415444/582485: event.stopPropagation is here for the cloned version |
140 |
+ of this menupopup --> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
+ <menupopup id="backForwardMenu" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
+ onpopupshowing="return FillHistoryMenu(event.target);" |
193 | 143 |
+ oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
+ onclick="checkForMiddleClick(this, event);"/> |
650 | 145 |
+ <tooltip id="aHTMLTooltip" page="true"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
146 |
+ <tooltip id="remoteBrowserTooltip"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
+ <!-- for search and content formfill/pw manager --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
+ <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
+ |
817 | 151 |
+ <!-- for search with one-off buttons --> |
152 |
+ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
|
153 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
+ <!-- for url bar autocomplete --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
+ |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
157 |
+ <!-- for select dropdowns --> |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
158 |
+ <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/> |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
159 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
160 |
+ <!-- for invalid form error message --> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
161 |
+ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
193 | 162 |
+ <description/> |
163 |
+ </panel> |
|
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
164 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
165 |
+ <panel id="editBookmarkPanel" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
166 |
+ type="arrow" |
291 | 167 |
+ footertype="promobox" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
168 |
+ orient="vertical" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
169 |
+ ignorekeys="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
170 |
+ hidden="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
+ onpopupshown="StarUI.panelShown(event);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
+ aria-labelledby="editBookmarkPanelTitle"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
+ <row id="editBookmarkPanelHeader" align="center" hidden="true"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
174 |
+ <vbox align="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
175 |
+ <image id="editBookmarkPanelStarIcon"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
176 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
177 |
+ <vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
178 |
+ <label id="editBookmarkPanelTitle"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
179 |
+ <description id="editBookmarkPanelDescription"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
180 |
+ <hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
181 |
+ <button id="editBookmarkPanelRemoveButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
182 |
+ class="editBookmarkPanelHeaderButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
183 |
+ oncommand="StarUI.removeBookmarkButtonCommand();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
+ accesskey="&editBookmark.removeBookmark.accessKey;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
187 |
+ </row> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
+ <hbox id="editBookmarkPanelBottomButtons" pack="end"> |
766 | 190 |
+#ifndef XP_UNIX |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
192 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
+ oncommand="StarUI.panel.hidePopup();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
+ <button id="editBookmarkPanelDeleteButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
+ label="&editBookmark.cancel.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
199 |
+ oncommand="StarUI.cancelButtonOnCommand();"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
200 |
+#else |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
201 |
+ <button id="editBookmarkPanelDeleteButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
203 |
+ label="&editBookmark.cancel.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
+ oncommand="StarUI.cancelButtonOnCommand();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
+ oncommand="StarUI.panel.hidePopup();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
212 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
213 |
+ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
214 |
+ <!-- UI tour experience --> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
215 |
+ <panel id="UITourTooltip" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
216 |
+ type="arrow" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
217 |
+ hidden="true" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
218 |
+ noautofocus="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
219 |
+ noautohide="true" |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
220 |
+ align="start" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
221 |
+ orient="vertical" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
222 |
+ role="alert"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
223 |
+ <vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
224 |
+ <hbox pack="end"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
225 |
+ <toolbarbutton id="UITourTooltipClose" class="close-icon" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
226 |
+ tooltiptext="&uiTour.infoPanel.close;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
227 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
228 |
+ <hbox id="UITourTooltipBody"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
229 |
+ <vbox id="UITourTooltipIconContainer"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
230 |
+ <image id="UITourTooltipIcon"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
231 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
232 |
+ <vbox flex="1"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
233 |
+ <label id="UITourTooltipTitle" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
234 |
+ <description id="UITourTooltipDescription" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
235 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
236 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
237 |
+ <hbox id="UITourTooltipButtons" flex="1" align="center"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
238 |
+ </vbox> |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
239 |
+ </panel> |
766 | 240 |
+ <!-- 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
|
241 |
+ <panel id="UITourHighlightContainer" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
242 |
+ type="default" |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
243 |
+ hidden="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
244 |
+ noautofocus="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
245 |
+ noautohide="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
246 |
+ flip="none" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
247 |
+ consumeoutsideclicks="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
248 |
+ mousethrough="always"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
249 |
+ <box id="UITourHighlight"></box> |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
250 |
+ </panel> |
817 | 251 |
+ <!-- Used to highlight the new search experience --> |
252 |
+ <panel id="SearchHighlight1" |
|
253 |
+ class="SearchHighlight" |
|
254 |
+ type="arrow" |
|
255 |
+ hidden="true" |
|
256 |
+ noautofocus="true" |
|
257 |
+ noautohide="true" |
|
258 |
+ orient="vertical" |
|
259 |
+ align="stretch"> |
|
260 |
+ <label class="SearchHighlightTitle">One-Click Searches</label> |
|
261 |
+ <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description> |
|
262 |
+ <hbox class="SearchHighlightFooter" align="center"> |
|
263 |
+ <spacer class="dot filled"/> |
|
264 |
+ <spacer class="dot"/> |
|
265 |
+ <spacer flex="1"/> |
|
266 |
+ <button label="Next"/> |
|
267 |
+ </hbox> |
|
268 |
+ </panel> |
|
269 |
+ <panel id="SearchHighlight2" |
|
270 |
+ class="SearchHighlight" |
|
271 |
+ type="arrow" |
|
272 |
+ hidden="true" |
|
273 |
+ noautofocus="true" |
|
274 |
+ noautohide="true" |
|
275 |
+ orient="vertical" |
|
276 |
+ align="stretch"> |
|
277 |
+ <label class="SearchHighlightTitle">Smart Suggestions</label> |
|
278 |
+ <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description> |
|
279 |
+ <hbox class="SearchHighlightFooter" align="center"> |
|
280 |
+ <spacer class="dot"/> |
|
281 |
+ <spacer class="dot filled"/> |
|
282 |
+ <spacer flex="1"/> |
|
283 |
+ <button label="Thanks!"/> |
|
284 |
+ </hbox> |
|
285 |
+ </panel> |
|
286 |
+ |
|
287 |
+ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> |
|
821 | 288 |
+ <hbox id="abouthome-search-panel-manage" |
817 | 289 |
+ onclick="openPreferences('paneSearch')"> |
290 |
+ <label>&cmd_engineManager.label;</label> |
|
291 |
+ </hbox> |
|
292 |
+ </panel> |
|
811 | 293 |
+ |
653 | 294 |
+ <panel id="social-share-panel" |
295 |
+ class="social-panel" |
|
515 | 296 |
+ type="arrow" |
653 | 297 |
+ orient="horizontal" |
298 |
+ onpopupshowing="SocialShare.onShowing()" |
|
299 |
+ onpopuphidden="SocialShare.onHidden()" |
|
300 |
+ hidden="true"> |
|
301 |
+ <vbox class="social-share-toolbar"> |
|
817 | 302 |
+ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"> |
303 |
+ <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" |
|
304 |
+ group="share-providers" tooltiptext="&findShareServices.label;" |
|
305 |
+ oncommand="SocialShare.showDirectory()"/> |
|
306 |
+ </arrowscrollbox> |
|
653 | 307 |
+ </vbox> |
515 | 308 |
+ </panel> |
309 |
+ |
|
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
310 |
+ <panel id="social-notification-panel" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
311 |
+ class="social-panel" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
312 |
+ type="arrow" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
313 |
+ hidden="true" |
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
314 |
+ noautofocus="true"/> |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
315 |
+ <panel id="social-flyout-panel" |
571
cd2592a5c15d
updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
316 |
+ class="social-panel" |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
317 |
+ onpopupshown="SocialFlyout.onShown()" |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
318 |
+ onpopuphidden="SocialFlyout.onHidden()" |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
319 |
+ side="right" |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
320 |
+ type="arrow" |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
321 |
+ hidden="true" |
662 | 322 |
+ flip="slide" |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
323 |
+ rolluponmousewheel="true" |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
324 |
+ noautofocus="true" |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
325 |
+ position="topcenter topright"/> |
515 | 326 |
+ |
766 | 327 |
+ <panel id="loop-notification-panel" |
328 |
+ class="loop-panel social-panel" |
|
329 |
+ type="arrow" |
|
330 |
+ hidden="true" |
|
331 |
+ noautofocus="true"/> |
|
332 |
+ |
|
333 |
+ <panel id="loop-panel" |
|
334 |
+ class="loop-panel social-panel" |
|
335 |
+ type="arrow" |
|
336 |
+ orient="horizontal" |
|
337 |
+ hidden="true"/> |
|
338 |
+ |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
339 |
+ <menupopup id="toolbar-context-menu" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
340 |
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
341 |
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
342 |
+ accesskey="&customizeMenu.moveToPanel.accesskey;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
343 |
+ label="&customizeMenu.moveToPanel.label;" |
766 | 344 |
+ contexttype="toolbaritem" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
345 |
+ class="customize-context-moveToPanel"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
346 |
+ <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
347 |
+ accesskey="&customizeMenu.removeFromToolbar.accesskey;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
348 |
+ label="&customizeMenu.removeFromToolbar.label;" |
766 | 349 |
+ contexttype="toolbaritem" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
350 |
+ class="customize-context-removeFromToolbar"/> |
766 | 351 |
+ <menuitem id="toolbar-context-reloadAllTabs" |
352 |
+ class="toolbaritem-tabsmenu" |
|
353 |
+ contexttype="tabbar" |
|
354 |
+ oncommand="gBrowser.reloadAllTabs();" |
|
355 |
+ label="&toolbarContextMenu.reloadAllTabs.label;" |
|
356 |
+ accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/> |
|
357 |
+ <menuitem id="toolbar-context-bookmarkAllTabs" |
|
358 |
+ class="toolbaritem-tabsmenu" |
|
359 |
+ contexttype="tabbar" |
|
360 |
+ command="Browser:BookmarkAllTabs" |
|
361 |
+ label="&toolbarContextMenu.bookmarkAllTabs.label;" |
|
362 |
+ accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/> |
|
363 |
+ <menuitem id="toolbar-context-undoCloseTab" |
|
364 |
+ class="toolbaritem-tabsmenu" |
|
365 |
+ contexttype="tabbar" |
|
366 |
+ label="&toolbarContextMenu.undoCloseTab.label;" |
|
367 |
+ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;" |
|
368 |
+ 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
|
369 |
+ <menuseparator/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
370 |
+ <menuseparator id="viewToolbarsMenuSeparator"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
371 |
+ <!-- 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
|
372 |
+ redirected to the command element, thus preventing |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
373 |
+ 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
|
374 |
+ 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
|
375 |
+ 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
|
376 |
+ correctly. --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
377 |
+ <menuitem oncommand="BrowserCustomizeToolbar()" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
378 |
+ observes="cmd_CustomizeToolbars" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
379 |
+ class="viewCustomizeToolbar" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
380 |
+ label="&viewCustomizeToolbar.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
381 |
+ 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
|
382 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
383 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
384 |
+ <menupopup id="blockedPopupOptions" |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
385 |
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
386 |
+ onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
387 |
+ <menuitem observes="blockedPopupAllowSite"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
388 |
+ <menuitem observes="blockedPopupEditSettings"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
389 |
+ <menuitem observes="blockedPopupDontShowMessage"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
390 |
+ <menuseparator observes="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
|
391 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
392 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
393 |
+ <menupopup id="autohide-context" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
394 |
+ onpopupshowing="FullScreen.getAutohide(this.firstChild);"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
395 |
+ <menuitem type="checkbox" label="&fullScreenAutohide.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
396 |
+ accesskey="&fullScreenAutohide.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
397 |
+ oncommand="FullScreen.setAutohide();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
398 |
+ <menuseparator/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
399 |
+ <menuitem label="&fullScreenExit.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
400 |
+ accesskey="&fullScreenExit.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
401 |
+ oncommand="BrowserFullScreen();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
402 |
+ </menupopup> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
403 |
+ |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
404 |
+ <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
|
405 |
+ 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
|
406 |
+ return true; |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
407 |
+ 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
|
408 |
+ 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
|
409 |
+ updateEditUIVisibility(); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
410 |
+ return gContextMenu.shouldDisplay;" |
400 | 411 |
+ onpopuphiding="if (event.target != this) |
412 |
+ return; |
|
413 |
+ gContextMenu.hiding(); |
|
414 |
+ gContextMenu = null; |
|
415 |
+ updateEditUIVisibility();"> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
416 |
+#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
|
417 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
418 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
419 |
+ <menupopup id="placesContext"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
420 |
+ |
680 | 421 |
+ <!-- Popup for site identity information --> |
422 |
+ <panel id="identity-popup" |
|
423 |
+ type="arrow" |
|
424 |
+ hidden="true" |
|
425 |
+ noautofocus="true" |
|
426 |
+ onpopupshown="if (event.target == this) |
|
427 |
+ gIdentityHandler.onPopupShown(event);" |
|
428 |
+ orient="vertical" |
|
429 |
+ level="top"> |
|
430 |
+ <hbox id="identity-popup-container" align="top"> |
|
431 |
+ <image id="identity-popup-icon"/> |
|
432 |
+ <vbox id="identity-popup-content-box"> |
|
433 |
+ <label id="identity-popup-brandName" |
|
434 |
+ class="identity-popup-label" |
|
435 |
+ value="&brandFullName;"/> |
|
436 |
+ <label id="identity-popup-chromeLabel" |
|
437 |
+ class="identity-popup-label"/> |
|
438 |
+ <label id="identity-popup-connectedToLabel" |
|
439 |
+ class="identity-popup-label" |
|
440 |
+ value="&identity.connectedTo;"/> |
|
441 |
+ <label id="identity-popup-connectedToLabel2" |
|
442 |
+ class="identity-popup-label" |
|
443 |
+ value="&identity.unverifiedsite2;"/> |
|
444 |
+ <description id="identity-popup-content-host" |
|
445 |
+ class="identity-popup-description"/> |
|
446 |
+ <label id="identity-popup-runByLabel" |
|
447 |
+ class="identity-popup-label" |
|
448 |
+ value="&identity.runBy;"/> |
|
449 |
+ <description id="identity-popup-content-owner" |
|
450 |
+ class="identity-popup-description"/> |
|
451 |
+ <description id="identity-popup-content-supplemental" |
|
452 |
+ class="identity-popup-description"/> |
|
453 |
+ <description id="identity-popup-content-verifier" |
|
454 |
+ class="identity-popup-description"/> |
|
455 |
+ <hbox id="identity-popup-encryption" flex="1"> |
|
456 |
+ <vbox> |
|
457 |
+ <image id="identity-popup-encryption-icon"/> |
|
458 |
+ </vbox> |
|
459 |
+ <description id="identity-popup-encryption-label" flex="1" |
|
460 |
+ class="identity-popup-description"/> |
|
461 |
+ </hbox> |
|
462 |
+ <vbox id="identity-popup-permissions"> |
|
463 |
+ <separator class="thin"/> |
|
464 |
+ <label class="identity-popup-label header" |
|
465 |
+ value="&identity.permissions;"/> |
|
466 |
+ <vbox id="identity-popup-permission-list" class="indent"/> |
|
467 |
+ </vbox> |
|
468 |
+ </vbox> |
|
469 |
+ </hbox> |
|
470 |
+ <!-- Footer button to open security page info --> |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
471 |
+ <hbox id="identity-popup-button-container" align="center"> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
472 |
+ <button id="identity-popup-help-icon" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
473 |
+ oncommand="gIdentityHandler.handleHelpCommand(event);" |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
474 |
+ tooltiptext="&identity.help.tooltip;"/> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
475 |
+ <spacer flex="1"/> |
680 | 476 |
+ <button id="identity-popup-more-info-button" |
477 |
+ label="&identity.moreInfoLinkText;" |
|
478 |
+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
|
479 |
+ </hbox> |
|
480 |
+ </panel> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
481 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
482 |
+ <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
483 |
+ <hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
484 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
485 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
486 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
487 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
488 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
489 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
490 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
491 |
+ <hbox pack="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
492 |
+ <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
493 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
494 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
495 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
496 |
+ <!-- Sync Panel --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
497 |
+ <panel id="sync-start-panel" class="sync-panel" type="arrow" hidden="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
498 |
+ noautofocus="true" onclick="this.hidePopup();" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
499 |
+ flip="slide"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
500 |
+ <hbox class="sync-panel-outer"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
501 |
+ <image class="sync-panel-icon"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
502 |
+ <vbox class="sync-panel-inner"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
503 |
+ <description id="sync-start-panel-title" |
718 | 504 |
+ value="&syncStartPanel2.heading;"/> |
505 |
+ <description id="sync-start-panel-subtitle" |
|
506 |
+ value="&syncStartPanel2.subTitle;"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
507 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
508 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
509 |
+ </panel> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
510 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
511 |
+ <!-- Sync Error Panel --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
512 |
+ <panel id="sync-error-panel" class="sync-panel" type="arrow" hidden="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
513 |
+ noautofocus="true" onclick="this.hidePopup();" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
514 |
+ flip="slide"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
515 |
+ <hbox class="sync-panel-outer"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
516 |
+ <image class="sync-panel-icon"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
517 |
+ <vbox class="sync-panel-inner"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
518 |
+ <description id="sync-error-panel-title" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
519 |
+ value="&syncErrorPanel.heading;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
520 |
+ <description id="sync-error-panel-subtitle" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
521 |
+ value="&syncErrorPanel.subTitle;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
522 |
+ <hbox class="sync-panel-button-box"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
523 |
+ <spacer flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
524 |
+ <button class="sync-panel-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
525 |
+ label="&syncErrorPanel.signInButton.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
526 |
+ accesskey="&syncErrorPanel.signInButton.accesskey;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
527 |
+ onclick="gFxAccounts.openSignInAgainPage();"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
528 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
529 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
530 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
531 |
+ </panel> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
532 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
533 |
+ <!-- Bookmarks and history tooltip --> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
534 |
+ <tooltip id="bhTooltip"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
535 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
536 |
+ <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
|
537 |
+ |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
538 |
+ <tooltip id="back-button-tooltip"> |
410 | 539 |
+ <label class="tooltip-label" value="&backButton.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
540 |
+#ifdef XP_MACOSX |
410 | 541 |
+ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
542 |
+#else |
410 | 543 |
+ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
544 |
+#endif |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
545 |
+ </tooltip> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
546 |
+ |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
547 |
+ <tooltip id="forward-button-tooltip"> |
410 | 548 |
+ <label class="tooltip-label" value="&forwardButton.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
549 |
+#ifdef XP_MACOSX |
410 | 550 |
+ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
551 |
+#else |
410 | 552 |
+ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
343
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
553 |
+#endif |
f467ac3aff09
sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
340
diff
changeset
|
554 |
+ </tooltip> |
612 | 555 |
+ |
817 | 556 |
+ <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);"> |
557 |
+ <label class="tooltip-label"/> |
|
558 |
+ <label class="tooltip-label"/> |
|
559 |
+ </tooltip> |
|
560 |
+ |
|
662 | 561 |
+#include popup-notifications.inc |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
562 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
563 |
+#include ../../components/customizableui/content/panelUI.inc.xul |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
564 |
+ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
565 |
+ <hbox id="downloads-animation-container" mousethrough="always"> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
566 |
+ <vbox id="downloads-notification-anchor"> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
567 |
+ <vbox id="downloads-indicator-notification"/> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
568 |
+ </vbox> |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
569 |
+ </hbox> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
570 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
571 |
+ <hbox id="bookmarked-notification-container" mousethrough="always"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
572 |
+ <vbox id="bookmarked-notification-anchor"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
573 |
+ <vbox id="bookmarked-notification"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
574 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
575 |
+ <vbox id="bookmarked-notification-dropmarker-anchor"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
576 |
+ <image id="bookmarked-notification-dropmarker-icon"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
577 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
578 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
579 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
580 |
+ <tooltip id="dynamic-shortcut-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
581 |
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
582 |
+ </popupset> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
583 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
584 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
585 |
+<vbox id="titlebar"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
586 |
+ <hbox id="titlebar-content"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
587 |
+ <spacer id="titlebar-spacer" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
588 |
+ <hbox id="titlebar-buttonbox-container"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
589 |
+#ifdef XP_WIN |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
590 |
+ <hbox id="private-browsing-indicator-titlebar"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
591 |
+ <hbox class="private-browsing-indicator"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
592 |
+ </hbox> |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
593 |
+#endif |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
594 |
+ <hbox id="titlebar-buttonbox"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
595 |
+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
596 |
+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
597 |
+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
598 |
+ </hbox> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
599 |
+ </hbox> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
600 |
+#ifdef XP_MACOSX |
718 | 601 |
+ <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary |
602 |
+ buttonbox from reversing order in RTL by forcing an LTR direction. --> |
|
603 |
+ <hbox id="titlebar-secondary-buttonbox" dir="ltr"> |
|
604 |
+ <hbox class="private-browsing-indicator"/> |
|
605 |
+ <hbox id="titlebar-fullscreen-button"/> |
|
606 |
+ </hbox> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
607 |
+#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
|
608 |
+ </hbox> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
609 |
+</vbox> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
610 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
611 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
612 |
+<deck flex="1" id="tab-view-deck"> |
291 | 613 |
+<vbox flex="1" id="browser-panel"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
614 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
615 |
+ <toolbox id="navigator-toolbox" mode="icons"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
616 |
+ <!-- Menu --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
617 |
+ <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
618 |
+ defaultset="menubar-items" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
619 |
+ mode="icons" iconsize="small" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
620 |
+#ifdef MENUBAR_CAN_AUTOHIDE |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
621 |
+ toolbarname="&menubarCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
622 |
+ accesskey="&menubarCmd.accesskey;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
623 |
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
624 |
+ autohide="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
625 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
626 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
627 |
+ context="toolbar-context-menu"> |
766 | 628 |
+ <toolbaritem id="menubar-items" align="center"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
629 |
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
630 |
+# hiddenWindow.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
631 |
+#include browser-menubar.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
632 |
+ </toolbaritem> |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
633 |
+ |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
634 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
635 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
636 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
637 |
+ id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
638 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
639 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
640 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
641 |
+ </toolbar> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
642 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
643 |
+ <toolbar id="TabsToolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
644 |
+ class="toolbar-primary" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
645 |
+ fullscreentoolbar="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
646 |
+ customizable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
647 |
+ mode="icons" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
648 |
+ iconsize="small" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
649 |
+ aria-label="&tabsToolbar.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
650 |
+ context="toolbar-context-menu" |
738 | 651 |
+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
652 |
+ collapsed="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
653 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
654 |
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
655 |
+ <hbox id="private-browsing-indicator" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
656 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
657 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
658 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
659 |
+ <tabs id="tabbrowser-tabs" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
660 |
+ class="tabbrowser-tabs" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
661 |
+ tabbrowser="content" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
662 |
+ flex="1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
663 |
+ setfocus="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
664 |
+ tooltip="tabbrowser-tab-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
665 |
+ stopwatchid="FX_TAB_CLICK_MS"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
666 |
+ <tab class="tabbrowser-tab" selected="true" fadein="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
667 |
+ </tabs> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
668 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
669 |
+ <toolbarbutton id="new-tab-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
670 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
671 |
+ label="&tabCmd.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
672 |
+ command="cmd_newNavigatorTab" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
673 |
+ onclick="checkForMiddleClick(this, event);" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
674 |
+ tooltip="dynamic-shortcut-tooltip" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
675 |
+ ondrop="newTabButtonObserver.onDrop(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
676 |
+ ondragover="newTabButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
677 |
+ ondragenter="newTabButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
678 |
+ ondragexit="newTabButtonObserver.onDragExit(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
679 |
+ cui-areatype="toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
680 |
+ removable="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
681 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
682 |
+ <toolbarbutton id="alltabs-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
683 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
684 |
+ type="menu" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
685 |
+ label="&listAllTabs.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
686 |
+ tooltiptext="&listAllTabs.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
687 |
+ removable="false"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
688 |
+ <menupopup id="alltabs-popup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
689 |
+ position="after_end"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
690 |
+ <menuitem id="menu_tabview" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
691 |
+ class="menuitem-iconic" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
692 |
+ key="key_tabview" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
693 |
+ label="&viewTabGroups.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
694 |
+ command="Browser:ToggleTabView" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
695 |
+ observes="tabviewGroupsNumber"/> |
766 | 696 |
+ <menuitem id="alltabs_undoCloseTab" |
697 |
+ class="menuitem-iconic" |
|
698 |
+ key="key_undoCloseTab" |
|
699 |
+ label="&undoCloseTab.label;" |
|
700 |
+ observes="History:UndoCloseTab"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
701 |
+ <menuseparator id="alltabs-popup-separator"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
702 |
+ </menupopup> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
703 |
+ </toolbarbutton> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
704 |
+ |
718 | 705 |
+#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) |
706 |
+ <hbox class="private-browsing-indicator" skipintoolbarset="true"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
707 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
708 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
709 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
710 |
+ id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
711 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
712 |
+ ordinal="1000" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
713 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
714 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
715 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
716 |
+#ifdef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
717 |
+ <hbox class="titlebar-placeholder" type="fullscreen-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
718 |
+ id="titlebar-placeholder-on-TabsToolbar-for-fullscreen-button" persist="width" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
719 |
+ skipintoolbarset="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
720 |
+#endif |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
721 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
722 |
+ </toolbar> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
723 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
724 |
+ <!-- |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
725 |
+ CAVEAT EMPTOR |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
726 |
+ Should you need to add items to the toolbar here, make sure to also add them |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
727 |
+ to the default placements of buttons in CustomizableUI.jsm, so the |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
728 |
+ customization code doesn't get confused. |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
729 |
+ --> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
730 |
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
731 |
+ 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
|
732 |
+ fullscreentoolbar="true" mode="icons" customizable="true" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
733 |
+ iconsize="small" |
817 | 734 |
+#ifdef MOZ_DEV_EDITION |
823 | 735 |
+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" |
817 | 736 |
+#else |
823 | 737 |
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" |
817 | 738 |
+#endif |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
739 |
+ customizationtarget="nav-bar-customization-target" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
740 |
+ overflowable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
741 |
+ overflowbutton="nav-bar-overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
742 |
+ overflowtarget="widget-overflow-list" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
743 |
+ 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
|
744 |
+ context="toolbar-context-menu"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
745 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
746 |
+ <hbox id="nav-bar-customization-target" flex="1"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
747 |
+ <toolbaritem id="urlbar-container" flex="400" persist="width" |
738 | 748 |
+ title="&locationItem.title;" removable="false" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
749 |
+ class="chromeclass-location" overflows="false"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
750 |
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
751 |
+ label="&backCmd.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
752 |
+ command="Browser:BackOrBackDuplicate" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
753 |
+ onclick="checkForMiddleClick(this, event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
754 |
+ tooltip="back-button-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
755 |
+ context="backForwardMenu"/> |
738 | 756 |
+ <hbox id="urlbar-wrapper" flex="1"> |
757 |
+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
758 |
+ label="&forwardCmd.label;" |
|
759 |
+ command="Browser:ForwardOrForwardDuplicate" |
|
760 |
+ onclick="checkForMiddleClick(this, event);" |
|
761 |
+ tooltip="forward-button-tooltip" |
|
762 |
+ context="backForwardMenu"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
763 |
+ <textbox id="urlbar" flex="1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
764 |
+ placeholder="&urlbar.placeholder2;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
765 |
+ type="autocomplete" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
766 |
+ autocompletesearch="urlinline history" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
767 |
+ autocompletesearchparam="enable-actions" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
768 |
+ autocompletepopup="PopupAutoCompleteRichResult" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
769 |
+ completeselectedindex="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
770 |
+ tabscrolling="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
771 |
+ showcommentcolumn="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
772 |
+ showimagecolumn="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
773 |
+ enablehistory="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
774 |
+ maxrows="6" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
775 |
+ newlines="stripsurroundingwhitespace" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
776 |
+ oninput="gBrowser.userTypedValue = this.value;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
777 |
+ ontextentered="this.handleCommand(param);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
778 |
+ ontextreverted="return this.handleRevert();" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
779 |
+ pageproxystate="invalid" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
780 |
+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
784 | 781 |
+ onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
782 |
+ <box id="notification-popup-box" hidden="true" align="center"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
783 |
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
784 |
+ <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
785 |
+ <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
786 |
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
787 |
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
788 |
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
789 |
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
790 |
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
791 |
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
784 | 792 |
+ <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
793 |
+ <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
794 |
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
795 |
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
718 | 796 |
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
797 |
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
|
766 | 798 |
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
799 |
+ <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
800 |
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
801 |
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
738 | 802 |
+ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> |
803 |
+ <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
804 |
+ </box> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
805 |
+ <!-- Use onclick instead of normal popup= syntax since the popup |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
806 |
+ code fires onmousedown, and hence eats our favicon drag events. |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
807 |
+ We only add the identity-box button to the tab order when the location bar |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
808 |
+ has focus, otherwise pressing F6 focuses it instead of the location bar --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
809 |
+ <box id="identity-box" role="button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
810 |
+ align="center" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
811 |
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
812 |
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
813 |
+ ondragstart="gIdentityHandler.onDragStart(event);"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
814 |
+ <image id="page-proxy-favicon" |
766 | 815 |
+ consumeanchor="identity-box" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
816 |
+ onclick="PageProxyClickHandler(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
817 |
+ pageproxystate="invalid"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
818 |
+ <hbox id="identity-icon-labels"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
819 |
+ <label id="identity-icon-label" class="plain" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
820 |
+ <label id="identity-icon-country-label" class="plain"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
821 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
822 |
+ </box> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
823 |
+ <box id="urlbar-display-box" align="center"> |
817 | 824 |
+ <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
825 |
+ </box> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
826 |
+ <hbox id="urlbar-icons"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
827 |
+ <image id="page-report-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
828 |
+ class="urlbar-icon" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
829 |
+ hidden="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
830 |
+ tooltiptext="&pageReportIcon.tooltip;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
831 |
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
832 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
833 |
+ <toolbarbutton id="urlbar-go-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
834 |
+ class="chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
835 |
+ onclick="gURLBar.handleCommand(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
836 |
+ tooltiptext="&goEndCap.tooltip;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
837 |
+ <toolbarbutton id="urlbar-reload-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
838 |
+ class="chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
839 |
+ command="Browser:ReloadOrDuplicate" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
840 |
+ onclick="checkForMiddleClick(this, event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
841 |
+ tooltiptext="&reloadButton.tooltip;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
842 |
+ <toolbarbutton id="urlbar-stop-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
843 |
+ class="chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
844 |
+ command="Browser:Stop" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
845 |
+ tooltiptext="&stopButton.tooltip;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
846 |
+ </textbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
847 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
848 |
+ </toolbaritem> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
849 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
850 |
+ <toolbaritem id="search-container" title="&searchItem.title;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
851 |
+ align="center" class="chromeclass-toolbar-additional panel-wide-item" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
852 |
+ cui-areatype="toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
853 |
+ flex="100" persist="width" removable="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
854 |
+ <searchbar id="searchbar" flex="1"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
855 |
+ </toolbaritem> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
856 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
857 |
+ <toolbarbutton id="bookmarks-menu-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
858 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
859 |
+ persist="class" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
860 |
+ removable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
861 |
+ type="menu-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
862 |
+ label="&bookmarksMenuButton.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
863 |
+ tooltip="dynamic-shortcut-tooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
864 |
+ anchor="dropmarker" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
865 |
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
866 |
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
867 |
+ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
868 |
+ ondrop="PlacesMenuDNDHandler.onDrop(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
869 |
+ cui-areatype="toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
870 |
+ oncommand="BookmarkingUI.onCommand(event);"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
871 |
+ <menupopup id="BMB_bookmarksPopup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
872 |
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
873 |
+ placespopup="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
874 |
+ context="placesContext" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
875 |
+ openInTabs="children" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
876 |
+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
877 |
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
878 |
+ onpopupshowing="BookmarkingUI.onPopupShowing(event); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
879 |
+ BookmarkingUI.attachPlacesView(event, this);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
880 |
+ tooltip="bhTooltip" popupsinherittooltip="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
881 |
+ <menuitem id="BMB_viewBookmarksSidebar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
882 |
+ class="subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
883 |
+ label="&viewBookmarksSidebar2.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
884 |
+ type="checkbox" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
885 |
+ oncommand="toggleSidebar('viewBookmarksSidebar');"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
886 |
+ <observes element="viewBookmarksSidebar" attribute="checked"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
887 |
+ </menuitem> |
738 | 888 |
+ <!-- NB: temporary solution for bug 985024, this should go away soon. --> |
889 |
+ <menuitem id="BMB_bookmarksShowAllTop" |
|
890 |
+ class="menuitem-iconic subviewbutton" |
|
891 |
+ label="&showAllBookmarks2.label;" |
|
892 |
+ command="Browser:ShowAllBookmarks" |
|
893 |
+ key="manBookmarkKb"/> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
894 |
+ <menuseparator/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
895 |
+ <menuitem id="BMB_subscribeToPageMenuitem" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
896 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
897 |
+ class="menuitem-iconic subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
898 |
+#else |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
899 |
+ class="subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
900 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
901 |
+ label="&subscribeToPageMenuitem.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
902 |
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
903 |
+ onclick="checkForMiddleClick(this, event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
904 |
+ observes="singleFeedMenuitemState"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
905 |
+ <menu id="BMB_subscribeToPageMenupopup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
906 |
+#ifndef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
907 |
+ class="menu-iconic subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
908 |
+#else |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
909 |
+ class="subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
910 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
911 |
+ label="&subscribeToPageMenupopup.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
912 |
+ observes="multipleFeedsMenuState"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
913 |
+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
914 |
+ onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
915 |
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
916 |
+ onclick="checkForMiddleClick(this, event);"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
917 |
+ </menu> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
918 |
+ <menuseparator/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
919 |
+ <menu id="BMB_bookmarksToolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
920 |
+ class="menu-iconic bookmark-item subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
921 |
+ label="&personalbarCmd.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
922 |
+ container="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
923 |
+ <menupopup id="BMB_bookmarksToolbarPopup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
924 |
+ placespopup="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
925 |
+ context="placesContext" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
926 |
+ onpopupshowing="if (!this.parentNode._placesView) |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
927 |
+ new PlacesMenu(event, 'place:folder=TOOLBAR', |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
928 |
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
929 |
+ <menuitem id="BMB_viewBookmarksToolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
930 |
+ placesanonid="view-toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
931 |
+ toolbarId="PersonalToolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
932 |
+ type="checkbox" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
933 |
+ oncommand="onViewToolbarCommand(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
934 |
+ label="&viewBookmarksToolbar.label;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
935 |
+ <menuseparator/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
936 |
+ <!-- Bookmarks toolbar items --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
937 |
+ </menupopup> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
938 |
+ </menu> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
939 |
+ <menu id="BMB_unsortedBookmarks" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
940 |
+ class="menu-iconic bookmark-item subviewbutton" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
941 |
+ label="&bookmarksMenuButton.unsorted.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
942 |
+ container="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
943 |
+ <menupopup id="BMB_unsortedBookmarksPopup" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
944 |
+ placespopup="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
945 |
+ context="placesContext" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
946 |
+ onpopupshowing="if (!this.parentNode._placesView) |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
947 |
+ new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS', |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
948 |
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
949 |
+ </menu> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
950 |
+ <menuseparator/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
951 |
+ <!-- Bookmarks menu items will go here --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
952 |
+ <menuitem id="BMB_bookmarksShowAll" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
953 |
+ class="subviewbutton panel-subview-footer" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
954 |
+ label="&showAllBookmarks2.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
955 |
+ command="Browser:ShowAllBookmarks" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
956 |
+ key="manBookmarkKb"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
957 |
+ </menupopup> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
958 |
+ </toolbarbutton> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
959 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
960 |
+ <!-- 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
|
961 |
+ 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
|
962 |
+ the Downloads Indicator overlay is loaded. --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
963 |
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
964 |
+ key="key_openDownloads" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
965 |
+ oncommand="DownloadsIndicatorView.onCommand(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
966 |
+ ondrop="DownloadsIndicatorView.onDrop(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
967 |
+ ondragover="DownloadsIndicatorView.onDragOver(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
968 |
+ ondragenter="DownloadsIndicatorView.onDragOver(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
969 |
+ label="&downloads.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
970 |
+ removable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
971 |
+ cui-areatype="toolbar" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
972 |
+ tooltip="dynamic-shortcut-tooltip"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
973 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
974 |
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
975 |
+ persist="class" removable="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
976 |
+ label="&homeButton.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
977 |
+ ondragover="homeButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
978 |
+ ondragenter="homeButtonObserver.onDragOver(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
979 |
+ ondrop="homeButtonObserver.onDrop(event)" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
980 |
+ ondragexit="homeButtonObserver.onDragExit(event)" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
981 |
+ key="goHome" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
982 |
+ onclick="BrowserGoHome(event);" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
983 |
+ cui-areatype="toolbar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
984 |
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
985 |
+ </hbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
986 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
987 |
+ <toolbarbutton id="nav-bar-overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
988 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
989 |
+ skipintoolbarset="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
990 |
+ tooltiptext="&navbarOverflow.label;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
991 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
992 |
+ <toolbaritem id="PanelUI-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
993 |
+ class="chromeclass-toolbar-additional" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
994 |
+ removable="false"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
995 |
+ <toolbarbutton id="PanelUI-menu-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
996 |
+ class="toolbarbutton-1" |
766 | 997 |
+ consumeanchor="PanelUI-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
998 |
+ label="&brandShortName;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
999 |
+ tooltiptext="&appmenu.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1000 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1001 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1002 |
+ <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
|
1003 |
+ 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
|
1004 |
+ <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
|
1005 |
+ 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
|
1006 |
+ 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
|
1007 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1008 |
+ <toolbarbutton id="restore-button" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1009 |
+#ifdef XP_MACOSX |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1010 |
+# 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
|
1011 |
+# 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
|
1012 |
+ class="toolbarbutton-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1013 |
+#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
|
1014 |
+ 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
|
1015 |
+ 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
|
1016 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1017 |
+ <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
|
1018 |
+ 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
|
1019 |
+ 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
|
1020 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1021 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1022 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1023 |
+ <toolbarset id="customToolbars" 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
|
1024 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1025 |
+ <toolbar id="PersonalToolbar" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1026 |
+ mode="icons" iconsize="small" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1027 |
+ class="chromeclass-directories" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1028 |
+ 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
|
1029 |
+ defaultset="personal-bookmarks" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1030 |
+ 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
|
1031 |
+ 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
|
1032 |
+ customizable="true"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1033 |
+ <toolbaritem id="personal-bookmarks" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1034 |
+ title="&bookmarksToolbarItem.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1035 |
+ 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
|
1036 |
+ removable="true"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1037 |
+ <toolbarbutton id="bookmarks-toolbar-placeholder" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1038 |
+ class="toolbarbutton-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1039 |
+ mousethrough="never" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1040 |
+ label="&bookmarksToolbarItem.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1041 |
+ 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
|
1042 |
+ <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
|
1043 |
+ 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
|
1044 |
+ context="placesContext" |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1045 |
+ onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1046 |
+ oncommand="BookmarksEventHandler.onCommand(event, this._placesView);" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1047 |
+ 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
|
1048 |
+ 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
|
1049 |
+ <hbox flex="1"> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1050 |
+ <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
|
1051 |
+ <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
|
1052 |
+ 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
|
1053 |
+ 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
|
1054 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1055 |
+ <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
|
1056 |
+ 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
|
1057 |
+ 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
|
1058 |
+ <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
|
1059 |
+ id="PlacesChevron" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1060 |
+ class="chevron" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1061 |
+ 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
|
1062 |
+ 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
|
1063 |
+ 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
|
1064 |
+ 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
|
1065 |
+ ._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
|
1066 |
+ <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
|
1067 |
+ 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
|
1068 |
+ 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
|
1069 |
+ 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
|
1070 |
+ </toolbarbutton> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1071 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1072 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1073 |
+ </toolbaritem> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1074 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1075 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1076 |
+ <!-- This is a shim which will go away ASAP. See bug 749804 for details --> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1077 |
+ <toolbar id="addon-bar" toolbar-delegate="nav-bar" mode="icons" iconsize="small" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1078 |
+ customizable="true"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1079 |
+ <hbox id="addonbar-closebutton"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1080 |
+ <statusbar id="status-bar"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1081 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1082 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1083 |
+ <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
|
1084 |
+ |
650 | 1085 |
+# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1086 |
+# or removing default items with the toolbarbutton-1 class. |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1087 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1088 |
+ <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
|
1089 |
+#ifdef XP_MACOSX |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1090 |
+ command="cmd_print" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1091 |
+ tooltip="dynamic-shortcut-tooltip" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1092 |
+#else |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1093 |
+ command="cmd_printPreview" |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1094 |
+ tooltiptext="&printButton.tooltip;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1095 |
+#endif |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1096 |
+ label="&printButton.label;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1097 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1098 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1099 |
+ <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
|
1100 |
+ label="&newNavigatorCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1101 |
+ command="key_newNavigator" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1102 |
+ 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
|
1103 |
+ 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
|
1104 |
+ 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
|
1105 |
+ ondragenter="newWindowButtonObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1106 |
+ ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1107 |
+ |
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 |
+ <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
|
1109 |
+ 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
|
1110 |
+ 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
|
1111 |
+ label="&fullScreenCmd.label;" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1112 |
+ tooltip="dynamic-shortcut-tooltip"/> |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1113 |
+ |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1114 |
+#ifdef MOZ_SERVICES_SYNC |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1115 |
+ <toolbarbutton id="sync-button" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1116 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1117 |
+ label="&syncToolbarButton.label;" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1118 |
+ oncommand="gSyncUI.handleToolbarButton()"/> |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1119 |
+#endif |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1120 |
+ |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1121 |
+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1122 |
+ label="&tabGroupsButton.label;" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1123 |
+ command="Browser:ToggleTabView" |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1124 |
+ tooltip="dynamic-shortcut-tooltip" |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1125 |
+ observes="tabviewGroupsNumber"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1126 |
+ </toolbarpalette> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1127 |
+ </toolbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1128 |
+ |
817 | 1129 |
+ <hbox id="fullscr-toggler" hidden="true"/> |
612 | 1130 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1131 |
+ <deck id="content-deck" flex="1"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1132 |
+ <hbox flex="1" id="browser"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1133 |
+ <vbox id="browser-border-start" hidden="true" layer="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1134 |
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1135 |
+ <sidebarheader id="sidebar-header" align="center"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1136 |
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1137 |
+ <image id="sidebar-throbber"/> |
738 | 1138 |
+ <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1139 |
+ </sidebarheader> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1140 |
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1141 |
+ style="min-width: 14em; width: 18em; max-width: 36em;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1142 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1143 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1144 |
+ <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
|
1145 |
+ <vbox id="appcontent" flex="1"> |
784 | 1146 |
+ <notificationbox id="high-priority-global-notificationbox"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1147 |
+ <tabbrowser id="content" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1148 |
+ flex="1" contenttooltip="aHTMLTooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1149 |
+ tabcontainer="tabbrowser-tabs" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1150 |
+ contentcontextmenu="contentAreaContextMenu" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1151 |
+ autocompletepopup="PopupAutoComplete" |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
739
diff
changeset
|
1152 |
+ selectpopup="ContentSelectDropdown"/> |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1153 |
+ <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1154 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1155 |
+ <splitter id="social-sidebar-splitter" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1156 |
+ class="chromeclass-extrachrome sidebar-splitter" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1157 |
+ observes="socialSidebarBroadcaster"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1158 |
+ <vbox id="social-sidebar-box" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1159 |
+ class="chromeclass-extrachrome" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1160 |
+ observes="socialSidebarBroadcaster" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1161 |
+ persist="width"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1162 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1163 |
+ <sidebarheader id="social-sidebar-header" class="sidebar-header" align="center"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1164 |
+ <image id="social-sidebar-favico"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1165 |
+ <label id="social-sidebar-title" class="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1166 |
+ <toolbarbutton id="social-sidebar-button" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1167 |
+ class="toolbarbutton-1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1168 |
+ type="menu"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1169 |
+ <menupopup id="social-statusarea-popup" position="after_end"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1170 |
+ <menuitem class="social-toggle-sidebar-menuitem" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1171 |
+ type="checkbox" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1172 |
+ autocheck="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1173 |
+ command="Social:ToggleSidebar" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1174 |
+ label="&social.toggleSidebar.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1175 |
+ accesskey="&social.toggleSidebar.accesskey;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1176 |
+ <menuitem class="social-toggle-notifications-menuitem" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1177 |
+ type="checkbox" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1178 |
+ autocheck="false" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1179 |
+ command="Social:ToggleNotifications" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1180 |
+ label="&social.toggleNotifications.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1181 |
+ accesskey="&social.toggleNotifications.accesskey;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1182 |
+ <menuseparator/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1183 |
+ <menuseparator class="social-provider-menu" hidden="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1184 |
+ <menuitem class="social-addons-menuitem" command="Social:Addons" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1185 |
+ label="&social.addons.label;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1186 |
+ <menuitem label="&social.learnMore.label;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1187 |
+ accesskey="&social.learnMore.accesskey;" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1188 |
+ oncommand="SocialUI.showLearnMore();"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1189 |
+ </menupopup> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1190 |
+ </toolbarbutton> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1191 |
+ </sidebarheader> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1192 |
+ |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1193 |
+ <browser id="social-sidebar-browser" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1194 |
+ type="content" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1195 |
+ context="contentAreaContextMenu" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1196 |
+ disableglobalhistory="true" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1197 |
+ tooltip="aHTMLTooltip" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1198 |
+ popupnotificationanchor="social-sidebar-favico" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1199 |
+ flex="1" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1200 |
+ style="min-width: 14em; width: 18em; max-width: 36em;"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1201 |
+ </vbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1202 |
+ <vbox id="browser-border-end" hidden="true" layer="true"/> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1203 |
+ </hbox> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1204 |
+#include ../../components/customizableui/content/customizeMode.inc.xul |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1205 |
+ </deck> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1206 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1207 |
+ <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
400 | 1208 |
+ <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1209 |
+ <vbox id="full-screen-warning-message" align="center"> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1210 |
+ <description id="full-screen-domain-text"/> |
680 | 1211 |
+ <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1212 |
+ <vbox id="full-screen-approval-pane" align="center"> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1213 |
+ <hbox> |
766 | 1214 |
+#ifdef XP_UNIX |
680 | 1215 |
+ <button label="&fullscreenExitButton.label;" |
1216 |
+ oncommand="FullScreen.setFullscreenAllowed(false);" |
|
1217 |
+ class="full-screen-approval-button"/> |
|
1218 |
+ <button label="&fullscreenAllowButton.label;" |
|
1219 |
+ oncommand="FullScreen.setFullscreenAllowed(true);" |
|
1220 |
+ class="full-screen-approval-button"/> |
|
1221 |
+#else |
|
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1222 |
+ <button label="&fullscreenAllowButton.label;" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1223 |
+ oncommand="FullScreen.setFullscreenAllowed(true);" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1224 |
+ class="full-screen-approval-button"/> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1225 |
+ <button label="&fullscreenExitButton.label;" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1226 |
+ oncommand="FullScreen.setFullscreenAllowed(false);" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1227 |
+ class="full-screen-approval-button"/> |
680 | 1228 |
+#endif |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1229 |
+ </hbox> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1230 |
+ <checkbox id="full-screen-remember-decision"/> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1231 |
+ </vbox> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1232 |
+ </vbox> |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1233 |
+ </hbox> |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1234 |
+ </hbox> |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1235 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1236 |
+ <vbox id="browser-bottombox" layer="true"> |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1237 |
+ <notificationbox id="global-notificationbox"/> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1238 |
+ <toolbar id="developer-toolbar" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1239 |
+ hidden="true"> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1240 |
+#ifdef XP_MACOSX |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1241 |
+ <toolbarbutton id="developer-toolbar-closebutton" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1242 |
+ class="devtools-closebutton" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1243 |
+ oncommand="DeveloperToolbar.hide();" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1244 |
+ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1245 |
+#endif |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1246 |
+ <stack class="gclitoolbar-stack-node" flex="1"> |
662 | 1247 |
+ <textbox class="gclitoolbar-input-node" rows="1"/> |
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1248 |
+ <hbox class="gclitoolbar-complete-node"/> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1249 |
+ </stack> |
612 | 1250 |
+ <toolbarbutton id="developer-toolbar-toolbox-button" |
515 | 1251 |
+ class="developer-toolbar-button" |
612 | 1252 |
+ observes="devtoolsMenuBroadcaster_DevToolbox" |
1253 |
+ tooltiptext="&devToolbarToolsButton.tooltip;"/> |
|
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1254 |
+#ifndef XP_MACOSX |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1255 |
+ <toolbarbutton id="developer-toolbar-closebutton" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1256 |
+ class="devtools-closebutton" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1257 |
+ oncommand="DeveloperToolbar.hide();" |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1258 |
+ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1259 |
+#endif |
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1260 |
+ </toolbar> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1261 |
+ </vbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1262 |
+ |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1263 |
+ <svg:svg height="0"> |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1264 |
+#include tab-shape.inc.svg |
738 | 1265 |
+ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
718 | 1266 |
+#ifndef XP_MACOSX |
738 | 1267 |
+ <svg:path d="m 1,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/> |
1268 |
+#else |
|
1269 |
+ <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/> |
|
1270 |
+#endif |
|
479
56e16f4cce54
fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
467
diff
changeset
|
1271 |
+ </svg:clipPath> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1272 |
+ </svg:svg> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1273 |
+ |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1274 |
+</vbox> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1275 |
+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1276 |
+# Introducing the iframe dynamically, as needed, was found to be better than |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1277 |
+# starting with an empty iframe here in browser.xul from a Ts standpoint. |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1278 |
+</deck> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1279 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1280 |
+</window> |
766 | 1281 |
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1282 |
--- a/browser/base/content/browser.xul |
|
1283 |
+++ b/browser/base/content/browser.xul |
|
817 | 1284 |
@@ -174,17 +174,17 @@ |
766 | 1285 |
class="editBookmarkPanelHeaderButton" |
1286 |
oncommand="StarUI.removeBookmarkButtonCommand();" |
|
1287 |
accesskey="&editBookmark.removeBookmark.accessKey;"/> |
|
1288 |
</hbox> |
|
1289 |
</vbox> |
|
1290 |
</row> |
|
1291 |
<vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> |
|
1292 |
<hbox id="editBookmarkPanelBottomButtons" pack="end"> |
|
1293 |
-#ifndef XP_UNIX |
|
1294 |
+#ifdef XP_UNIX |
|
1295 |
<button id="editBookmarkPanelDoneButton" |
|
1296 |
class="editBookmarkPanelBottomButton" |
|
1297 |
label="&editBookmark.done.label;" |
|
1298 |
default="true" |
|
1299 |
oncommand="StarUI.panel.hidePopup();"/> |
|
1300 |
<button id="editBookmarkPanelDeleteButton" |
|
1301 |
class="editBookmarkPanelBottomButton" |
|
1302 |
label="&editBookmark.cancel.label;" |
|
817 | 1303 |
@@ -1198,17 +1198,17 @@ |
766 | 1304 |
|
1305 |
<hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
|
1306 |
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
|
1307 |
<vbox id="full-screen-warning-message" align="center"> |
|
1308 |
<description id="full-screen-domain-text"/> |
|
1309 |
<description class="full-screen-description" value="&fullscreenExitHint2.value;"/> |
|
1310 |
<vbox id="full-screen-approval-pane" align="center"> |
|
1311 |
<hbox> |
|
1312 |
-#ifdef XP_UNIX |
|
1313 |
+#ifndef XP_UNIX |
|
1314 |
<button label="&fullscreenExitButton.label;" |
|
1315 |
oncommand="FullScreen.setFullscreenAllowed(false);" |
|
1316 |
class="full-screen-approval-button"/> |
|
1317 |
<button label="&fullscreenAllowButton.label;" |
|
1318 |
oncommand="FullScreen.setFullscreenAllowed(true);" |
|
1319 |
class="full-screen-approval-button"/> |
|
1320 |
#else |
|
1321 |
<button label="&fullscreenAllowButton.label;" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1322 |
diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1323 |
--- a/browser/base/jar.mn |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1324 |
+++ b/browser/base/jar.mn |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
784
diff
changeset
|
1325 |
@@ -69,16 +69,18 @@ browser.jar: |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1326 |
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
548
diff
changeset
|
1327 |
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
784
diff
changeset
|
1328 |
content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
1329 |
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1330 |
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1331 |
* content/browser/browser.css (content/browser.css) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1332 |
* content/browser/browser.js (content/browser.js) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1333 |
* content/browser/browser.xul (content/browser.xul) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1334 |
+* content/browser/browser-kde.xul (content/browser-kde.xul) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1335 |
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1336 |
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
659 | 1337 |
* content/browser/chatWindow.xul (content/chatWindow.xul) |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
1338 |
content/browser/content.js (content/content.js) |
779 | 1339 |
content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1340 |
content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
|
1341 |
content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
|
1342 |
content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
|
1343 |
content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1344 |
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
|
1345 |
--- a/browser/components/build/nsModule.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1346 |
+++ b/browser/components/build/nsModule.cpp |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1347 |
@@ -8,17 +8,17 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1348 |
#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
|
1349 |
#include "DirectoryProvider.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1350 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1351 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1352 |
#include "nsWindowsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1353 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1354 |
#include "nsMacShellService.h" |
659 | 1355 |
#elif defined(MOZ_WIDGET_GTK) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1356 |
-#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1357 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1358 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1359 |
|
515 | 1360 |
#if defined(XP_WIN) |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1361 |
#include "nsIEHistoryEnumerator.h" |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
1362 |
#endif |
409 | 1363 |
|
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1364 |
#include "rdf.h" |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1365 |
#include "nsFeedSniffer.h" |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1366 |
@@ -31,18 +31,16 @@ using namespace mozilla::browser; |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1367 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1368 |
///////////////////////////////////////////////////////////////////////////// |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1369 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1370 |
NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1371 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1372 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1373 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1374 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
659 | 1375 |
-#elif defined(MOZ_WIDGET_GTK) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1376 |
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1377 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1378 |
|
515 | 1379 |
#if defined(XP_WIN) |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1380 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
1381 |
#endif |
409 | 1382 |
|
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1383 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1384 |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1385 |
@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1386 |
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
356 | 1387 |
#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1388 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1389 |
static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1390 |
{ &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
|
1391 |
#if defined(XP_WIN) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1392 |
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, |
659 | 1393 |
#elif defined(MOZ_WIDGET_GTK) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1394 |
- { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor }, |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1395 |
+ { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor }, |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1396 |
#endif |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1397 |
{ &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor }, |
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1398 |
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create }, |
515 | 1399 |
#if defined(XP_WIN) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1400 |
{ &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
|
1401 |
#elif defined(XP_MACOSX) |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1402 |
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
423
diff
changeset
|
1403 |
#endif |
779 | 1404 |
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
1405 |
--- a/browser/components/preferences/main.js |
|
1406 |
+++ b/browser/components/preferences/main.js |
|
1407 |
@@ -12,16 +12,22 @@ var gMainPane = { |
|
1408 |
||
1409 |
/** |
|
1410 |
* Initialization of this. |
|
1411 |
*/ |
|
1412 |
init: function () |
|
1413 |
{ |
|
1414 |
this._pane = document.getElementById("paneMain"); |
|
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1415 |
|
223 | 1416 |
+ var env = Components.classes["@mozilla.org/process/environment;1"] |
1417 |
+ .getService(Components.interfaces.nsIEnvironment); |
|
1418 |
+ var kde_session = 0; |
|
1419 |
+ if (env.get('KDE_FULL_SESSION') == "true") |
|
1420 |
+ kde_session = 1; |
|
1421 |
+ |
|
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1422 |
#ifdef HAVE_SHELL_SERVICE |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1423 |
this.updateSetDefaultBrowser(); |
545 | 1424 |
#ifdef XP_WIN |
1425 |
// In Windows 8 we launch the control panel since it's the only |
|
1426 |
// way to get all file type association prefs. So we don't know |
|
1427 |
// when the user will select the default. We refresh here periodically |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
548
diff
changeset
|
1428 |
// in case the default changes. On other Windows OS's defaults can also |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
548
diff
changeset
|
1429 |
// be set while the prefs are open. |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
784
diff
changeset
|
1430 |
@@ -572,16 +578,27 @@ var gMainPane = { |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1431 |
*/ |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1432 |
setDefaultBrowser: function() |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
1433 |
{ |
522
fdca14856f37
snapshot update (20120807)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
1434 |
let shellSvc = getShellService(); |
fdca14856f37
snapshot update (20120807)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
1435 |
if (!shellSvc) |
fdca14856f37
snapshot update (20120807)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
1436 |
return; |
779 | 1437 |
try { |
1438 |
shellSvc.setDefaultBrowser(true, false); |
|
1439 |
+ if (kde_session == 1) { |
|
1440 |
+ var shellObj = Components.classes["@mozilla.org/file/local;1"] |
|
1441 |
+ .createInstance(Components.interfaces.nsILocalFile); |
|
1442 |
+ shellObj.initWithPath("/usr/bin/kwriteconfig"); |
|
1443 |
+ var process = Components.classes["@mozilla.org/process/util;1"] |
|
1444 |
+ .createInstance(Components.interfaces.nsIProcess); |
|
1445 |
+ process.init(shellObj); |
|
1446 |
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", |
|
809
af47260a332c
morphed Aurora packaging into Firefox Developer Edition
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
807
diff
changeset
|
1447 |
+ "BrowserApplication", "firefox"]; |
779 | 1448 |
+ process.run(false, args, args.length); |
1449 |
+ } |
|
1450 |
} catch (ex) { |
|
1451 |
Components.utils.reportError(ex); |
|
1452 |
return; |
|
1453 |
} |
|
545 | 1454 |
let selectedIndex = |
1455 |
shellSvc.isDefaultBrowser(false, true) ? 1 : 0; |
|
1456 |
document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
|
223 | 1457 |
} |
779 | 1458 |
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build |
1459 |
--- a/browser/components/shell/moz.build |
|
1460 |
+++ b/browser/components/shell/moz.build |
|
1461 |
@@ -30,16 +30,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
|
659 | 1462 |
] |
1463 |
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1464 |
SOURCES += [ |
659 | 1465 |
'nsMacShellService.cpp', |
1466 |
] |
|
1467 |
elif CONFIG['MOZ_WIDGET_GTK']: |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1468 |
SOURCES += [ |
659 | 1469 |
'nsGNOMEShellService.cpp', |
703 | 1470 |
+ 'nsKDEShellService.cpp', |
1471 |
+ 'nsUnixShellService.cpp', |
|
659 | 1472 |
] |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1473 |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1474 |
if SOURCES: |
703 | 1475 |
FINAL_LIBRARY = 'browsercomps' |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1476 |
|
659 | 1477 |
EXTRA_COMPONENTS += [ |
1478 |
'nsSetDefaultBrowser.js', |
|
1479 |
'nsSetDefaultBrowser.manifest', |
|
779 | 1480 |
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
|
1481 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1482 |
--- /dev/null |
779 | 1483 |
+++ b/browser/components/shell/nsKDEShellService.cpp |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1484 |
@@ -0,0 +1,238 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1485 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
548 | 1486 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1487 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1488 |
+ * 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
|
1489 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1490 |
+#include "mozilla/ArrayUtils.h" |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1491 |
+ |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1492 |
+#include "nsCOMPtr.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1493 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1494 |
+#include "nsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1495 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1496 |
+#include "nsIPrefService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1497 |
+#include "nsIProcess.h" |
515 | 1498 |
+#include "nsIFile.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1499 |
+#include "nsServiceManagerUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1500 |
+#include "nsComponentManagerUtils.h" |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1501 |
+#include "nsIMutableArray.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1502 |
+#include "nsISupportsPrimitives.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1503 |
+#include "nsArrayUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1504 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1505 |
+using namespace mozilla; |
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1506 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1507 |
+nsresult |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1508 |
+nsKDEShellService::Init() |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1509 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1510 |
+ if( !nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1511 |
+ return NS_ERROR_NOT_AVAILABLE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1512 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1513 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1514 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1515 |
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIShellService) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1516 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1517 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1518 |
+nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, |
548 | 1519 |
+ bool aForAllTypes, |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1520 |
+ bool* aIsDefaultBrowser) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1521 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1522 |
+ *aIsDefaultBrowser = false; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1523 |
+ if (aStartupCheck) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1524 |
+ mCheckedThisSession = true; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1525 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1526 |
+ 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
|
1527 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1528 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1529 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1530 |
+ 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
|
1531 |
+ if (!str) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1532 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1533 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1534 |
+ str->SetData( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1535 |
+ command->AppendElement( str, false ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1536 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1537 |
+ if( nsKDEUtils::command( command )) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1538 |
+ *aIsDefaultBrowser = true; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1539 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1540 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1541 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1542 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1543 |
+nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes, |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1544 |
+ bool aForAllUsers) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1545 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1546 |
+ 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
|
1547 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1548 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1549 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1550 |
+ 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
|
1551 |
+ 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
|
1552 |
+ if (!cmdstr || !paramstr) |
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 |
+ cmdstr->SetData( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1556 |
+ command->AppendElement( cmdstr, false ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1557 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1558 |
+ paramstr->SetData( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1559 |
+ command->AppendElement( paramstr, false ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1560 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1561 |
+ 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
|
1562 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1563 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1564 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1565 |
+nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1566 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1567 |
+ // If we've already checked, the browser has been started and this is a |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1568 |
+ // new window open, and we don't want to check again. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1569 |
+ if (mCheckedThisSession) { |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1570 |
+ *aResult = false; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1571 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1572 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1573 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1574 |
+ nsCOMPtr<nsIPrefBranch> prefs; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1575 |
+ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1576 |
+ if (pserve) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1577 |
+ pserve->GetBranch("", getter_AddRefs(prefs)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1578 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1579 |
+ if (prefs) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1580 |
+ prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1581 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1582 |
+ return NS_OK; |
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 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1585 |
+NS_IMETHODIMP |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1586 |
+nsKDEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1587 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1588 |
+ nsCOMPtr<nsIPrefBranch> prefs; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1589 |
+ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1590 |
+ if (pserve) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1591 |
+ pserve->GetBranch("", getter_AddRefs(prefs)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1592 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1593 |
+ if (prefs) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1594 |
+ prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); |
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 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1597 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1598 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1599 |
+NS_IMETHODIMP |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1600 |
+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1601 |
+{ |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1602 |
+ *aResult = true; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1603 |
+ return NS_OK; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1604 |
+} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1605 |
+ |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
1606 |
+NS_IMETHODIMP |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1607 |
+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1608 |
+ PRInt32 aPosition) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1609 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1610 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1611 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1612 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1613 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1614 |
+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1615 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1616 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1617 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1618 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1619 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1620 |
+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1621 |
+{ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1622 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1623 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1624 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1625 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1626 |
+nsKDEShellService::OpenApplication(PRInt32 aApplication) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1627 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1628 |
+ 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
|
1629 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1630 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1631 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1632 |
+ 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
|
1633 |
+ if (!str) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1634 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1635 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1636 |
+ if( aApplication == APPLICATION_MAIL ) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1637 |
+ str->SetData( NS_LITERAL_CSTRING( "OPENMAIL" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1638 |
+ else if( aApplication == APPLICATION_NEWS ) |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1639 |
+ str->SetData( NS_LITERAL_CSTRING( "OPENNEWS" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1640 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1641 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1642 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1643 |
+ command->AppendElement( str, false ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1644 |
+ 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
|
1645 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1646 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1647 |
+NS_IMETHODIMP |
515 | 1648 |
+nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1649 |
+{ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1650 |
+ 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
|
1651 |
+ if (!command) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1652 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1653 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1654 |
+ 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
|
1655 |
+ 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
|
1656 |
+ 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
|
1657 |
+ if (!cmdstr || !appstr || !uristr) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1658 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1659 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1660 |
+ cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" )); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1661 |
+ command->AppendElement( cmdstr, false ); |
609 | 1662 |
+ nsAutoCString app; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1663 |
+ nsresult rv = aApplication->GetNativePath( app ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1664 |
+ NS_ENSURE_SUCCESS( rv, rv ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1665 |
+ appstr->SetData( app ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1666 |
+ command->AppendElement( appstr, false ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1667 |
+ uristr->SetData( aURI ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1668 |
+ command->AppendElement( uristr, false ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1669 |
+ 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
|
1670 |
+} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1671 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1672 |
+NS_IMETHODIMP |
515 | 1673 |
+nsKDEShellService::GetDefaultFeedReader(nsIFile** _retval) |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1674 |
+{ |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
522
diff
changeset
|
1675 |
+ *_retval = nullptr; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1676 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1677 |
+ 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
|
1678 |
+ if( !command ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1679 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1680 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1681 |
+ 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
|
1682 |
+ if( !str ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1683 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1684 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1685 |
+ str->SetData( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1686 |
+ command->AppendElement( str, false ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1687 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1688 |
+ nsCOMPtr<nsIArray> output; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1689 |
+ if( !nsKDEUtils::command( command, getter_AddRefs( output ) ) ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1690 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1691 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1692 |
+ PRUint32 length; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1693 |
+ output->GetLength( &length ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1694 |
+ if( length != 1 ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1695 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1696 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1697 |
+ nsCOMPtr<nsISupportsCString> resstr = do_QueryElementAt( output, 0 ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1698 |
+ if( !resstr ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1699 |
+ return NS_ERROR_FAILURE; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1700 |
+ |
609 | 1701 |
+ nsAutoCString path; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
367
diff
changeset
|
1702 |
+ resstr->GetData( path ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1703 |
+ if (path.IsEmpty()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1704 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1705 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1706 |
+ nsresult rv; |
515 | 1707 |
+ nsCOMPtr<nsIFile> defaultReader = |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1708 |
+ 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
|
1709 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1710 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1711 |
+ rv = defaultReader->InitWithNativePath(path); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1712 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1713 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1714 |
+ bool exists; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1715 |
+ rv = defaultReader->Exists(&exists); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1716 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1717 |
+ if (!exists) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1718 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1719 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1720 |
+ NS_ADDREF(*_retval = defaultReader); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1721 |
+ return NS_OK; |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1722 |
+} |
779 | 1723 |
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
|
1724 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1725 |
--- /dev/null |
779 | 1726 |
+++ b/browser/components/shell/nsKDEShellService.h |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1727 |
@@ -0,0 +1,60 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1728 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1729 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1730 |
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1731 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1732 |
+ * The contents of this file are subject to the Mozilla Public License Version |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1733 |
+ * 1.1 (the "License"); you may not use this file except in compliance with |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1734 |
+ * the License. You may obtain a copy of the License at |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1735 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1736 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1737 |
+ * Software distributed under the License is distributed on an "AS IS" basis, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1738 |
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1739 |
+ * for the specific language governing rights and limitations under the |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1740 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1741 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1742 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1743 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1744 |
+ * The Initial Developer of the Original Code is mozilla.org. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1745 |
+ * Portions created by the Initial Developer are Copyright (C) 2004 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1746 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1747 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1748 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1749 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1750 |
+ * Alternatively, the contents of this file may be used under the terms of |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1751 |
+ * either the GNU General Public License Version 2 or later (the "GPL"), or |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1752 |
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1753 |
+ * in which case the provisions of the GPL or the LGPL are applicable instead |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1754 |
+ * of those above. If you wish to allow use of your version of this file only |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1755 |
+ * under the terms of either the GPL or the LGPL, and not to allow others to |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1756 |
+ * use your version of this file under the terms of the MPL, indicate your |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1757 |
+ * decision by deleting the provisions above and replace them with the notice |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1758 |
+ * and other provisions required by the GPL or the LGPL. If you do not delete |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1759 |
+ * the provisions above, a recipient may use your version of this file under |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1760 |
+ * the terms of any one of the MPL, the GPL or the LGPL. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1761 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1762 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1763 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1764 |
+#ifndef nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1765 |
+#define nskdeshellservice_h____ |
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 |
+#include "nsIShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1768 |
+#include "nsStringAPI.h" |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1769 |
+#include "mozilla/Attributes.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1770 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1771 |
+class nsKDEShellService MOZ_FINAL : public nsIShellService |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1772 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1773 |
+public: |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1774 |
+ nsKDEShellService() : mCheckedThisSession(false) { } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1775 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1776 |
+ NS_DECL_ISUPPORTS |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1777 |
+ NS_DECL_NSISHELLSERVICE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1778 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1779 |
+ nsresult Init() NS_HIDDEN; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1780 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1781 |
+private: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1782 |
+ ~nsKDEShellService() {} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1783 |
+ |
739
e178ad08fed6
update patch to Gecko 31
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
1784 |
+ bool mCheckedThisSession; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1785 |
+}; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1786 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1787 |
+#endif // nskdeshellservice_h____ |
779 | 1788 |
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
|
1789 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1790 |
--- /dev/null |
779 | 1791 |
+++ b/browser/components/shell/nsUnixShellService.cpp |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1792 |
@@ -0,0 +1,52 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1793 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1794 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1795 |
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1796 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1797 |
+ * The contents of this file are subject to the Mozilla Public License Version |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1798 |
+ * 1.1 (the "License"); you may not use this file except in compliance with |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1799 |
+ * the License. You may obtain a copy of the License at |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1800 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1801 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1802 |
+ * Software distributed under the License is distributed on an "AS IS" basis, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1803 |
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1804 |
+ * for the specific language governing rights and limitations under the |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1805 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1806 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1807 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1808 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1809 |
+ * The Initial Developer of the Original Code is mozilla.org. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1810 |
+ * Portions created by the Initial Developer are Copyright (C) 2004 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1811 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1812 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1813 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1814 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1815 |
+ * Alternatively, the contents of this file may be used under the terms of |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1816 |
+ * either the GNU General Public License Version 2 or later (the "GPL"), or |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1817 |
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1818 |
+ * in which case the provisions of the GPL or the LGPL are applicable instead |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1819 |
+ * of those above. If you wish to allow use of your version of this file only |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1820 |
+ * under the terms of either the GPL or the LGPL, and not to allow others to |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1821 |
+ * use your version of this file under the terms of the MPL, indicate your |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1822 |
+ * decision by deleting the provisions above and replace them with the notice |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1823 |
+ * and other provisions required by the GPL or the LGPL. If you do not delete |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1824 |
+ * the provisions above, a recipient may use your version of this file under |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1825 |
+ * the terms of any one of the MPL, the GPL or the LGPL. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1826 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1827 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1828 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1829 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1830 |
+#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1831 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1832 |
+#include "nsKDEUtils.h" |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1833 |
+#include "mozilla/ModuleUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1834 |
+ |
136
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1835 |
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1836 |
+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
|
1837 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1838 |
+NS_METHOD |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1839 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1840 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1841 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1842 |
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1843 |
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1844 |
+} |
779 | 1845 |
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
|
1846 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1847 |
--- /dev/null |
779 | 1848 |
+++ b/browser/components/shell/nsUnixShellService.h |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1849 |
@@ -0,0 +1,45 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1850 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1851 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1852 |
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1853 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1854 |
+ * The contents of this file are subject to the Mozilla Public License Version |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1855 |
+ * 1.1 (the "License"); you may not use this file except in compliance with |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1856 |
+ * the License. You may obtain a copy of the License at |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1857 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1858 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1859 |
+ * Software distributed under the License is distributed on an "AS IS" basis, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1860 |
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1861 |
+ * for the specific language governing rights and limitations under the |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1862 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1863 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1864 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1865 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1866 |
+ * The Initial Developer of the Original Code is mozilla.org. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1867 |
+ * Portions created by the Initial Developer are Copyright (C) 2004 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1868 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1869 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1870 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1871 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1872 |
+ * Alternatively, the contents of this file may be used under the terms of |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1873 |
+ * either the GNU General Public License Version 2 or later (the "GPL"), or |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1874 |
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1875 |
+ * in which case the provisions of the GPL or the LGPL are applicable instead |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1876 |
+ * of those above. If you wish to allow use of your version of this file only |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1877 |
+ * under the terms of either the GPL or the LGPL, and not to allow others to |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1878 |
+ * use your version of this file under the terms of the MPL, indicate your |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1879 |
+ * decision by deleting the provisions above and replace them with the notice |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1880 |
+ * and other provisions required by the GPL or the LGPL. If you do not delete |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1881 |
+ * the provisions above, a recipient may use your version of this file under |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1882 |
+ * the terms of any one of the MPL, the GPL or the LGPL. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1883 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1884 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1885 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1886 |
+#ifndef nsunixshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1887 |
+#define nsunixshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1888 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1889 |
+#include "nsIShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1890 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1891 |
+NS_METHOD |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1892 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1893 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1894 |
+#endif // nsunixshellservice_h____ |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1895 |
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
|
1896 |
--- a/browser/installer/package-manifest.in |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1897 |
+++ b/browser/installer/package-manifest.in |
817 | 1898 |
@@ -698,19 +698,21 @@ |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1899 |
@BINPATH@/defaults/autoconfig/prefcalls.js |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1900 |
@BINPATH@/browser/defaults/profile/prefs.js |
612 | 1901 |
|
484 | 1902 |
#ifndef LIBXUL_SDK |
462
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
1903 |
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
612 | 1904 |
; Technically this is an app pref file, but we are keeping it in the original |
1905 |
; gre location for now. |
|
462
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
1906 |
@BINPATH@/defaults/pref/channel-prefs.js |
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
1907 |
+@BINPATH@/defaults/pref/kde.js |
484 | 1908 |
#else |
612 | 1909 |
; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
484 | 1910 |
@BINPATH@/@PREF_DIR@/channel-prefs.js |
1911 |
+@BINPATH@/@PREF_DIR@/kde.js |
|
1912 |
#endif |
|
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1913 |
|
612 | 1914 |
; Services (gre) prefs |
1915 |
#ifdef MOZ_SERVICES_NOTIFICATIONS |
|
1916 |
@BINPATH@/defaults/pref/services-notifications.js |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1917 |
#endif |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1918 |
#ifdef MOZ_SERVICES_SYNC |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
1919 |
@BINPATH@/defaults/pref/services-sync.js |