author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 30 Mar 2011 08:47:52 +0200 | |
changeset 249 | 7298a2e37ba3 |
parent 229 | 298263f797be |
child 251 | 4c9ebbedd59c |
permissions | -rw-r--r-- |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
--- a/browser/app/Makefile.in |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
+++ b/browser/app/Makefile.in |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
@@ -44,16 +44,17 @@ srcdir = @srcdir@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
VPATH = @srcdir@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
include $(DEPTH)/config/autoconf.mk |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
DIRS = profile/extensions |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
$(srcdir)/profile/channel-prefs.js \ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
+ $(srcdir)/profile/kde.js \ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
$(NULL) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
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 |
# hardcode en-US for the moment |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
AB_CD = en-US |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
20 |
DEFINES += -DAB_CD=$(AB_CD) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
21 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
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
|
23 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
+++ b/browser/base/content/browser-kde.xul |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
26 |
@@ -0,0 +1,1077 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
+#filter substitution |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
+<?xml version="1.0"?> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
+# -*- Mode: HTML -*- |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
+# ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
+# 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
|
33 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
+# 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
|
35 |
+# 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
|
36 |
+# 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
|
37 |
+# http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
+# 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
|
40 |
+# 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
|
41 |
+# 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
|
42 |
+# License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
+# The Original Code is Mozilla Communicator client code, released |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
+# March 31, 1998. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
+# The Initial Developer of the Original Code is |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
+# Netscape Communications Corporation. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
+# Portions created by the Initial Developer are Copyright (C) 1998-2000 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
+# the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
+# Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
+# Blake Ross <blake@cs.stanford.edu> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
+# David Hyatt <hyatt@mozilla.org> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
+# Joe Hewitt <hewitt@netscape.com> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
+# Pierre Chanial <chanial@noos.fr> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
+# Dean Tessman <dean_tessman@hotmail.com> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
+# Johnathan Nightingale <johnath@mozilla.com> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
+# Dão Gottwald <dao@mozilla.com> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
+# Ehsan Akhgari <ehsan.akhgari@gmail.com> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
+# Robert Strong <robert.bugzilla@gmail.com> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
62 |
+# Rob Campbell <rcampbell@mozilla.com> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
63 |
+# Patrick Walton <pcwalton@mozilla.com> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
64 |
+# David Dahl <ddahl@mozilla.com> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
65 |
+# Frank Yan <fyan@mozilla.com> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
+# 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
|
68 |
+# 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
|
69 |
+# 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
|
70 |
+# 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
|
71 |
+# 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
|
72 |
+# 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
|
73 |
+# 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
|
74 |
+# 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
|
75 |
+# 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
|
76 |
+# 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
|
77 |
+# 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
|
78 |
+# |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
+# ***** END LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
+<?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
|
82 |
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
83 |
+<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
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 |
+<?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
|
87 |
+<?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
|
88 |
+<?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
|
89 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
+# 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
|
91 |
+# hiddenWindow.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
+#include browser-doctype.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
+<window id="main-window" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
+ 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
|
96 |
+ xmlns:svg="http://www.w3.org/2000/svg" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
+ onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
+ title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
+ title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
+#ifdef XP_MACOSX |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
+ title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
+ titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
+ titlemodifier="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
+ titlemodifier_normal="" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
+ titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
+#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
+ title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
+ titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
+ titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
+ titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
+ titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
+ lightweightthemes="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
+ lightweightthemesfooter="browser-bottombox" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
+ windowtype="navigator:browser" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
+ screenX="4" screenY="4" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
+ browsingmode="normal" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
119 |
+ persist="screenX screenY width height sizemode"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
+# 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
|
122 |
+# 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
|
123 |
+# 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
|
124 |
+#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
|
125 |
+<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
|
126 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
+#ifdef MOZ_SAFE_BROWSING |
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 |
+<script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
+#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
|
130 |
+<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
|
131 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
+<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
|
133 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
134 |
+# 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
|
135 |
+# browser-sets.inc file for sharing with hiddenWindow.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
+#include browser-sets.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
+ <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
|
139 |
+ <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
|
140 |
+ 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
|
141 |
+ 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
|
142 |
+ <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
|
143 |
+ 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
|
144 |
+ <menuseparator/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
145 |
+ <menuitem id="context_pinTab" label="&pinAppTab.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
146 |
+ accesskey="&pinAppTab.accesskey;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
147 |
+ oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
148 |
+ <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
149 |
+ accesskey="&unpinAppTab.accesskey;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
150 |
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
151 |
+ <menu id="context_tabViewMenu" label="&moveToGroup.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
152 |
+ accesskey="&moveToGroup.accesskey;"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
153 |
+ <menupopup id="context_tabViewMenuPopup" |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
154 |
+ 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
|
155 |
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
156 |
+ <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
|
157 |
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
158 |
+ </menupopup> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
159 |
+ </menu> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
160 |
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
161 |
+ 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
|
162 |
+ 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
|
163 |
+ oncommand="gBrowser.replaceTabWithWindow(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
|
164 |
+ <menuseparator/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
165 |
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
166 |
+ tbattr="tabbrowser-multiple" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
167 |
+ 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
|
168 |
+ <menuitem id="context_bookmarkAllTabs" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
169 |
+ label="&bookmarkAllTabs.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
170 |
+ accesskey="&bookmarkAllTabs.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
171 |
+ command="Browser:BookmarkAllTabs"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
172 |
+ <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
|
173 |
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
174 |
+ <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
|
175 |
+ <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
|
176 |
+ 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
|
177 |
+ 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
|
178 |
+ 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
|
179 |
+ <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
|
180 |
+ 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
|
181 |
+ </menupopup> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
182 |
+ |
193 | 183 |
+ <!-- bug 415444/582485: event.stopPropagation is here for the cloned version |
184 |
+ of this menupopup --> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
+ <menupopup id="backForwardMenu" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
+ onpopupshowing="return FillHistoryMenu(event.target);" |
193 | 187 |
+ oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
+ onclick="checkForMiddleClick(this, event);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
+ <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
+ <!-- for search and content formfill/pw manager --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
192 |
+ <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
|
193 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
+ <!-- for url bar autocomplete --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
+ <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
|
196 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
197 |
+ <!-- for invalid form error message --> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
198 |
+ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
193 | 199 |
+ <description/> |
200 |
+ </panel> |
|
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
201 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
+ <panel id="editBookmarkPanel" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
203 |
+ type="arrow" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
+ orient="vertical" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
+ ignorekeys="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
+ hidden="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ onpopupshown="StarUI.panelShown(event);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
+ aria-labelledby="editBookmarkPanelTitle"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
+ <row id="editBookmarkPanelHeader" align="center" hidden="true"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
+ <vbox align="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
+ <image id="editBookmarkPanelStarIcon"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
212 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
213 |
+ <vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
214 |
+ <label id="editBookmarkPanelTitle"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
+ <description id="editBookmarkPanelDescription"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
216 |
+ <hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
+ <button id="editBookmarkPanelRemoveButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
218 |
+ class="editBookmarkPanelHeaderButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
219 |
+ oncommand="StarUI.removeBookmarkButtonCommand();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
+ accesskey="&editBookmark.removeBookmark.accessKey;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
221 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
+ </row> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
+ <hbox id="editBookmarkPanelBottomButtons" pack="end"> |
180
3b887a914979
Likely fixed button order in bookmark panel
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
178
diff
changeset
|
226 |
+#ifdef XP_UNIX |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
229 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
231 |
+ oncommand="StarUI.panel.hidePopup();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
232 |
+ <button id="editBookmarkPanelDeleteButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
233 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
234 |
+ label="&editBookmark.cancel.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
235 |
+ oncommand="StarUI.cancelButtonOnCommand();"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
236 |
+#else |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
237 |
+ <button id="editBookmarkPanelDeleteButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
238 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
+ label="&editBookmark.cancel.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
+ oncommand="StarUI.cancelButtonOnCommand();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
+ <button id="editBookmarkPanelDoneButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
+ class="editBookmarkPanelBottomButton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
+ label="&editBookmark.done.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
+ default="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
+ oncommand="StarUI.panel.hidePopup();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
250 |
+ <panel id="highlighter-panel" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
251 |
+ hidden="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
252 |
+ ignorekeys="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
253 |
+ noautofocus="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
254 |
+ noautohide="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
255 |
+ onclick="InspectorUI.stopInspecting();" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
256 |
+ onmousemove="InspectorUI.highlighter.handleMouseMove(event);" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
257 |
+ onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
258 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
259 |
+ <panel id="inspector-tree-panel" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
260 |
+ orient="vertical" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
261 |
+ hidden="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
262 |
+ ignorekeys="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
263 |
+ noautofocus="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
264 |
+ noautohide="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
265 |
+ titlebar="normal" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
266 |
+ close="true" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
267 |
+ onpopuphiding="InspectorUI.closeInspectorUI(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
|
268 |
+ label="&inspectPanelTitle.label;"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
269 |
+ <toolbar id="inspector-toolbar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
270 |
+ nowindowdrag="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
271 |
+ <toolbarbutton id="inspector-inspect-toolbutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
272 |
+ label="&inspectButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
273 |
+ accesskey="&inspectButton.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
274 |
+ class="toolbarbutton-text" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
275 |
+ command="Inspector:Inspect"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
276 |
+ <toolbarbutton id="inspector-previous-toolbutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
277 |
+ label="&inspectPreviousButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
278 |
+ accesskey="&inspectPreviousButton.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
279 |
+ class="toolbarbutton-text" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
280 |
+ command="Inspector:Previous"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
281 |
+ <toolbarbutton id="inspector-next-toolbutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
282 |
+ label="&inspectNextButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
283 |
+ accesskey="&inspectNextButton.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
284 |
+ class="toolbarbutton-text" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
285 |
+ command="Inspector:Next"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
286 |
+ <toolbarbutton id="inspector-style-toolbutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
287 |
+ label="&inspectStyleButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
288 |
+ accesskey="&inspectStyleButton.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
289 |
+ class="toolbarbutton-text" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
290 |
+ oncommand="InspectorUI.toggleStylePanel();"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
291 |
+ <toolbarbutton id="inspector-dom-toolbutton" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
292 |
+ label="&inspectObjectButton.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
293 |
+ accesskey="&inspectObjectButton.accesskey;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
294 |
+ class="toolbarbutton-text" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
295 |
+ oncommand="InspectorUI.toggleDOMPanel();"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
296 |
+ </toolbar> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
297 |
+ <hbox id="tree-panel-resizer-box" align="end"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
298 |
+ <spacer 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
|
299 |
+ <resizer dir="bottomend" /> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
300 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
301 |
+ </panel> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
302 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
303 |
+ <panel id="inspector-style-panel" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
304 |
+ hidden="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
305 |
+ orient="vertical" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
306 |
+ ignorekeys="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
307 |
+ noautofocus="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
308 |
+ noautohide="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
309 |
+ titlebar="normal" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
310 |
+ label="&inspectStylePanelTitle.label;"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
311 |
+ <listbox id="inspector-style-listbox" 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
|
312 |
+ <hbox align="end"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
313 |
+ <spacer flex="1" /> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
314 |
+ <resizer dir="bottomend"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
315 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
316 |
+ </panel> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
317 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
318 |
+ <menupopup id="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
|
319 |
+ onpopupshowing="onViewToolbarsPopupShowing(event);"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
320 |
+ <menuseparator/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
321 |
+ <menuitem command="cmd_ToggleTabsOnTop" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
322 |
+ 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
|
323 |
+ label="&viewTabsOnTop.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
324 |
+ accesskey="&viewTabsOnTop.accesskey;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
325 |
+ <menuseparator/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
326 |
+ <menuitem command="cmd_CustomizeToolbars" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
327 |
+ label="&viewCustomizeToolbar.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
328 |
+ 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
|
329 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
330 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
331 |
+ <menupopup id="blockedPopupOptions" |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
332 |
+ onpopupshowing="gPopupBlockerObserver.fillPopupList(event);" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
333 |
+ onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
334 |
+ <menuitem observes="blockedPopupAllowSite"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
335 |
+ <menuitem observes="blockedPopupEditSettings"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
336 |
+ <menuitem observes="blockedPopupDontShowMessage"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
337 |
+ <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
|
338 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
339 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
340 |
+ <menupopup id="autohide-context" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
341 |
+ onpopupshowing="FullScreen.getAutohide(this.firstChild);"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
342 |
+ <menuitem type="checkbox" label="&fullScreenAutohide.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
343 |
+ accesskey="&fullScreenAutohide.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
344 |
+ oncommand="FullScreen.setAutohide();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
345 |
+ <menuseparator/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
346 |
+ <menuitem label="&fullScreenExit.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
347 |
+ accesskey="&fullScreenExit.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
348 |
+ oncommand="BrowserFullScreen();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
349 |
+ </menupopup> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
350 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
351 |
+ <menupopup id="contentAreaContextMenu" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
352 |
+ 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
|
353 |
+ return true; |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
354 |
+ gContextMenu = new nsContextMenu(this, gBrowser); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
355 |
+ 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
|
356 |
+ updateEditUIVisibility(); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
357 |
+ return 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
|
358 |
+ onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
359 |
+#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
|
360 |
+ </menupopup> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
361 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
362 |
+ <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
|
363 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
364 |
+ <panel id="notification-popup" type="arrow" position="after_start" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
365 |
+ hidden="true" orient="vertical"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
366 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
367 |
+ <!-- Popup for site identity information --> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
368 |
+ <panel id="identity-popup" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
369 |
+ type="arrow" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
370 |
+ hidden="true" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
371 |
+ noautofocus="true" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
372 |
+ onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
373 |
+ level="top"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
374 |
+ <hbox id="identity-popup-container" align="top"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
375 |
+ <image id="identity-popup-icon"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
376 |
+ <vbox id="identity-popup-content-box"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
377 |
+ <label id="identity-popup-connectedToLabel" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
378 |
+ class="identity-popup-label" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
379 |
+ value="&identity.connectedTo;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
380 |
+ <label id="identity-popup-connectedToLabel2" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
381 |
+ class="identity-popup-label" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
382 |
+ value="&identity.unverifiedsite2;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
383 |
+ <description id="identity-popup-content-host" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
384 |
+ class="identity-popup-description"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
385 |
+ <label id="identity-popup-runByLabel" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
386 |
+ class="identity-popup-label" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
387 |
+ value="&identity.runBy;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
388 |
+ <description id="identity-popup-content-owner" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
389 |
+ class="identity-popup-description"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
390 |
+ <description id="identity-popup-content-supplemental" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
391 |
+ class="identity-popup-description"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
392 |
+ <description id="identity-popup-content-verifier" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
393 |
+ class="identity-popup-description"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
394 |
+ <hbox id="identity-popup-encryption" flex="1"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
395 |
+ <vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
396 |
+ <image id="identity-popup-encryption-icon"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
397 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
398 |
+ <description id="identity-popup-encryption-label" flex="1" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
399 |
+ class="identity-popup-description"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
400 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
401 |
+ <!-- Footer button to open security page info --> |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
402 |
+ <hbox id="identity-popup-button-container" pack="end"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
403 |
+ <button id="identity-popup-more-info-button" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
404 |
+ label="&identity.moreInfoLinkText;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
405 |
+ onblur="gIdentityHandler.hideIdentityPopup();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
406 |
+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
407 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
408 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
409 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
410 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
411 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
412 |
+ <tooltip id="urlTooltip"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
413 |
+ <label crop="center" flex="1" class="tooltip-label"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
414 |
+ </tooltip> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
415 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
416 |
+ <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
|
417 |
+ <hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
418 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
419 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
420 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
421 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
422 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
423 |
+ <button class="ctrlTab-preview" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
424 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
425 |
+ <hbox pack="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
426 |
+ <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
|
427 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
428 |
+ </panel> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
429 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
430 |
+ <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
431 |
+ onmouseover="allTabs._updateTabCloseButton(event);"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
432 |
+ <hbox id="allTabs-meta" align="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
433 |
+ <spacer flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
434 |
+ <textbox id="allTabs-filter" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
435 |
+ tooltiptext="&allTabs.filter.emptyText;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
436 |
+ type="search" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
437 |
+ oncommand="allTabs.filter();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
438 |
+ <spacer flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
439 |
+ <toolbarbutton class="KUI-panel-closebutton" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
440 |
+ oncommand="allTabs.close()" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
441 |
+ tooltiptext="&closeCmd.label;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
442 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
443 |
+ <stack id="allTabs-stack"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
444 |
+ <vbox id="allTabs-container"><hbox/></vbox> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
445 |
+ <toolbarbutton id="allTabs-tab-close-button" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
446 |
+ class="tabs-closebutton" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
447 |
+ oncommand="allTabs.closeTab(event);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
448 |
+ tooltiptext="&closeCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
449 |
+ style="visibility:hidden"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
450 |
+ </stack> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
451 |
+ </panel> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
452 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
453 |
+ <!-- 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
|
454 |
+ <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
|
455 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
456 |
+ <panel id="customizeToolbarSheetPopup" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
457 |
+ noautohide="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
458 |
+ <iframe id="customizeToolbarSheetIFrame" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
459 |
+ style="&dialog.style;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
460 |
+ hidden="true"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
461 |
+ </panel> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
462 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
463 |
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
464 |
+ </popupset> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
465 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
466 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
467 |
+<vbox id="titlebar"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
468 |
+ <hbox id="titlebar-content"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
469 |
+ <hbox id="appmenu-button-container"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
470 |
+ <button id="appmenu-button" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
471 |
+ type="menu" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
472 |
+ label="&brandShortName;" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
473 |
+ style="-moz-user-focus: ignore;"> |
193 | 474 |
+#include browser-appmenu.inc |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
475 |
+ </button> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
476 |
+ </hbox> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
477 |
+ <spacer id="titlebar-spacer" flex="1"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
478 |
+ <hbox id="titlebar-buttonbox-container" align="start"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
479 |
+ <hbox id="titlebar-buttonbox"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
480 |
+ <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
481 |
+ <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
482 |
+ <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
483 |
+ </hbox> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
484 |
+ </hbox> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
485 |
+ </hbox> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
486 |
+</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
|
487 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
488 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
489 |
+<deck flex="1" id="tab-view-deck"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
490 |
+<vbox flex="1"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
491 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
492 |
+ <toolbox id="navigator-toolbox" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
493 |
+ defaultmode="icons" mode="icons" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
494 |
+#ifdef WINCE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
495 |
+ defaulticonsize="small" iconsize="small" |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
496 |
+#else |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
497 |
+ iconsize="large" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
498 |
+#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
|
499 |
+ tabsontop="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
500 |
+ persist="tabsontop"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
501 |
+ <!-- Menu --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
502 |
+ <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
|
503 |
+ defaultset="menubar-items" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
504 |
+ mode="icons" iconsize="small" defaulticonsize="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
|
505 |
+ lockiconsize="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
506 |
+#ifdef MENUBAR_CAN_AUTOHIDE |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
507 |
+ toolbarname="&menubarCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
508 |
+ accesskey="&menubarCmd.accesskey;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
509 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
510 |
+ context="toolbar-context-menu"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
511 |
+ <toolbaritem id="menubar-items" align="center"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
512 |
+# 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
|
513 |
+# hiddenWindow.xul. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
514 |
+#include browser-menubar.inc |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
515 |
+ </toolbaritem> |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
516 |
+ |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
517 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
518 |
+ <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
519 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
520 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
521 |
+ </toolbar> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
522 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
523 |
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
524 |
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
525 |
+ fullscreentoolbar="true" mode="icons" customizable="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
526 |
+#ifdef WINCE |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
527 |
+ iconsize="small" defaulticonsize="small" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
528 |
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
529 |
+#else |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
530 |
+ iconsize="large" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
531 |
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
532 |
+#endif |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
533 |
+ context="toolbar-context-menu"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
534 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
535 |
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
536 |
+ context="backForwardMenu" removable="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
537 |
+ title="&backForwardItem.title;"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
538 |
+ <toolbarbutton id="back-button" class="toolbarbutton-1" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
539 |
+ label="&backCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
540 |
+ command="Browser:BackOrBackDuplicate" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
541 |
+ onclick="checkForMiddleClick(this, event);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
542 |
+ tooltiptext="&backButton.tooltip;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
543 |
+ <toolbarbutton id="forward-button" class="toolbarbutton-1" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
544 |
+ label="&forwardCmd.label;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
545 |
+ command="Browser:ForwardOrForwardDuplicate" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
546 |
+ onclick="checkForMiddleClick(this, event);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
547 |
+ tooltiptext="&forwardButton.tooltip;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
548 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
549 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
550 |
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="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
|
551 |
+ title="&locationItem.title;" class="chromeclass-location" removable="true"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
552 |
+ <textbox id="urlbar" flex="1" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
553 |
+ placeholder="&urlbar.placeholder;" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
554 |
+ type="autocomplete" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
555 |
+ autocompletesearch="history" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
556 |
+ autocompletesearchparam="enable-actions" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
557 |
+ autocompletepopup="PopupAutoCompleteRichResult" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
558 |
+ completeselectedindex="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
559 |
+ tabscrolling="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
560 |
+ showcommentcolumn="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
561 |
+ showimagecolumn="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
562 |
+ enablehistory="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
563 |
+ maxrows="6" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
564 |
+ newlines="stripsurroundingwhitespace" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
565 |
+ oninput="gBrowser.userTypedValue = this.value;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
566 |
+ ontextentered="this.handleCommand(param);" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
567 |
+ ontextreverted="return this.handleRevert();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
568 |
+ pageproxystate="invalid" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
569 |
+ onsearchbegin="LocationBarHelpers._searchBegin();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
570 |
+ onsearchcomplete="LocationBarHelpers._searchComplete();" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
571 |
+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
572 |
+ onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
573 |
+ <box id="notification-popup-box" hidden="true" align="center"> |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
574 |
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
575 |
+ <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
576 |
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
577 |
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
578 |
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
579 |
+ </box> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
580 |
+ <!-- Use onclick instead of normal popup= syntax since the popup |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
581 |
+ code fires onmousedown, and hence eats our favicon drag events. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
582 |
+ We only add the identity-box button to the tab order when the location bar |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
583 |
+ has focus, otherwise pressing F6 focuses it instead of the location bar --> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
584 |
+ <box id="identity-box" role="button" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
585 |
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
586 |
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
587 |
+ ondragstart="gIdentityHandler.onDragStart(event);"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
588 |
+ <hbox id="identity-box-inner" align="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
589 |
+ <stack id="page-proxy-stack" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
590 |
+ onclick="PageProxyClickHandler(event);"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
591 |
+ <image id="urlbar-throbber" busy="false"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
592 |
+ <image id="page-proxy-favicon" validate="never" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
593 |
+ pageproxystate="invalid" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
594 |
+ onerror="this.removeAttribute('src');"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
595 |
+ </stack> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
596 |
+ <hbox id="identity-icon-labels"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
597 |
+ <label id="identity-icon-label" class="plain" 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
|
598 |
+ <label id="identity-icon-country-label" class="plain"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
599 |
+ </hbox> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
600 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
601 |
+ </box> |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
602 |
+ <box id="urlbar-display-box" align="center"> |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
603 |
+ <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
604 |
+ </box> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
605 |
+ <hbox id="urlbar-icons"> |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
606 |
+ <image id="page-report-button" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
607 |
+ class="urlbar-icon" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
608 |
+ hidden="true" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
609 |
+ tooltiptext="&pageReportIcon.tooltip;" |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
610 |
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
611 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
612 |
+ <image id="star-button" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
613 |
+ class="urlbar-icon" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
614 |
+ onclick="PlacesStarButton.onClick(event);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
615 |
+ <image id="go-button" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
616 |
+ class="urlbar-icon" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
617 |
+ tooltiptext="&goEndCap.tooltip;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
618 |
+ onclick="gURLBar.handleCommand(event);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
619 |
+ </hbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
620 |
+ <toolbarbutton id="urlbar-go-button" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
621 |
+ class="chromeclass-toolbar-additional" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
622 |
+ onclick="gURLBar.handleCommand(event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
623 |
+ tooltiptext="&goEndCap.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
624 |
+ <toolbarbutton id="urlbar-reload-button" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
625 |
+ class="chromeclass-toolbar-additional" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
626 |
+ command="Browser:ReloadOrDuplicate" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
627 |
+ onclick="checkForMiddleClick(this, event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
628 |
+ tooltiptext="&reloadButton.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
629 |
+ <toolbarbutton id="urlbar-stop-button" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
630 |
+ class="chromeclass-toolbar-additional" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
631 |
+ command="Browser:Stop" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
632 |
+ tooltiptext="&stopButton.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
633 |
+ </textbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
634 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
635 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
636 |
+ <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
637 |
+ label="&reloadCmd.label;" removable="true" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
638 |
+ command="Browser:ReloadOrDuplicate" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
639 |
+ onclick="checkForMiddleClick(this, event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
640 |
+ tooltiptext="&reloadButton.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
641 |
+ |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
642 |
+ <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
643 |
+ label="&stopCmd.label;" removable="true" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
644 |
+ command="Browser:Stop" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
645 |
+ tooltiptext="&stopButton.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
646 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
647 |
+ <toolbaritem id="search-container" title="&searchItem.title;" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
648 |
+ align="center" class="chromeclass-toolbar-additional" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
649 |
+ flex="100" persist="width" removable="true"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
650 |
+ <searchbar id="searchbar" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
651 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
652 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
653 |
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
654 |
+ persist="class" removable="true" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
655 |
+ label="&homeButton.label;" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
656 |
+ ondragover="homeButtonObserver.onDragOver(event)" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
657 |
+ ondragenter="homeButtonObserver.onDragOver(event)" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
658 |
+ ondrop="homeButtonObserver.onDrop(event)" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
659 |
+ ondragexit="homeButtonObserver.onDragExit(event)" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
660 |
+ onclick="BrowserGoHome(event);" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
661 |
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
662 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
663 |
+ <toolbaritem id="bookmarks-menu-button-container" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
664 |
+ class="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
|
665 |
+ removable="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
666 |
+ title="&bookmarksMenuButton.label;"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
667 |
+ <toolbarbutton id="bookmarks-menu-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
668 |
+ 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
|
669 |
+ class="toolbarbutton-1" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
670 |
+ label="&bookmarksMenuButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
671 |
+ tooltiptext="&bookmarksMenuButton.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
672 |
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
673 |
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
674 |
+ ondragexit="PlacesMenuDNDHandler.onDragExit(event);" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
675 |
+ ondrop="PlacesMenuDNDHandler.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
|
676 |
+ <menupopup id="BMB_bookmarksPopup" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
677 |
+ 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
|
678 |
+ 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
|
679 |
+ openInTabs="children" |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
680 |
+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
681 |
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._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
|
682 |
+ onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
683 |
+ if (!this.parentNode._placesView) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
684 |
+ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
685 |
+ 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
|
686 |
+ <menuitem id="BMB_viewBookmarksToolbar" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
687 |
+ placesanonid="view-toolbar" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
688 |
+ toolbarId="PersonalToolbar" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
689 |
+ 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
|
690 |
+ oncommand="onViewToolbarCommand(event)" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
691 |
+ label="&viewBookmarksToolbar.label;"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
692 |
+ <menuseparator/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
693 |
+ <menuitem id="BMB_bookmarksShowAll" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
694 |
+ label="&showAllBookmarks2.label;" |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
695 |
+ command="Browser:ShowAllBookmarks" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
696 |
+ key="manBookmarkKb"/> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
697 |
+ <menuseparator/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
698 |
+ <menuitem id="BMB_bookmarkThisPage" |
193 | 699 |
+#ifndef XP_MACOSX |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
700 |
+ class="menuitem-iconic" |
193 | 701 |
+#endif |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
702 |
+ label="&bookmarkThisPageCmd.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
703 |
+ command="Browser:AddBookmarkAs" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
704 |
+ key="addBookmarkAsKb"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
705 |
+ <menuitem id="BMB_subscribeToPageMenuitem" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
706 |
+#ifndef XP_MACOSX |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
707 |
+ class="menuitem-iconic" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
708 |
+#endif |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
709 |
+ label="&subscribeToPageMenuitem.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
710 |
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
711 |
+ onclick="checkForMiddleClick(this, event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
712 |
+ observes="singleFeedMenuitemState"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
713 |
+ <menu id="BMB_subscribeToPageMenupopup" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
714 |
+#ifndef XP_MACOSX |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
715 |
+ class="menu-iconic" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
716 |
+#endif |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
717 |
+ label="&subscribeToPageMenupopup.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
718 |
+ observes="multipleFeedsMenuState"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
719 |
+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
720 |
+ onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
721 |
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
722 |
+ onclick="checkForMiddleClick(this, event);"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
723 |
+ </menu> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
724 |
+ <menuseparator/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
725 |
+ <menu id="BMB_bookmarksToolbar" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
726 |
+ placesanonid="toolbar-autohide" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
727 |
+ class="menu-iconic bookmark-item" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
728 |
+ label="&personalbarCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
729 |
+ container="true"> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
730 |
+ <menupopup id="BMB_bookmarksToolbarPopup" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
731 |
+ 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
|
732 |
+ 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
|
733 |
+ onpopupshowing="if (!this.parentNode._placesView) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
734 |
+ new PlacesMenu(event, 'place:folder=TOOLBAR');"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
735 |
+ </menu> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
736 |
+ <menuseparator/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
737 |
+ <!-- Bookmarks menu items --> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
738 |
+ <menuseparator builder="end" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
739 |
+ class="hide-if-empty-places-result"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
740 |
+ <menuitem id="BMB_unsortedBookmarks" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
741 |
+ label="&bookmarksMenuButton.unsorted.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
742 |
+ oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
743 |
+ class="menuitem-iconic"/> |
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 |
+ </menupopup> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
745 |
+ </toolbarbutton> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
746 |
+ </toolbaritem> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
747 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
748 |
+ <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
749 |
+ <hbox id="window-controls" hidden="true" fullscreencontrol="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
750 |
+ <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
|
751 |
+ 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
|
752 |
+ 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
|
753 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
754 |
+ <toolbarbutton id="restore-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
755 |
+ 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
|
756 |
+ 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
|
757 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
758 |
+ <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
|
759 |
+ 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
|
760 |
+ 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
|
761 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
762 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
763 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
764 |
+ <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
|
765 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
766 |
+ <toolbar id="PersonalToolbar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
767 |
+ mode="icons" iconsize="small" defaulticonsize="small" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
768 |
+ lockiconsize="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
769 |
+ 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
|
770 |
+ 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
|
771 |
+ 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
|
772 |
+ 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
|
773 |
+ 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
|
774 |
+ customizable="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
775 |
+ <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
776 |
+ removable="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
777 |
+ <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
|
778 |
+ 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
|
779 |
+ context="placesContext" |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
780 |
+ onclick="BookmarksEventHandler.onClick(event, this._placesView);" |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
781 |
+ 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
|
782 |
+ 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
|
783 |
+ 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
|
784 |
+ <toolbarbutton class="bookmark-item bookmarks-toolbar-customize" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
785 |
+ 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
|
786 |
+ label="&bookmarksToolbarItem.label;"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
787 |
+ <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
|
788 |
+ <hbox align="center"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
789 |
+ <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
|
790 |
+ 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
|
791 |
+ 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
|
792 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
793 |
+ <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
|
794 |
+ 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
|
795 |
+ 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
|
796 |
+ <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
|
797 |
+ 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
|
798 |
+ 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
|
799 |
+ 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
|
800 |
+ 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
|
801 |
+ 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
|
802 |
+ 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
|
803 |
+ ._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
|
804 |
+ <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
|
805 |
+ 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
|
806 |
+ 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
|
807 |
+ 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
|
808 |
+ </toolbarbutton> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
809 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
810 |
+ </hbox> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
811 |
+ </toolbaritem> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
812 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
813 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
814 |
+#ifdef MENUBAR_CAN_AUTOHIDE |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
815 |
+#ifndef CAN_DRAW_IN_TITLEBAR |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
816 |
+#define APPMENU_ON_TABBAR |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
817 |
+#endif |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
818 |
+#endif |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
819 |
+ |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
820 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
821 |
+ <toolbar id="TabsToolbar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
822 |
+ fullscreentoolbar="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
823 |
+ customizable="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
824 |
+ mode="icons" lockmode="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
825 |
+ iconsize="small" defaulticonsize="small" lockiconsize="true" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
826 |
+ aria-label="&tabsToolbar.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
827 |
+ context="toolbar-context-menu" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
828 |
+#ifdef APPMENU_ON_TABBAR |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
829 |
+ defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
830 |
+#else |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
831 |
+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
832 |
+#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
|
833 |
+ 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
|
834 |
+ |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
835 |
+#ifdef APPMENU_ON_TABBAR |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
836 |
+ <toolbarbutton id="appmenu-toolbar-button" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
837 |
+ class="chromeclass-toolbar-additional" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
838 |
+ type="menu" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
839 |
+ label="&brandShortName;" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
840 |
+ tooltiptext="&appMenuButton.tooltip;"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
841 |
+#include browser-appmenu.inc |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
842 |
+ </toolbarbutton> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
843 |
+#endif |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
844 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
845 |
+ <tabs id="tabbrowser-tabs" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
846 |
+ class="tabbrowser-tabs" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
847 |
+ tabbrowser="content" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
848 |
+ 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
|
849 |
+ setfocus="false" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
850 |
+ tooltip="tabbrowser-tab-tooltip"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
851 |
+ <tab class="tabbrowser-tab" selected="true" fadein="true"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
852 |
+ </tabs> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
853 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
854 |
+ <toolbarbutton id="new-tab-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
855 |
+ 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
|
856 |
+ label="&tabCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
857 |
+ command="cmd_newNavigatorTab" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
858 |
+ onclick="checkForMiddleClick(this, event);" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
859 |
+ tooltiptext="&newTabButton.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
860 |
+ ondrop="newTabButtonObserver.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
|
861 |
+ ondragover="newTabButtonObserver.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
|
862 |
+ ondragenter="newTabButtonObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
863 |
+ ondragexit="newTabButtonObserver.onDragExit(event)" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
864 |
+ removable="true"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
865 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
866 |
+ <toolbarbutton id="alltabs-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
867 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
868 |
+ 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
|
869 |
+ label="&listAllTabs.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
870 |
+ tooltiptext="&listAllTabs.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
871 |
+ removable="true"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
872 |
+ <menupopup id="alltabs-popup" |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
873 |
+ position="after_end"> |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
874 |
+ <menuitem id="menu_tabview" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
875 |
+ class="menuitem-iconic" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
876 |
+ key="key_tabview" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
877 |
+ label="&viewTabGroups.label;" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
878 |
+ command="Browser:ToggleTabView" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
879 |
+ observes="tabviewGroupsNumber" |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
880 |
+ keepme="true"/> |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
881 |
+ <menuseparator id="alltabs-popup-separator" keepme="true"/> |
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
882 |
+ </menupopup> |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
883 |
+ </toolbarbutton> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
884 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
885 |
+ <toolbarbutton id="tabs-closebutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
886 |
+ class="close-button tabs-closebutton" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
887 |
+ command="cmd_close" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
888 |
+ label="&closeTab.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
889 |
+ tooltiptext="&closeTab.label;"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
890 |
+ |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
891 |
+#ifdef CAN_DRAW_IN_TITLEBAR |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
892 |
+ <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
893 |
+ <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> |
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
894 |
+#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
|
895 |
+ </toolbar> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
896 |
+ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
897 |
+ <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
|
898 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
899 |
+# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
900 |
+# 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
|
901 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
902 |
+ <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
903 |
+ label="&printButton.label;" command="cmd_print" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
904 |
+ tooltiptext="&printButton.tooltip;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
905 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
906 |
+ <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
907 |
+ mousethrough="always"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
908 |
+ <image/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
909 |
+ </toolbaritem> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
910 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
911 |
+ <toolbarbutton id="downloads-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
|
912 |
+ observes="Tools:Downloads" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
913 |
+ ondrop="DownloadsButtonDNDObserver.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
|
914 |
+ ondragover="DownloadsButtonDNDObserver.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
|
915 |
+ ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
916 |
+ ondragexit="DownloadsButtonDNDObserver.onDragExit(event)" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
917 |
+ label="&downloads.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
918 |
+ tooltiptext="&downloads.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
919 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
920 |
+ <toolbarbutton id="history-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
|
921 |
+ observes="viewHistorySidebar" label="&historyButton.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
922 |
+ tooltiptext="&historyButton.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
923 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
924 |
+ <toolbarbutton id="bookmarks-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
|
925 |
+ observes="viewBookmarksSidebar" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
926 |
+ tooltiptext="&bookmarksButton.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
927 |
+ ondrop="bookmarksButtonObserver.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
|
928 |
+ ondragover="bookmarksButtonObserver.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
|
929 |
+ ondragenter="bookmarksButtonObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
930 |
+ ondragexit="bookmarksButtonObserver.onDragExit(event)"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
931 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
932 |
+ <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
|
933 |
+ 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
|
934 |
+ command="key_newNavigator" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
935 |
+ tooltiptext="&newWindowButton.tooltip;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
936 |
+ 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
|
937 |
+ 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
|
938 |
+ ondragenter="newWindowButtonObserver.onDragOver(event)" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
939 |
+ ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
940 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
941 |
+ <toolbarbutton id="cut-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
|
942 |
+ label="&cutCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
943 |
+ command="cmd_cut" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
944 |
+ tooltiptext="&cutButton.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
945 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
946 |
+ <toolbarbutton id="copy-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
|
947 |
+ label="©Cmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
948 |
+ command="cmd_copy" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
949 |
+ tooltiptext="©Button.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
950 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
951 |
+ <toolbarbutton id="paste-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
|
952 |
+ label="&pasteCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
953 |
+ command="cmd_paste" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
954 |
+ tooltiptext="&pasteButton.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
955 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
956 |
+ <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
|
957 |
+ 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
|
958 |
+ 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
|
959 |
+ label="&fullScreenCmd.label;" |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
960 |
+ tooltiptext="&fullScreenButton.tooltip;"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
961 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
962 |
+ <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
963 |
+ title="&zoomControls.label;"> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
964 |
+ <toolbarbutton id="zoom-out-button" class="toolbarbutton-1" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
965 |
+ label="&fullZoomReduceCmd.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
966 |
+ command="cmd_fullZoomReduce" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
967 |
+ tooltiptext="&zoomOutButton.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
968 |
+ <toolbarbutton id="zoom-in-button" class="toolbarbutton-1" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
969 |
+ label="&fullZoomEnlargeCmd.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
970 |
+ command="cmd_fullZoomEnlarge" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
971 |
+ tooltiptext="&zoomInButton.tooltip;"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
972 |
+ </toolbaritem> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
973 |
+#ifdef MOZ_SERVICES_SYNC |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
974 |
+ <toolbarbutton id="sync-button" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
975 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
976 |
+ label="&syncToolbarButton.label;" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
977 |
+ oncommand="gSyncUI.handleToolbarButton()"/> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
978 |
+#endif |
193 | 979 |
+ <toolbarbutton id="feed-button" |
980 |
+ type="menu" |
|
981 |
+ class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
982 |
+ disabled="true" |
|
983 |
+ label="&feedButton.label;" |
|
984 |
+ tooltiptext="&feedButton.tooltip;" |
|
985 |
+ onclick="return FeedHandler.onFeedButtonClick(event);"> |
|
986 |
+ <menupopup position="after_end" |
|
987 |
+ id="feed-menu" |
|
988 |
+ onpopupshowing="return FeedHandler.buildFeedList(this);" |
|
989 |
+ oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
990 |
+ onclick="checkForMiddleClick(this, event);"/> |
|
991 |
+ </toolbarbutton> |
|
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
992 |
+ |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
993 |
+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
994 |
+ label="&tabGroupsButton.label;" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
995 |
+ command="Browser:ToggleTabView" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
996 |
+ tooltiptext="&tabGroupsButton.tooltip;" |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
997 |
+ 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
|
998 |
+ </toolbarpalette> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
999 |
+ </toolbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1000 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1001 |
+ <hbox flex="1" id="browser"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1002 |
+ <vbox id="browser-border-start" hidden="true" layer="true"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1003 |
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1004 |
+ <sidebarheader id="sidebar-header" align="center"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1005 |
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1006 |
+ <image id="sidebar-throbber"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1007 |
+ <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1008 |
+ </sidebarheader> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1009 |
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1010 |
+ style="min-width: 14em; width: 18em; max-width: 36em;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1011 |
+ </vbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1012 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1013 |
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1014 |
+ <vbox id="appcontent" flex="1"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1015 |
+ <tabbrowser id="content" disablehistory="true" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1016 |
+ flex="1" contenttooltip="aHTMLTooltip" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1017 |
+ tabcontainer="tabbrowser-tabs" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1018 |
+ contentcontextmenu="contentAreaContextMenu" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1019 |
+ autocompletepopup="PopupAutoComplete" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1020 |
+ onclick="return contentAreaClick(event, false);"/> |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1021 |
+ <statuspanel id="statusbar-display" label=""/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1022 |
+ </vbox> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1023 |
+ <vbox id="browser-border-end" hidden="true" layer="true"/> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1024 |
+ </hbox> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1025 |
+ |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1026 |
+ <vbox id="browser-bottombox" layer="true"> |
193 | 1027 |
+ <toolbar id="addon-bar" |
1028 |
+ toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
|
1029 |
+ collapsed="true" |
|
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1030 |
+ class="toolbar-primary chromeclass-toolbar" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1031 |
+ context="toolbar-context-menu" toolboxid="navigator-toolbox" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1032 |
+ mode="icons" iconsize="small" defaulticonsize="small" |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1033 |
+ lockiconsize="true" |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1034 |
+ defaultset="addonbar-closebutton,spring,status-bar" |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1035 |
+ customizable="true" |
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1036 |
+ key="key_toggleAddonBar"> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1037 |
+ <toolbarbutton id="addonbar-closebutton" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1038 |
+ tooltiptext="&addonBarCloseButton.tooltip;" |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1039 |
+ oncommand="setToolbarVisibility(this.parentNode, false);"/> |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
1040 |
+ <statusbar id="status-bar" ordinal="1000"/> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1041 |
+ </toolbar> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1042 |
+ </vbox> |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1043 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1044 |
+#ifndef XP_UNIX |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1045 |
+ <svg:svg height="0"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1046 |
+ <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1047 |
+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1048 |
+ <svg:circle cx="-0.46" cy="0.5" r="0.63"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1049 |
+ </svg:mask> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1050 |
+ <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1051 |
+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1052 |
+ <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1053 |
+ </svg:mask> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1054 |
+ </svg:svg> |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1055 |
+#endif |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1056 |
+#ifdef XP_MACOSX |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1057 |
+ <svg:svg height="0"> |
221
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1058 |
+ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1059 |
+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1060 |
+ <svg:circle cx="-0.46" cy="0.48" r="0.65"/> |
488440b896fe
fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
211
diff
changeset
|
1061 |
+ </svg:mask> |
205
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1062 |
+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1063 |
+ <svg:circle cx="9" cy="3" r="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1064 |
+ <svg:rect x="9" y="0" width="3" height="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1065 |
+ <svg:rect x="6" y="3" width="6" height="19" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1066 |
+ <svg:rect x="1" y="17" width="5" height="5" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1067 |
+ <svg:circle cx="1" cy="17" r="5"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1068 |
+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1069 |
+ </svg:mask> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1070 |
+ <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1071 |
+ <svg:circle cx="3" cy="3" r="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1072 |
+ <svg:rect x="0" y="0" width="3" height="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1073 |
+ <svg:rect x="0" y="3" width="6" height="19" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1074 |
+ <svg:rect x="6" y="17" width="5" height="5" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1075 |
+ <svg:circle cx="11" cy="17" r="5"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1076 |
+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1077 |
+ </svg:mask> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1078 |
+ <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1079 |
+ <svg:circle cx="9" cy="20" r="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1080 |
+ <svg:rect x="9" y="20" width="3" height="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1081 |
+ <svg:rect x="6" y="1" width="6" height="19" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1082 |
+ <svg:rect x="1" y="1" width="5" height="5" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1083 |
+ <svg:circle cx="1" cy="6" r="5"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1084 |
+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1085 |
+ </svg:mask> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1086 |
+ <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse"> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1087 |
+ <svg:circle cx="3" cy="20" r="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1088 |
+ <svg:rect x="0" y="20" width="3" height="3" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1089 |
+ <svg:rect x="0" y="1" width="6" height="19" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1090 |
+ <svg:rect x="6" y="1" width="5" height="5" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1091 |
+ <svg:circle cx="11" cy="6" r="5"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1092 |
+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1093 |
+ </svg:mask> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1094 |
+ </svg:svg> |
71411f8585cd
fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
193
diff
changeset
|
1095 |
+#endif |
178
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1096 |
+ |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1097 |
+</vbox> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1098 |
+# <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
|
1099 |
+# 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
|
1100 |
+# 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
|
1101 |
+</deck> |
77b00e921973
Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
1102 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1103 |
+</window> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1104 |
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
|
1105 |
--- a/browser/base/jar.mn |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1106 |
+++ b/browser/base/jar.mn |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1107 |
@@ -22,16 +22,18 @@ browser.jar: |
153 | 1108 |
* content/browser/aboutHome.css (content/aboutHome.css) |
226
6bf3bb4c115e
update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
223
diff
changeset
|
1109 |
content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) |
229
298263f797be
update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
226
diff
changeset
|
1110 |
content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1111 |
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1112 |
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1113 |
* content/browser/browser.css (content/browser.css) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1114 |
* content/browser/browser.js (content/browser.js) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1115 |
* content/browser/browser.xul (content/browser.xul) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1116 |
+* 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
|
1117 |
+% 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
|
1118 |
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1119 |
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
153
diff
changeset
|
1120 |
* content/browser/inspector.html (content/inspector.html) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1121 |
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1122 |
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1123 |
* content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1124 |
* content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1125 |
* content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1126 |
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
|
1127 |
--- a/browser/components/build/nsModule.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1128 |
+++ b/browser/components/build/nsModule.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1129 |
@@ -41,17 +41,17 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1130 |
#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
|
1131 |
#include "DirectoryProvider.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1132 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1133 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1134 |
#include "nsWindowsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1135 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1136 |
#include "nsMacShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1137 |
#elif defined(MOZ_WIDGET_GTK2) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1138 |
-#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1139 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1140 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1141 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1142 |
#ifndef WINCE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1143 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1144 |
#include "nsProfileMigrator.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1145 |
#if !defined(XP_BEOS) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1146 |
#include "nsDogbertProfileMigrator.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1147 |
#endif |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1148 |
@@ -84,18 +84,16 @@ using namespace mozilla::browser; |
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1149 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1150 |
///////////////////////////////////////////////////////////////////////////// |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1151 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1152 |
NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1153 |
#if defined(XP_WIN) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1154 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1155 |
#elif defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1156 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1157 |
-#elif defined(MOZ_WIDGET_GTK2) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1158 |
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1159 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1160 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1161 |
#ifndef WINCE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1162 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1163 |
#if !defined(XP_BEOS) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1164 |
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1165 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1166 |
#if !defined(XP_OS2) |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1167 |
@@ -151,17 +149,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1168 |
#endif /* WINCE */ |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1169 |
NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1170 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1171 |
static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1172 |
{ &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1173 |
#if defined(XP_WIN) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1174 |
{ &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1175 |
#elif defined(MOZ_WIDGET_GTK2) |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1176 |
- { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1177 |
+ { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1178 |
#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
|
1179 |
{ &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1180 |
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1181 |
#ifndef WINCE |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1182 |
{ &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1183 |
#if defined(XP_WIN) && !defined(__MINGW32__) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1184 |
{ &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1185 |
#elif defined(XP_MACOSX) |
223 | 1186 |
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1187 |
--- a/browser/components/preferences/advanced.js |
|
1188 |
+++ b/browser/components/preferences/advanced.js |
|
1189 |
@@ -683,24 +683,42 @@ var gAdvancedPane = { |
|
1190 |
var brandBundle = document.getElementById("bundleBrand"); |
|
1191 |
var shellBundle = document.getElementById("bundleShell"); |
|
1192 |
var brandShortName = brandBundle.getString("brandShortName"); |
|
1193 |
var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
|
1194 |
var promptMessage; |
|
1195 |
const IPS = Components.interfaces.nsIPromptService; |
|
1196 |
var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] |
|
1197 |
.getService(IPS); |
|
1198 |
+ |
|
1199 |
+ var env = Components.classes["@mozilla.org/process/environment;1"] |
|
1200 |
+ .getService(Components.interfaces.nsIEnvironment); |
|
1201 |
+ var kde_session = 0; |
|
1202 |
+ if (env.get('KDE_FULL_SESSION') == "true") |
|
1203 |
+ kde_session = 1; |
|
1204 |
+ |
|
1205 |
if (!shellSvc.isDefaultBrowser(false)) { |
|
1206 |
promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", |
|
1207 |
[brandShortName]); |
|
1208 |
var rv = psvc.confirmEx(window, promptTitle, promptMessage, |
|
1209 |
IPS.STD_YES_NO_BUTTONS, |
|
1210 |
null, null, null, null, { }); |
|
1211 |
- if (rv == 0) |
|
1212 |
+ if (rv == 0) { |
|
1213 |
shellSvc.setDefaultBrowser(true, false); |
|
1214 |
+ if (kde_session == 1) { |
|
1215 |
+ var shellObj = Components.classes["@mozilla.org/file/local;1"] |
|
1216 |
+ .createInstance(Components.interfaces.nsILocalFile); |
|
1217 |
+ shellObj.initWithPath("/usr/bin/kwriteconfig"); |
|
1218 |
+ var process = Components.classes["@mozilla.org/process/util;1"] |
|
1219 |
+ .createInstance(Components.interfaces.nsIProcess); |
|
1220 |
+ process.init(shellObj); |
|
1221 |
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; |
|
1222 |
+ process.run(false, args, args.length); |
|
1223 |
+ } |
|
1224 |
+ } |
|
1225 |
} |
|
1226 |
else { |
|
1227 |
promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", |
|
1228 |
[brandShortName]); |
|
1229 |
psvc.alert(window, promptTitle, promptMessage); |
|
1230 |
} |
|
1231 |
} |
|
1232 |
#endif |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1233 |
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1234 |
--- a/browser/components/shell/src/Makefile.in |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1235 |
+++ b/browser/components/shell/src/Makefile.in |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1236 |
@@ -52,17 +52,18 @@ endif |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1237 |
|
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1238 |
ifneq (,$(filter WINCE WINNT,$(OS_ARCH))) |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1239 |
CPPSRCS = nsWindowsShellService.cpp |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1240 |
else |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1241 |
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1242 |
CPPSRCS = nsMacShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1243 |
else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1244 |
ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1245 |
-CPPSRCS = nsGNOMEShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1246 |
+CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1247 |
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1248 |
endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1249 |
endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1250 |
endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1251 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1252 |
ifdef CPPSRCS |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1253 |
LIBRARY_NAME = shellservice_s |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1254 |
endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1255 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1256 |
diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1257 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1258 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1259 |
+++ b/browser/components/shell/src/nsKDEShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1260 |
@@ -0,0 +1,193 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1261 |
+/* -*- 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
|
1262 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1263 |
+ * 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
|
1264 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1265 |
+ * 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
|
1266 |
+ * 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
|
1267 |
+ * 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
|
1268 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1269 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1270 |
+ * 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
|
1271 |
+ * 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
|
1272 |
+ * 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
|
1273 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1274 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1275 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1276 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1277 |
+ * 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
|
1278 |
+ * 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
|
1279 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1280 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1281 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1282 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1283 |
+ * 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
|
1284 |
+ * 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
|
1285 |
+ * 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
|
1286 |
+ * 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
|
1287 |
+ * 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
|
1288 |
+ * 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
|
1289 |
+ * 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
|
1290 |
+ * 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
|
1291 |
+ * 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
|
1292 |
+ * 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
|
1293 |
+ * 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
|
1294 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1295 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1296 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1297 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1298 |
+#include "nsShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1299 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1300 |
+#include "nsCOMPtr.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1301 |
+#include "nsIPrefService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1302 |
+#include "nsIProcess.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1303 |
+#include "nsILocalFile.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1304 |
+#include "nsServiceManagerUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1305 |
+#include "nsComponentManagerUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1306 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1307 |
+nsresult |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1308 |
+nsKDEShellService::Init() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1309 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1310 |
+ if( !nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1311 |
+ return NS_ERROR_NOT_AVAILABLE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1312 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1313 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1314 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1315 |
+NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1316 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1317 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1318 |
+nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1319 |
+ PRBool* aIsDefaultBrowser) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1320 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1321 |
+ *aIsDefaultBrowser = PR_FALSE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1322 |
+ if (aStartupCheck) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1323 |
+ mCheckedThisSession = PR_TRUE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1324 |
+ nsCStringArray command; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1325 |
+ command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1326 |
+ if( nsKDEUtils::command( command )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1327 |
+ *aIsDefaultBrowser = PR_TRUE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1328 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1329 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1330 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1331 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1332 |
+nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1333 |
+ PRBool aForAllUsers) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1334 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1335 |
+ nsCStringArray command; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1336 |
+ command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1337 |
+ command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1338 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1339 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1340 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1341 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1342 |
+nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1343 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1344 |
+ // If we've already checked, the browser has been started and this is a |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1345 |
+ // 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
|
1346 |
+ if (mCheckedThisSession) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1347 |
+ *aResult = PR_FALSE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1348 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1349 |
+ } |
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 |
+ nsCOMPtr<nsIPrefBranch> prefs; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1352 |
+ 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
|
1353 |
+ if (pserve) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1354 |
+ pserve->GetBranch("", getter_AddRefs(prefs)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1355 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1356 |
+ if (prefs) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1357 |
+ prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1358 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1359 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1360 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1361 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1362 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1363 |
+nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1364 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1365 |
+ nsCOMPtr<nsIPrefBranch> prefs; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1366 |
+ 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
|
1367 |
+ if (pserve) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1368 |
+ pserve->GetBranch("", getter_AddRefs(prefs)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1369 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1370 |
+ if (prefs) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1371 |
+ prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1372 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1373 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1374 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1375 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1376 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1377 |
+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1378 |
+ PRInt32 aPosition) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1379 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1380 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1381 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1382 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1383 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1384 |
+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1385 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1386 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1387 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1388 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1389 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1390 |
+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1391 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1392 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1393 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1394 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1395 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1396 |
+nsKDEShellService::OpenApplication(PRInt32 aApplication) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1397 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1398 |
+ nsCStringArray command; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1399 |
+ if( aApplication == APPLICATION_MAIL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1400 |
+ command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1401 |
+ else if( aApplication == APPLICATION_NEWS ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1402 |
+ command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1403 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1404 |
+ return NS_ERROR_NOT_IMPLEMENTED; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1405 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1406 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1407 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1408 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1409 |
+nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1410 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1411 |
+ nsCStringArray command; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1412 |
+ command.AppendCString( NS_LITERAL_CSTRING( "RUN" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1413 |
+ nsCString app; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1414 |
+ nsresult rv = aApplication->GetNativePath( app ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1415 |
+ NS_ENSURE_SUCCESS( rv, rv ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1416 |
+ command.AppendCString( app ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1417 |
+ command.AppendCString( aURI ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1418 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1419 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1420 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1421 |
+NS_IMETHODIMP |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1422 |
+nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1423 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1424 |
+ *_retval = nsnull; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1425 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1426 |
+ nsCStringArray command; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1427 |
+ command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1428 |
+ nsCStringArray output; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1429 |
+ if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1430 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1431 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1432 |
+ nsCString path; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1433 |
+ path = *output[ 0 ]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1434 |
+ if (path.IsEmpty()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1435 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1436 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1437 |
+ nsresult rv; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1438 |
+ nsCOMPtr<nsILocalFile> defaultReader = |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1439 |
+ 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
|
1440 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1441 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1442 |
+ rv = defaultReader->InitWithNativePath(path); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1443 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1444 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1445 |
+ PRBool exists; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1446 |
+ rv = defaultReader->Exists(&exists); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1447 |
+ NS_ENSURE_SUCCESS(rv, rv); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1448 |
+ if (!exists) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1449 |
+ return NS_ERROR_FAILURE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1450 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1451 |
+ NS_ADDREF(*_retval = defaultReader); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1452 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1453 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1454 |
diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1455 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1456 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1457 |
+++ b/browser/components/shell/src/nsKDEShellService.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1458 |
@@ -0,0 +1,59 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1459 |
+/* -*- 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
|
1460 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1461 |
+ * 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
|
1462 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1463 |
+ * 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
|
1464 |
+ * 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
|
1465 |
+ * 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
|
1466 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1467 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1468 |
+ * 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
|
1469 |
+ * 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
|
1470 |
+ * 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
|
1471 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1472 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1473 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1474 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1475 |
+ * 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
|
1476 |
+ * 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
|
1477 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1478 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1479 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1480 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1481 |
+ * 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
|
1482 |
+ * 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
|
1483 |
+ * 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
|
1484 |
+ * 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
|
1485 |
+ * 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
|
1486 |
+ * 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
|
1487 |
+ * 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
|
1488 |
+ * 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
|
1489 |
+ * 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
|
1490 |
+ * 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
|
1491 |
+ * 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
|
1492 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1493 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1494 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1495 |
+#ifndef nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1496 |
+#define nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1497 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1498 |
+#include "nsIShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1499 |
+#include "nsStringAPI.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1500 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1501 |
+class nsKDEShellService : public nsIShellService |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1502 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1503 |
+public: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1504 |
+ nsKDEShellService() : mCheckedThisSession(PR_FALSE) { } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1505 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1506 |
+ NS_DECL_ISUPPORTS |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1507 |
+ NS_DECL_NSISHELLSERVICE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1508 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1509 |
+ nsresult Init() NS_HIDDEN; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1510 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1511 |
+private: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1512 |
+ ~nsKDEShellService() {} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1513 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1514 |
+ PRPackedBool mCheckedThisSession; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1515 |
+}; |
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 |
+#endif // nskdeshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1518 |
diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1519 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1520 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1521 |
+++ b/browser/components/shell/src/nsUnixShellService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1522 |
@@ -0,0 +1,52 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1523 |
+/* -*- 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
|
1524 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1525 |
+ * 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
|
1526 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1527 |
+ * 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
|
1528 |
+ * 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
|
1529 |
+ * 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
|
1530 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1531 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1532 |
+ * 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
|
1533 |
+ * 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
|
1534 |
+ * 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
|
1535 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1536 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1537 |
+ * The Original Code is Shell Service. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1538 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1539 |
+ * 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
|
1540 |
+ * 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
|
1541 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1542 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1543 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1544 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1545 |
+ * 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
|
1546 |
+ * 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
|
1547 |
+ * 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
|
1548 |
+ * 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
|
1549 |
+ * 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
|
1550 |
+ * 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
|
1551 |
+ * 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
|
1552 |
+ * 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
|
1553 |
+ * 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
|
1554 |
+ * 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
|
1555 |
+ * 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
|
1556 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1557 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1558 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1559 |
+#include "nsUnixShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1560 |
+#include "nsGNOMEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1561 |
+#include "nsKDEShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1562 |
+#include "nsKDEUtils.h" |
133
a77c32dc7ffd
Adopted KDE patch to compile with FF4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
127
diff
changeset
|
1563 |
+#include "mozilla/ModuleUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1564 |
+ |
136
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1565 |
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
0051f2b9308b
Fixed init of Shellservices
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
133
diff
changeset
|
1566 |
+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
|
1567 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1568 |
+NS_METHOD |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1569 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1570 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1571 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1572 |
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1573 |
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1574 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1575 |
diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1576 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1577 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1578 |
+++ b/browser/components/shell/src/nsUnixShellService.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1579 |
@@ -0,0 +1,45 @@ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1580 |
+/* -*- 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
|
1581 |
+/* ***** BEGIN LICENSE BLOCK ***** |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1582 |
+ * 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
|
1583 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1584 |
+ * 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
|
1585 |
+ * 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
|
1586 |
+ * 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
|
1587 |
+ * http://www.mozilla.org/MPL/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1588 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1589 |
+ * 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
|
1590 |
+ * 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
|
1591 |
+ * 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
|
1592 |
+ * License. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1593 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1594 |
+ * The Original Code is Shell Service. |
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 |
+ * 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
|
1597 |
+ * 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
|
1598 |
+ * the Initial Developer. All Rights Reserved. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1599 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1600 |
+ * Contributor(s): |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1601 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1602 |
+ * 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
|
1603 |
+ * 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
|
1604 |
+ * 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
|
1605 |
+ * 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
|
1606 |
+ * 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
|
1607 |
+ * 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
|
1608 |
+ * 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
|
1609 |
+ * 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
|
1610 |
+ * 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
|
1611 |
+ * 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
|
1612 |
+ * 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
|
1613 |
+ * |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1614 |
+ * ***** END LICENSE BLOCK ***** */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1615 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1616 |
+#ifndef nsunixshellservice_h____ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1617 |
+#define nsunixshellservice_h____ |
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 |
+#include "nsIShellService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1620 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1621 |
+NS_METHOD |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1622 |
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1623 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1624 |
+#endif // nsunixshellservice_h____ |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1625 |
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
|
1626 |
--- a/browser/installer/package-manifest.in |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1627 |
+++ b/browser/installer/package-manifest.in |
211
aef7c16cb0e5
refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
205
diff
changeset
|
1628 |
@@ -442,16 +442,17 @@ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1629 |
#endif |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1630 |
#endif |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1631 |
|
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1632 |
; [Default Preferences] |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1633 |
; All the pref files must be part of base to prevent migration bugs |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1634 |
@BINPATH@/@PREF_DIR@/firefox.js |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1635 |
@BINPATH@/@PREF_DIR@/firefox-branding.js |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1636 |
@BINPATH@/@PREF_DIR@/channel-prefs.js |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1637 |
+@BINPATH@/@PREF_DIR@/kde.js |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1638 |
#ifdef MOZ_SERVICES_SYNC |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1639 |
@BINPATH@/@PREF_DIR@/services-sync.js |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1640 |
#endif |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1641 |
@BINPATH@/greprefs.js |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1642 |
@BINPATH@/defaults/autoconfig/platform.js |
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1643 |
@BINPATH@/defaults/autoconfig/prefcalls.js |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1644 |
@BINPATH@/defaults/profile/prefs.js |
13
c7935ea2351b
kde.js was not shipped (missing in filelist)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1645 |