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