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