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