firefox-kde.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sun, 18 Aug 2013 10:36:27 +0200
branchfirefox24
changeset 662 775530ba0729
parent 659 fa96cf6ffd14
child 680 be770d3cbc02
permissions -rw-r--r--
rebase patches
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
new file mode 100644
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
--- /dev/null
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
+++ b/browser/base/content/browser-kde.xul
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
     5
@@ -0,0 +1,1097 @@
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
+#filter substitution
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
+<?xml version="1.0"?>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+# -*- Mode: HTML -*-
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
+#
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    10
+# This Source Code Form is subject to the terms of the Mozilla Public
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    11
+# License, v. 2.0. If a copy of the MPL was not distributed with this
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    12
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
400
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
    16
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+<?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
    20
+<?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
    21
+<?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
    22
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
+# 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
    24
+# hiddenWindow.xul.
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
+#include browser-doctype.inc
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
+<window id="main-window"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
+        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
    29
+        xmlns:svg="http://www.w3.org/2000/svg"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
+        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
    31
+        onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
+        title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
+        title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
+#ifdef XP_MACOSX
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
+        title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
+        titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
+        titlemodifier=""
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
+        titlemodifier_normal=""
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
+        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
+#else
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
+        title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
+        titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
+        titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
+        titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
+#endif
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
+        lightweightthemes="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
+        lightweightthemesfooter="browser-bottombox"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
+        windowtype="navigator:browser"
419
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
    50
+        macanimationtype="document"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
+        screenX="4" screenY="4"
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    52
+        fullscreenbutton="true"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
    53
+        persist="screenX screenY width height sizemode">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
+# 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
    56
+# 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
    57
+# 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
    58
+#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
    59
+<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
    60
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
    61
+<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
    62
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
+<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
    64
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    65
+# 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
    66
+# browser-sets.inc file for sharing with hiddenWindow.xul.
291
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    67
+#define FULL_BROWSER_WINDOW
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
+#include browser-sets.inc
291
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    69
+#undef FULL_BROWSER_WINDOW
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
+  <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
    72
+    <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
    73
+               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
    74
+               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
    75
+      <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
    76
+                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
    77
+      <menuseparator/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
    78
+      <menuitem id="context_pinTab" label="&pinTab.label;"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
    79
+                accesskey="&pinTab.accesskey;"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    80
+                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
    81
+      <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
    82
+                accesskey="&unpinTab.accesskey;"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    83
+                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    84
+      <menu id="context_tabViewMenu" label="&moveToGroup.label;"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    85
+            accesskey="&moveToGroup.accesskey;">
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    86
+        <menupopup id="context_tabViewMenuPopup"
229
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
    87
+                   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
    88
+          <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
    89
+          <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
    90
+                    oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    91
+        </menupopup>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    92
+      </menu>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    93
+      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
    94
+                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
    95
+                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
    96
+                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
    97
+      <menuseparator/>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
    98
+      <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
    99
+                tbattr="tabbrowser-multiple-visible"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   100
+                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
   101
+      <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
   102
+                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
   103
+                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
   104
+                command="Browser:BookmarkAllTabs"/>
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   105
+      <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;"
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   106
+                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
   107
+      <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
   108
+                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   109
+      <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
   110
+      <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
   111
+                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
   112
+                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
   113
+                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
   114
+      <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
   115
+                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
   116
+    </menupopup>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   117
+
193
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   118
+    <!-- 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
   119
+         of this menupopup -->
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   120
+    <menupopup id="backForwardMenu"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   121
+               onpopupshowing="return FillHistoryMenu(event.target);"
193
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   122
+               oncommand="gotoHistoryIndex(event); event.stopPropagation();"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   123
+               onclick="checkForMiddleClick(this, event);"/>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   124
+    <tooltip id="aHTMLTooltip" page="true"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   125
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   126
+    <!-- for search and content formfill/pw manager -->
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   127
+    <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
   128
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   129
+    <!-- for url bar autocomplete -->
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   130
+    <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
   131
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   132
+    <!-- for invalid form error message -->
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   133
+    <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
   134
+      <description/>
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   135
+    </panel>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   136
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   137
+    <panel id="editBookmarkPanel"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   138
+           type="arrow"
291
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
   139
+           footertype="promobox"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   140
+           orient="vertical"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   141
+           ignorekeys="true"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   142
+           consumeoutsideclicks="true"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   143
+           hidden="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   144
+           onpopupshown="StarUI.panelShown(event);"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   145
+           aria-labelledby="editBookmarkPanelTitle">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   146
+      <row id="editBookmarkPanelHeader" align="center" hidden="true">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   147
+        <vbox align="center">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   148
+          <image id="editBookmarkPanelStarIcon"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   149
+        </vbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   150
+        <vbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   151
+          <label id="editBookmarkPanelTitle"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   152
+          <description id="editBookmarkPanelDescription"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   153
+          <hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   154
+            <button id="editBookmarkPanelRemoveButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   155
+                    class="editBookmarkPanelHeaderButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   156
+                    oncommand="StarUI.removeBookmarkButtonCommand();"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   157
+                    accesskey="&editBookmark.removeBookmark.accessKey;"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   158
+          </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   159
+        </vbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   160
+      </row>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   161
+      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   162
+      <hbox id="editBookmarkPanelBottomButtons" pack="end">
180
3b887a914979 Likely fixed button order in bookmark panel
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 178
diff changeset
   163
+#ifdef XP_UNIX
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   164
+        <button id="editBookmarkPanelDoneButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   165
+                class="editBookmarkPanelBottomButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   166
+                label="&editBookmark.done.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   167
+                default="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   168
+                oncommand="StarUI.panel.hidePopup();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   169
+        <button id="editBookmarkPanelDeleteButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   170
+                class="editBookmarkPanelBottomButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   171
+                label="&editBookmark.cancel.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   172
+                oncommand="StarUI.cancelButtonOnCommand();"/>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   173
+#else
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   174
+        <button id="editBookmarkPanelDeleteButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   175
+                class="editBookmarkPanelBottomButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   176
+                label="&editBookmark.cancel.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   177
+                oncommand="StarUI.cancelButtonOnCommand();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   178
+        <button id="editBookmarkPanelDoneButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   179
+                class="editBookmarkPanelBottomButton"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   180
+                label="&editBookmark.done.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   181
+                default="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   182
+                oncommand="StarUI.panel.hidePopup();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   183
+#endif
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   184
+      </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   185
+    </panel>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   186
+
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   187
+    <panel id="socialActivatedNotification"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   188
+           type="arrow"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   189
+           hidden="true"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   190
+           consumeoutsideclicks="true"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   191
+           align="start"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   192
+           orient="horizontal"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   193
+           role="alert">
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   194
+      <image id="social-activation-icon" class="popup-notification-icon"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   195
+      <vbox flex="1">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   196
+        <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   197
+        <spacer flex="1"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   198
+        <hbox pack="start" align="center" class="popup-notification-button-container">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   199
+          <label  id="social-undoactivation-button"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   200
+                  class="text-link"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   201
+                  value="&social.activated.undo.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   202
+                  accesskey="&social.activated.undo.accesskey;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   203
+                  onclick="SocialUI.undoActivation(this);"/>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   204
+          <spacer flex="1"/>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   205
+          <button id="social-activation-button"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   206
+                  default="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   207
+                  autofocus="autofocus"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   208
+                  label="&social.ok.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   209
+                  accesskey="&social.ok.accesskey;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   210
+                  oncommand="SocialUI.activationPanel.hidePopup();"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   211
+        </hbox>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   212
+      </vbox>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   213
+    </panel>
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   214
+
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   215
+    <panel id="social-share-panel"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   216
+           class="social-panel"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   217
+           type="arrow"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   218
+           orient="horizontal"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   219
+           onpopupshowing="SocialShare.onShowing()"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   220
+           onpopuphidden="SocialShare.onHidden()"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   221
+           consumeoutsideclicks="true"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   222
+           hidden="true">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   223
+      <vbox class="social-share-toolbar">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   224
+        <vbox id="social-share-provider-buttons" flex="1"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   225
+      </vbox>
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   226
+    </panel>
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   227
+
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   228
+    <panel id="social-notification-panel"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   229
+           class="social-panel"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   230
+           type="arrow"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   231
+           hidden="true"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   232
+           noautofocus="true"/>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   233
+    <panel id="social-flyout-panel"
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   234
+           class="social-panel"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   235
+           onpopupshown="SocialFlyout.onShown()"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   236
+           onpopuphidden="SocialFlyout.onHidden()"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   237
+           side="right"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   238
+           type="arrow"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   239
+           hidden="true"
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   240
+           flip="slide"
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   241
+           rolluponmousewheel="true"
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   242
+           consumeoutsideclicks="false"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   243
+           noautofocus="true"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   244
+           position="topcenter topright"/>
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   245
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   246
+    <menupopup id="toolbar-context-menu"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   247
+               onpopupshowing="onViewToolbarsPopupShowing(event);">
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   248
+      <menuseparator/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   249
+      <menuitem command="cmd_ToggleTabsOnTop"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   250
+                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
   251
+                label="&viewTabsOnTop.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   252
+                accesskey="&viewTabsOnTop.accesskey;"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   253
+      <menuitem command="cmd_CustomizeToolbars"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   254
+                label="&viewCustomizeToolbar.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   255
+                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
   256
+    </menupopup>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   257
+
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   258
+    <menupopup id="blockedPopupOptions"
211
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   259
+               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   260
+               onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   261
+      <menuitem observes="blockedPopupAllowSite"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   262
+      <menuitem observes="blockedPopupEditSettings"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   263
+      <menuitem observes="blockedPopupDontShowMessage"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   264
+      <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
   265
+    </menupopup>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   266
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   267
+    <menupopup id="autohide-context"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   268
+           onpopupshowing="FullScreen.getAutohide(this.firstChild);">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   269
+      <menuitem type="checkbox" label="&fullScreenAutohide.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   270
+                accesskey="&fullScreenAutohide.accesskey;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   271
+                oncommand="FullScreen.setAutohide();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   272
+      <menuseparator/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   273
+      <menuitem label="&fullScreenExit.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   274
+                accesskey="&fullScreenExit.accesskey;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   275
+                oncommand="BrowserFullScreen();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   276
+    </menupopup>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   277
+
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   278
+    <menupopup id="contentAreaContextMenu" pagemenu="start"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   279
+               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
   280
+                                 return true;
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   281
+                               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
   282
+                               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
   283
+                                 updateEditUIVisibility();
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   284
+                               return gContextMenu.shouldDisplay;"
400
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
   285
+               onpopuphiding="if (event.target != this)
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
   286
+                                return;
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
   287
+                              gContextMenu.hiding();
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
   288
+                              gContextMenu = null;
6a1811ef3174 update for 11.0b4
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 399
diff changeset
   289
+                              updateEditUIVisibility();">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   290
+#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
   291
+    </menupopup>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   292
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   293
+    <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
   294
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   295
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   296
+    <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
   297
+      <hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   298
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   299
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   300
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   301
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   302
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   303
+        <button class="ctrlTab-preview" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   304
+      </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   305
+      <hbox pack="center">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   306
+        <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
   307
+      </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   308
+    </panel>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   309
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   310
+    <!-- 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
   311
+    <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
   312
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   313
+    <panel id="customizeToolbarSheetPopup"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   314
+           noautohide="true"
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   315
+           sheetstyle="&dialog.dimensions;"/>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   316
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   317
+    <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
   318
+
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   319
+    <tooltip id="back-button-tooltip">
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   320
+      <label class="tooltip-label" value="&backButton.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   321
+#ifdef XP_MACOSX
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   322
+      <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   323
+#else
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   324
+      <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   325
+#endif
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   326
+    </tooltip>
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
   327
+
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   328
+    <tooltip id="forward-button-tooltip">
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   329
+      <label class="tooltip-label" value="&forwardButton.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   330
+#ifdef XP_MACOSX
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   331
+      <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   332
+#else
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   333
+      <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   334
+#endif
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   335
+    </tooltip>
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   336
+
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   337
+#include popup-notifications.inc
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   338
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   339
+  </popupset>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   340
+
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   341
+#ifdef CAN_DRAW_IN_TITLEBAR
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   342
+<vbox id="titlebar">
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   343
+  <hbox id="titlebar-content">
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   344
+#ifdef MENUBAR_CAN_AUTOHIDE
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   345
+    <hbox id="appmenu-button-container">
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   346
+      <button id="appmenu-button"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   347
+              type="menu"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   348
+              label="&brandShortName;"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   349
+              style="-moz-user-focus: ignore;">
193
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   350
+#include browser-appmenu.inc
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   351
+      </button>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   352
+    </hbox>
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   353
+#endif
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   354
+    <spacer id="titlebar-spacer" flex="1"/>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   355
+    <hbox id="titlebar-buttonbox-container" align="start">
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   356
+      <hbox id="titlebar-buttonbox">
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   357
+        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   358
+        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   359
+        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   360
+      </hbox>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   361
+    </hbox>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   362
+  </hbox>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   363
+</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
   364
+#endif
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   365
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   366
+<deck flex="1" id="tab-view-deck">
291
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
   367
+<vbox flex="1" id="browser-panel">
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   368
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   369
+  <toolbox id="navigator-toolbox"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   370
+           defaultmode="icons" mode="icons"
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   371
+           iconsize="large">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   372
+    <!-- Menu -->
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   373
+    <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
   374
+             defaultset="menubar-items"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   375
+             mode="icons" iconsize="small" defaulticonsize="small"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   376
+             lockiconsize="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   377
+#ifdef MENUBAR_CAN_AUTOHIDE
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   378
+             toolbarname="&menubarCmd.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   379
+             accesskey="&menubarCmd.accesskey;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   380
+#endif
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   381
+             context="toolbar-context-menu">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   382
+      <toolbaritem id="menubar-items" align="center">
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   383
+# 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
   384
+# hiddenWindow.xul.
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   385
+#include browser-menubar.inc
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   386
+      </toolbaritem>
211
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   387
+
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   388
+#ifdef CAN_DRAW_IN_TITLEBAR
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   389
+      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   390
+      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   391
+#endif
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   392
+    </toolbar>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   393
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   394
+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   395
+             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   396
+             fullscreentoolbar="true" mode="icons" customizable="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   397
+             iconsize="large"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   398
+             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   399
+             context="toolbar-context-menu">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   400
+
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   401
+      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   402
+                   context="backForwardMenu" removable="true"
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   403
+                   forwarddisabled="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
   404
+                   title="&backForwardItem.title;">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   405
+        <toolbarbutton id="back-button" class="toolbarbutton-1"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   406
+                       label="&backCmd.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   407
+                       command="Browser:BackOrBackDuplicate"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   408
+                       onclick="checkForMiddleClick(this, event);"
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   409
+                       tooltip="back-button-tooltip"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   410
+        <toolbarbutton id="forward-button" class="toolbarbutton-1"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   411
+                       label="&forwardCmd.label;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   412
+                       command="Browser:ForwardOrForwardDuplicate"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   413
+                       onclick="checkForMiddleClick(this, event);"
343
f467ac3aff09 sync KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 340
diff changeset
   414
+                       tooltip="forward-button-tooltip"/>
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   415
+        <dummyobservertarget hidden="true"
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   416
+                             onbroadcast="if (this.getAttribute('disabled') == 'true')
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   417
+                                            this.parentNode.setAttribute('forwarddisabled', 'true');
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   418
+                                          else
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   419
+                                            this.parentNode.removeAttribute('forwarddisabled');">
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   420
+          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   421
+        </dummyobservertarget>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   422
+      </toolbaritem>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   423
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   424
+      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   425
+                   title="&locationItem.title;" class="chromeclass-location" removable="true">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   426
+        <textbox id="urlbar" flex="1"
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   427
+                 placeholder="&urlbar.placeholder2;"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   428
+                 type="autocomplete"
410
0af1b0003b9f working 12.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 409
diff changeset
   429
+                 autocompletesearch="urlinline history"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   430
+                 autocompletesearchparam="enable-actions"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   431
+                 autocompletepopup="PopupAutoCompleteRichResult"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   432
+                 completeselectedindex="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   433
+                 tabscrolling="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   434
+                 showcommentcolumn="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   435
+                 showimagecolumn="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   436
+                 enablehistory="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   437
+                 maxrows="6"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   438
+                 newlines="stripsurroundingwhitespace"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   439
+                 oninput="gBrowser.userTypedValue = this.value;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   440
+                 ontextentered="this.handleCommand(param);"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   441
+                 ontextreverted="return this.handleRevert();"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   442
+                 pageproxystate="invalid"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   443
+                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   444
+                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   445
+          <box id="notification-popup-box" hidden="true" align="center">
221
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   446
+            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   447
+            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   448
+            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   449
+            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   450
+            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   451
+            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
419
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   452
+            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
   453
+            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   454
+            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   455
+            <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
596
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 595
diff changeset
   456
+            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   457
+            <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   458
+            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   459
+            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   460
+            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   461
+            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   462
+            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   463
+          </box>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   464
+          <!-- Use onclick instead of normal popup= syntax since the popup
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   465
+               code fires onmousedown, and hence eats our favicon drag events.
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   466
+               We only add the identity-box button to the tab order when the location bar
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   467
+               has focus, otherwise pressing F6 focuses it instead of the location bar -->
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   468
+          <box id="identity-box" role="button"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   469
+               align="center"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   470
+               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   471
+               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   472
+               ondragstart="gIdentityHandler.onDragStart(event);">
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   473
+            <image id="page-proxy-favicon"
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   474
+                   onclick="PageProxyClickHandler(event);"
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   475
+                   pageproxystate="invalid"/>
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   476
+            <hbox id="identity-icon-labels">
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   477
+              <label id="identity-icon-label" class="plain" flex="1"/>
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   478
+              <label id="identity-icon-country-label" class="plain"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   479
+            </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   480
+          </box>
226
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
   481
+          <box id="urlbar-display-box" align="center">
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
   482
+            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
   483
+          </box>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   484
+          <hbox id="urlbar-icons">
211
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   485
+            <image id="page-report-button"
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   486
+                   class="urlbar-icon"
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   487
+                   hidden="true"
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   488
+                   tooltiptext="&pageReportIcon.tooltip;"
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   489
+                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   490
+            <image id="star-button"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   491
+                   class="urlbar-icon"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   492
+                   onclick="BookmarkingUI.onCommand(event);"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   493
+            <image id="go-button"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   494
+                   class="urlbar-icon"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   495
+                   tooltiptext="&goEndCap.tooltip;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   496
+                   onclick="gURLBar.handleCommand(event);"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   497
+          </hbox>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   498
+          <toolbarbutton id="urlbar-go-button"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   499
+                         class="chromeclass-toolbar-additional"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   500
+                         onclick="gURLBar.handleCommand(event);"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   501
+                         tooltiptext="&goEndCap.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   502
+          <toolbarbutton id="urlbar-reload-button"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   503
+                         class="chromeclass-toolbar-additional"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   504
+                         command="Browser:ReloadOrDuplicate"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   505
+                         onclick="checkForMiddleClick(this, event);"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   506
+                         tooltiptext="&reloadButton.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   507
+          <toolbarbutton id="urlbar-stop-button"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   508
+                         class="chromeclass-toolbar-additional"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   509
+                         command="Browser:Stop"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   510
+                         tooltiptext="&stopButton.tooltip;"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   511
+        </textbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   512
+      </toolbaritem>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   513
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   514
+      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   515
+                     label="&reloadCmd.label;" removable="true"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   516
+                     command="Browser:ReloadOrDuplicate"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   517
+                     onclick="checkForMiddleClick(this, event);"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   518
+                     tooltiptext="&reloadButton.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   519
+
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   520
+      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   521
+                     label="&stopCmd.label;" removable="true"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   522
+                     command="Browser:Stop"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   523
+                     tooltiptext="&stopButton.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   524
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   525
+      <toolbaritem id="search-container" title="&searchItem.title;"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   526
+                   align="center" class="chromeclass-toolbar-additional"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   527
+                   flex="100" persist="width" removable="true">
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   528
+        <searchbar id="searchbar" flex="1"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   529
+      </toolbaritem>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   530
+
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   531
+      <toolbarbutton id="webrtc-status-button"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   532
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   533
+                     type="menu"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   534
+                     hidden="true"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   535
+                     orient="horizontal"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   536
+                     label="&webrtcIndicatorButton.label;"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   537
+                     tooltiptext="&webrtcIndicatorButton.tooltip;">
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   538
+        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   539
+                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   540
+                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   541
+      </toolbarbutton>
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   542
+
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   543
+      <toolbarbutton id="bookmarks-menu-button"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   544
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   545
+                     persist="class"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   546
+                     removable="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   547
+                     type="menu"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   548
+                     label="&bookmarksMenuButton.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   549
+                     tooltiptext="&bookmarksMenuButton.tooltip;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   550
+                     ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   551
+                     ondragover="PlacesMenuDNDHandler.onDragOver(event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   552
+                     ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   553
+                     ondrop="PlacesMenuDNDHandler.onDrop(event);">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   554
+        <menupopup id="BMB_bookmarksPopup"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   555
+                   placespopup="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   556
+                   context="placesContext"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   557
+                   openInTabs="children"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   558
+                   oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   559
+                   onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   560
+                   onpopupshowing="BookmarkingUI.onPopupShowing(event);
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   561
+                                   if (!this.parentNode._placesView)
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   562
+                                     new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   563
+                   tooltip="bhTooltip" popupsinherittooltip="true">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   564
+          <menuitem id="BMB_viewBookmarksToolbar"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   565
+                    placesanonid="view-toolbar"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   566
+                    toolbarId="PersonalToolbar"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   567
+                    type="checkbox"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   568
+                    oncommand="onViewToolbarCommand(event)"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   569
+                    label="&viewBookmarksToolbar.label;"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   570
+          <menuseparator/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   571
+          <menuitem id="BMB_bookmarksShowAll"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   572
+                    label="&showAllBookmarks2.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   573
+                    command="Browser:ShowAllBookmarks"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   574
+                    key="manBookmarkKb"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   575
+          <menuseparator/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   576
+          <menuitem id="BMB_bookmarkThisPage"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   577
+#ifndef XP_MACOSX
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   578
+                    class="menuitem-iconic"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   579
+#endif
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   580
+                    label="&bookmarkThisPageCmd.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   581
+                    command="Browser:AddBookmarkAs"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   582
+                    key="addBookmarkAsKb"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   583
+          <menuitem id="BMB_subscribeToPageMenuitem"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   584
+#ifndef XP_MACOSX
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   585
+                    class="menuitem-iconic"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   586
+#endif
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   587
+                    label="&subscribeToPageMenuitem.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   588
+                    oncommand="return FeedHandler.subscribeToFeed(null, event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   589
+                    onclick="checkForMiddleClick(this, event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   590
+                    observes="singleFeedMenuitemState"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   591
+          <menu id="BMB_subscribeToPageMenupopup"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   592
+#ifndef XP_MACOSX
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   593
+                class="menu-iconic"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   594
+#endif
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   595
+                label="&subscribeToPageMenupopup.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   596
+                observes="multipleFeedsMenuState">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   597
+            <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   598
+                       onpopupshowing="return FeedHandler.buildFeedList(event.target);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   599
+                       oncommand="return FeedHandler.subscribeToFeed(null, event);"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   600
+                       onclick="checkForMiddleClick(this, event);"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   601
+          </menu>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   602
+          <menuseparator/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   603
+          <menu id="BMB_bookmarksToolbar"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   604
+                placesanonid="toolbar-autohide"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   605
+                class="menu-iconic bookmark-item"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   606
+                label="&personalbarCmd.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   607
+                container="true">
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   608
+            <menupopup id="BMB_bookmarksToolbarPopup"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   609
+                       placespopup="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   610
+                       context="placesContext"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   611
+                       onpopupshowing="if (!this.parentNode._placesView)
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   612
+                                         new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   613
+          </menu>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   614
+          <menuseparator/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   615
+          <!-- Bookmarks menu items -->
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   616
+          <menuseparator builder="end"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   617
+                         class="hide-if-empty-places-result"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   618
+          <menuitem id="BMB_unsortedBookmarks"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   619
+                    label="&bookmarksMenuButton.unsorted.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   620
+                    oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   621
+                    class="menuitem-iconic"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   622
+        </menupopup>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   623
+      </toolbarbutton>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   624
+
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   625
+      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   626
+                     persist="class" removable="true"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   627
+                     label="&homeButton.label;"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   628
+                     ondragover="homeButtonObserver.onDragOver(event)"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   629
+                     ondragenter="homeButtonObserver.onDragOver(event)"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   630
+                     ondrop="homeButtonObserver.onDrop(event)"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   631
+                     ondragexit="homeButtonObserver.onDragExit(event)"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   632
+                     onclick="BrowserGoHome(event);"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   633
+                     aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   634
+
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   635
+      <toolbarbutton id="social-share-button"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   636
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   637
+                     hidden="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   638
+                     label="&sharePageCmd.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   639
+                     tooltiptext="&sharePageCmd.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   640
+                     command="Social:SharePage"/>
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   641
+
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   642
+      <toolbaritem id="social-toolbar-item"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   643
+                   class="chromeclass-toolbar-additional"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   644
+                   removable="false"
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
   645
+                   title="&socialToolbar.title;"
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   646
+                   hidden="true"
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   647
+                   skipintoolbarset="true"
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   648
+                   observes="socialActiveBroadcaster">
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   649
+        <toolbarbutton id="social-notification-icon" class="default-notification-icon toolbarbutton-1 notification-anchor-icon"
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   650
+                   oncommand="PopupNotifications._reshowNotifications(this,
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   651
+                                document.getElementById('social-sidebar-browser'));"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   652
+        <toolbarbutton id="social-provider-button"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   653
+                       class="toolbarbutton-1"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   654
+                       type="menu">
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   655
+          <menupopup id="social-statusarea-popup">
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   656
+            <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   657
+                      observes="socialBroadcaster_userDetails"
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   658
+                      oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   659
+              <image class="social-statusarea-user-portrait"
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   660
+                     observes="socialBroadcaster_userDetails"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   661
+              <vbox>
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   662
+                <label class="social-statusarea-loggedInStatus"
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   663
+                       observes="socialBroadcaster_userDetails"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   664
+              </vbox>
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   665
+            </menuitem>
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   666
+#ifndef XP_WIN
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   667
+            <menuseparator class="social-statusarea-separator"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   668
+#endif
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   669
+            <menuitem class="social-toggle-sidebar-menuitem"
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   670
+                      type="checkbox"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   671
+                      autocheck="false"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   672
+                      command="Social:ToggleSidebar"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   673
+                      label="&social.toggleSidebar.label;"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   674
+                      accesskey="&social.toggleSidebar.accesskey;"/>
606
9d39369e1b4c FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 596
diff changeset
   675
+            <menuitem class="social-toggle-notifications-menuitem"
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   676
+                      type="checkbox"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   677
+                      autocheck="false"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   678
+                      command="Social:ToggleNotifications"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   679
+                      label="&social.toggleNotifications.label;"
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   680
+                      accesskey="&social.toggleNotifications.accesskey;"/>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   681
+            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   682
+            <menuseparator/>
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   683
+            <menuseparator class="social-provider-menu" hidden="true"/>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   684
+            <menuitem class="social-addons-menuitem" command="Social:Addons"
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   685
+                      label="&social.addons.label;"/>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   686
+            <menuitem label="&social.learnMore.label;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   687
+                      accesskey="&social.learnMore.accesskey;"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   688
+                      oncommand="SocialUI.showLearnMore();"/>
571
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   689
+          </menupopup>
cd2592a5c15d updated browser-kde.xul (fixing KDE issue)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 568
diff changeset
   690
+        </toolbarbutton>
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   691
+        <toolbarbutton id="social-mark-button"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   692
+                       class="toolbarbutton-1"
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   693
+                       hidden="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   694
+                       disabled="true"
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
   695
+                       command="Social:TogglePageMark"/>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   696
+      </toolbaritem>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   697
+
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   698
+      <hbox id="window-controls" hidden="true" pack="end">
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   699
+        <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
   700
+                       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
   701
+                       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
   702
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   703
+        <toolbarbutton id="restore-button"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   704
+                       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
   705
+                       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
   706
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   707
+        <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
   708
+                       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
   709
+                       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
   710
+      </hbox>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   711
+    </toolbar>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   712
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   713
+    <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
   714
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   715
+    <toolbar id="PersonalToolbar"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   716
+             mode="icons" iconsize="small" defaulticonsize="small"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   717
+             lockiconsize="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   718
+             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
   719
+             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
   720
+             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
   721
+             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
   722
+             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
   723
+             customizable="true">
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   724
+      <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   725
+                   removable="true">
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   726
+        <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
   727
+              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
   728
+              context="placesContext"
226
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
   729
+              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
   730
+              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
   731
+              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
   732
+              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
   733
+          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   734
+                         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
   735
+                         label="&bookmarksToolbarItem.label;"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   736
+          <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
   737
+            <hbox align="center">
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   738
+              <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
   739
+                     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
   740
+                     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
   741
+            </hbox>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   742
+            <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
   743
+                       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
   744
+                       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
   745
+            <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
   746
+                           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
   747
+                           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
   748
+                           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
   749
+                           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
   750
+                           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
   751
+                           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
   752
+                                                   ._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
   753
+              <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
   754
+                         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
   755
+                         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
   756
+                         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
   757
+            </toolbarbutton>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   758
+          </hbox>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   759
+        </hbox>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   760
+      </toolbaritem>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   761
+    </toolbar>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   762
+
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   763
+#ifdef MENUBAR_CAN_AUTOHIDE
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   764
+#ifndef CAN_DRAW_IN_TITLEBAR
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   765
+#define APPMENU_ON_TABBAR
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   766
+#endif
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   767
+#endif
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   768
+
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   769
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   770
+    <toolbar id="TabsToolbar"
272
adc2b9141ad5 update for mozilla-beta repo (FIREFOX_5_0b2_RELEASE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 251
diff changeset
   771
+             class="toolbar-primary"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   772
+             fullscreentoolbar="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   773
+             customizable="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   774
+             mode="icons" lockmode="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   775
+             iconsize="small" defaulticonsize="small" lockiconsize="true"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   776
+             aria-label="&tabsToolbar.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   777
+             context="toolbar-context-menu"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   778
+#ifdef APPMENU_ON_TABBAR
221
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   779
+             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   780
+#else
221
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   781
+             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   782
+#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
   783
+             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
   784
+
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   785
+#ifdef APPMENU_ON_TABBAR
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   786
+      <toolbarbutton id="appmenu-toolbar-button"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   787
+                     class="chromeclass-toolbar-additional"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   788
+                     type="menu"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   789
+                     label="&brandShortName;"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   790
+                     tooltiptext="&appMenuButton.tooltip;">
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   791
+#include browser-appmenu.inc
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   792
+      </toolbarbutton>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   793
+#endif
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   794
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   795
+      <tabs id="tabbrowser-tabs"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   796
+            class="tabbrowser-tabs"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   797
+            tabbrowser="content"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   798
+            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
   799
+            setfocus="false"
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   800
+            tooltip="tabbrowser-tab-tooltip"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   801
+            stopwatchid="FX_TAB_CLICK_MS">
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   802
+        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   803
+      </tabs>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   804
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   805
+      <toolbarbutton id="new-tab-button"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   806
+                     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
   807
+                     label="&tabCmd.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   808
+                     command="cmd_newNavigatorTab"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   809
+                     onclick="checkForMiddleClick(this, event);"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   810
+                     tooltiptext="&newTabButton.tooltip;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   811
+                     ondrop="newTabButtonObserver.onDrop(event)"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   812
+                     ondragover="newTabButtonObserver.onDragOver(event)"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   813
+                     ondragenter="newTabButtonObserver.onDragOver(event)"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   814
+                     ondragexit="newTabButtonObserver.onDragExit(event)"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   815
+                     removable="true"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   816
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   817
+      <toolbarbutton id="alltabs-button"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   818
+                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   819
+                     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
   820
+                     label="&listAllTabs.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   821
+                     tooltiptext="&listAllTabs.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   822
+                     removable="true">
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   823
+        <menupopup id="alltabs-popup"
229
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   824
+                   position="after_end">
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   825
+          <menuitem id="menu_tabview"
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   826
+                    class="menuitem-iconic"
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   827
+                    key="key_tabview"
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   828
+                    label="&viewTabGroups.label;"
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   829
+                    command="Browser:ToggleTabView"
291
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
   830
+                    observes="tabviewGroupsNumber"/>
e335e83ee4aa update to 6.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
   831
+          <menuseparator id="alltabs-popup-separator"/>
229
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
   832
+        </menupopup>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   833
+      </toolbarbutton>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   834
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   835
+      <toolbarbutton id="tabs-closebutton"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   836
+                     class="close-button tabs-closebutton"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   837
+                     command="cmd_close"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   838
+                     label="&closeTab.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   839
+                     tooltiptext="&closeTab.label;"/>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   840
+
211
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   841
+#ifdef CAN_DRAW_IN_TITLEBAR
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   842
+      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   843
+      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
aef7c16cb0e5 refresh browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 205
diff changeset
   844
+#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
   845
+    </toolbar>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   846
+
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   847
+    <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
   848
+
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   849
+# 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
   850
+# 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
   851
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   852
+      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   853
+                     label="&printButton.label;" command="cmd_print"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   854
+                     tooltiptext="&printButton.tooltip;"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   855
+
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
   856
+      <!-- This is a placeholder for the Downloads Indicator.  It is visible
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   857
+           during the customization of the toolbar, in the palette, and before
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   858
+           the Downloads Indicator overlay is loaded. -->
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   859
+      <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   860
+                     oncommand="DownloadsIndicatorView.onCommand(event);"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   861
+                     ondrop="DownloadsIndicatorView.onDrop(event);"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   862
+                     ondragover="DownloadsIndicatorView.onDragOver(event);"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   863
+                     ondragenter="DownloadsIndicatorView.onDragOver(event);"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   864
+                     label="&downloads.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   865
+                     tooltiptext="&downloads.tooltip;"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   866
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   867
+      <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   868
+                     observes="viewHistorySidebar" label="&historyButton.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   869
+                     tooltiptext="&historyButton.tooltip;"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   870
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   871
+      <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   872
+                     observes="viewBookmarksSidebar"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   873
+                     tooltiptext="&bookmarksButton.tooltip;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   874
+                     ondrop="bookmarksButtonObserver.onDrop(event)"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   875
+                     ondragover="bookmarksButtonObserver.onDragOver(event)"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   876
+                     ondragenter="bookmarksButtonObserver.onDragOver(event)"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   877
+                     ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   878
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   879
+      <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
   880
+                     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
   881
+                     command="key_newNavigator"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   882
+                     tooltiptext="&newWindowButton.tooltip;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   883
+                     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
   884
+                     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
   885
+                     ondragenter="newWindowButtonObserver.onDragOver(event)"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   886
+                     ondragexit="newWindowButtonObserver.onDragExit(event)"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   887
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   888
+      <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
   889
+                     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
   890
+                     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
   891
+                     label="&fullScreenCmd.label;"
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   892
+                     tooltiptext="&fullScreenButton.tooltip;"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   893
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   894
+      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   895
+                   title="&zoomControls.label;">
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   896
+        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   897
+                       label="&fullZoomReduceCmd.label;"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   898
+                       command="cmd_fullZoomReduce"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   899
+                       tooltiptext="&zoomOutButton.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   900
+        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   901
+                       label="&fullZoomEnlargeCmd.label;"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   902
+                       command="cmd_fullZoomEnlarge"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   903
+                       tooltiptext="&zoomInButton.tooltip;"/>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
   904
+      </toolbaritem>
419
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   905
+
193
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   906
+      <toolbarbutton id="feed-button"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   907
+                     type="menu"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   908
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   909
+                     disabled="true"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   910
+                     label="&feedButton.label;"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   911
+                     tooltiptext="&feedButton.tooltip;"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   912
+                     onclick="return FeedHandler.onFeedButtonClick(event);">
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   913
+        <menupopup position="after_end"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   914
+                   id="feed-menu"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   915
+                   onpopupshowing="return FeedHandler.buildFeedList(this);"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   916
+                   oncommand="return FeedHandler.subscribeToFeed(null, event);"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   917
+                   onclick="checkForMiddleClick(this, event);"/>
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
   918
+      </toolbarbutton>
221
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   919
+
419
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   920
+      <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   921
+                     label="&cutCmd.label;"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   922
+                     command="cmd_cut"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   923
+                     tooltiptext="&cutButton.tooltip;"/>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   924
+
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   925
+      <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   926
+                     label="&copyCmd.label;"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   927
+                     command="cmd_copy"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   928
+                     tooltiptext="&copyButton.tooltip;"/>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   929
+
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   930
+      <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   931
+                     label="&pasteCmd.label;"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   932
+                     command="cmd_paste"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   933
+                     tooltiptext="&pasteButton.tooltip;"/>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   934
+
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   935
+#ifdef MOZ_SERVICES_SYNC
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   936
+      <toolbarbutton id="sync-button"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   937
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   938
+                     label="&syncToolbarButton.label;"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   939
+                     oncommand="gSyncUI.handleToolbarButton()"/>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   940
+#endif
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   941
+
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   942
+      <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   943
+                   mousethrough="always">
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   944
+        <image/>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   945
+      </toolbaritem>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 410
diff changeset
   946
+
221
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   947
+      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   948
+                     label="&tabGroupsButton.label;"
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   949
+                     command="Browser:ToggleTabView"
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   950
+                     tooltiptext="&tabGroupsButton.tooltip;"
488440b896fe fixed testpilot packaging
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 211
diff changeset
   951
+                     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
   952
+    </toolbarpalette>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   953
+  </toolbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   954
+
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   955
+  <hbox id="fullscr-toggler" collapsed="true"/>
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
   956
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   957
+  <hbox flex="1" id="browser">
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   958
+    <vbox id="browser-border-start" hidden="true" layer="true"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   959
+    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   960
+      <sidebarheader id="sidebar-header" align="center">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   961
+        <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   962
+        <image id="sidebar-throbber"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   963
+        <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   964
+      </sidebarheader>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   965
+      <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   966
+                style="min-width: 14em; width: 18em; max-width: 36em;"/>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   967
+    </vbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   968
+
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   969
+    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   970
+    <vbox id="appcontent" flex="1">
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   971
+      <tabbrowser id="content" disablehistory="true"
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   972
+                  flex="1" contenttooltip="aHTMLTooltip"
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
   973
+                  tabcontainer="tabbrowser-tabs"
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   974
+                  contentcontextmenu="contentAreaContextMenu"
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   975
+                  autocompletepopup="PopupAutoComplete"/>
588
dcdf243fea81 update browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 575
diff changeset
   976
+      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
356
30a00f382aed version 9.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 343
diff changeset
   977
+      <statuspanel id="statusbar-display" inactive="true"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   978
+    </vbox>
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   979
+    <splitter id="social-sidebar-splitter"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   980
+              class="chromeclass-extrachrome sidebar-splitter"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   981
+              observes="socialSidebarBroadcaster"/>
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   982
+    <vbox id="social-sidebar-box"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   983
+          class="chromeclass-extrachrome"
575
d28dbaf20075 merge browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 571
diff changeset
   984
+          observes="socialSidebarBroadcaster"
d28dbaf20075 merge browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 571
diff changeset
   985
+          persist="width">
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   986
+      <browser id="social-sidebar-browser"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   987
+               type="content"
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
   988
+               context="contentAreaContextMenu"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   989
+               disableglobalhistory="true"
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
   990
+               tooltip="aHTMLTooltip"
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
   991
+               popupnotificationanchor="social-notification-icon"
541
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   992
+               flex="1"
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   993
+               style="min-width: 14em; width: 18em; max-width: 36em;"/>
830e50bbfc79 working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 522
diff changeset
   994
+    </vbox>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
   995
+    <vbox id="browser-border-end" hidden="true" layer="true"/>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   996
+  </hbox>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
   997
+
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
   998
+  <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
   999
+    <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
  1000
+      <vbox id="full-screen-warning-message" align="center">
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1001
+        <description id="full-screen-domain-text"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1002
+        <description class="full-screen-description" value="&fullscreenExitHint.value;"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1003
+        <vbox id="full-screen-approval-pane" align="center">
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1004
+          <description class="full-screen-description" value="&fullscreenApproval.value;"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1005
+          <hbox>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1006
+            <button label="&fullscreenAllowButton.label;"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1007
+                    oncommand="FullScreen.setFullscreenAllowed(true);"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1008
+                    class="full-screen-approval-button"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1009
+            <button label="&fullscreenExitButton.label;"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1010
+                    oncommand="FullScreen.setFullscreenAllowed(false);"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1011
+                    class="full-screen-approval-button"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1012
+          </hbox>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1013
+          <checkbox id="full-screen-remember-decision"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1014
+        </vbox>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1015
+      </vbox>
367
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
  1016
+    </hbox>
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
  1017
+  </hbox>
3fabd9f66322 begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 356
diff changeset
  1018
+
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1019
+  <vbox id="browser-bottombox" layer="true">
637
73640b76d6c3 first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 612
diff changeset
  1020
+    <notificationbox id="global-notificationbox"/>
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1021
+    <toolbar id="developer-toolbar"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1022
+             class="devtools-toolbar"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1023
+             hidden="true">
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1024
+#ifdef XP_MACOSX
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1025
+          <toolbarbutton id="developer-toolbar-closebutton"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1026
+                         class="devtools-closebutton"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1027
+                         oncommand="DeveloperToolbar.hide();"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1028
+                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1029
+#endif
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1030
+          <stack class="gclitoolbar-stack-node" flex="1">
662
775530ba0729 rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 659
diff changeset
  1031
+            <textbox class="gclitoolbar-input-node" rows="1"/>
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1032
+            <hbox class="gclitoolbar-complete-node"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1033
+          </stack>
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
  1034
+          <toolbarbutton id="developer-toolbar-toolbox-button"
515
0f6539389500 Aurora 16 uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 491
diff changeset
  1035
+                         class="developer-toolbar-button"
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
  1036
+                         observes="devtoolsMenuBroadcaster_DevToolbox"
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
  1037
+                         tooltiptext="&devToolbarToolsButton.tooltip;"/>
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1038
+#ifndef XP_MACOSX
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1039
+          <toolbarbutton id="developer-toolbar-closebutton"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1040
+                         class="devtools-closebutton"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1041
+                         oncommand="DeveloperToolbar.hide();"
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1042
+                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1043
+#endif
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1044
+   </toolbar>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1045
+
193
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
  1046
+    <toolbar id="addon-bar"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
  1047
+             toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
c6b8ff4f191a sync browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 180
diff changeset
  1048
+             collapsed="true"
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1049
+             class="toolbar-primary chromeclass-toolbar"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1050
+             context="toolbar-context-menu" toolboxid="navigator-toolbox"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1051
+             mode="icons" iconsize="small" defaulticonsize="small"
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1052
+             lockiconsize="true"
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1053
+             defaultset="addonbar-closebutton,spring,status-bar"
226
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
  1054
+             customizable="true"
6bf3bb4c115e update for 2.0b11/4.0b11
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 223
diff changeset
  1055
+             key="key_toggleAddonBar">
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1056
+      <toolbarbutton id="addonbar-closebutton"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1057
+                     tooltiptext="&addonBarCloseButton.tooltip;"
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1058
+                     oncommand="setToolbarVisibility(this.parentNode, false);"/>
229
298263f797be update to 2.0b12/4.0b12
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 226
diff changeset
  1059
+      <statusbar id="status-bar" ordinal="1000"/>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1060
+    </toolbar>
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1061
+  </vbox>
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1062
+
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
  1063
+#ifndef XP_UNIX
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
  1064
+  <svg:svg height="0">
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1065
+    <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1066
+      <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1067
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1068
+    <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1069
+      <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1070
+    </svg:clipPath>
127
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
  1071
+  </svg:svg>
4c86470ed796 Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 64
diff changeset
  1072
+#endif
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1073
+#ifdef XP_MACOSX
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1074
+  <svg:svg height="0">
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1075
+    <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1076
+      <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1077
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1078
+    <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1079
+      <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1080
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1081
+    <svg:clipPath id="osx-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1082
+      <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1083
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1084
+    <svg:clipPath id="osx-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1085
+      <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1086
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1087
+    <svg:clipPath id="osx-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1088
+      <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1089
+    </svg:clipPath>
650
e8c83b144fd1 22.0b4 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 642
diff changeset
  1090
+    <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
479
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1091
+      <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
56e16f4cce54 fix KDE's browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
  1092
+    </svg:clipPath>
205
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1093
+  </svg:svg>
71411f8585cd fixed browser-kde.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 193
diff changeset
  1094
+#endif
178
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1095
+
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1096
+</vbox>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1097
+# <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
  1098
+#     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
  1099
+#     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
  1100
+</deck>
77b00e921973 Synchronized browser-kde.xul with browser.xul
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 164
diff changeset
  1101
+
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1102
+</window>
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1103
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
  1104
--- a/browser/base/jar.mn
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1105
+++ b/browser/base/jar.mn
653
38c67b6b2f37 Aurora 23 (20130616)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 650
diff changeset
  1106
@@ -53,16 +53,18 @@ browser.jar:
612
3006d73ad2fa move on to Aurora 20
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 609
diff changeset
  1107
         content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
568
2c74c5927ea2 first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 548
diff changeset
  1108
 #endif
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1109
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1110
         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
  1111
         content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
9
bc5dfe5b853a Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
  1112
 *       content/browser/browser.css                   (content/browser.css)