1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 1426724b00dc9de228bf0ead1facc1f8fe5d68cf |
2 # Parent 409c60c5454efb61ebecf0edc8822a0e92f563f3 |
3 |
3 |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
5 new file mode 100644 |
5 new file mode 100644 |
6 --- /dev/null |
6 --- /dev/null |
7 +++ b/browser/base/content/browser-kde.xul |
7 +++ b/browser/base/content/browser-kde.xul |
8 @@ -0,0 +1,1276 @@ |
8 @@ -0,0 +1,1288 @@ |
9 +#filter substitution |
9 +#filter substitution |
10 +<?xml version="1.0"?> |
10 +<?xml version="1.0"?> |
11 +# -*- Mode: HTML -*- |
11 +# -*- Mode: HTML -*- |
12 +# |
12 +# |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
583 + </vbox> |
583 + </vbox> |
584 + </hbox> |
584 + </hbox> |
585 + |
585 + |
586 + <tooltip id="dynamic-shortcut-tooltip" |
586 + <tooltip id="dynamic-shortcut-tooltip" |
587 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
587 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
|
588 + |
|
589 + <menupopup id="emeNotificationsPopup"> |
|
590 + <menuitem id="emeNotificationsNotNow" |
|
591 + label="Not now" |
|
592 + acceskey="N" |
|
593 + oncommand="gEMEHandler.onNotNow(this);"/> |
|
594 + <menuitem id="emeNotificationsDontAskAgain" |
|
595 + label="Don't ask me again" |
|
596 + acceskey="D" |
|
597 + oncommand="gEMEHandler.onDontAskAgain(this);"/> |
|
598 + </menupopup> |
588 + </popupset> |
599 + </popupset> |
589 + |
600 + |
590 +#ifdef CAN_DRAW_IN_TITLEBAR |
601 +#ifdef CAN_DRAW_IN_TITLEBAR |
591 +<vbox id="titlebar"> |
602 +<vbox id="titlebar"> |
592 + <hbox id="titlebar-content"> |
603 + <hbox id="titlebar-content"> |
803 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
814 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
804 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
815 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
805 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
816 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
806 + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> |
817 + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> |
807 + <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> |
818 + <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> |
|
819 + <image id="eme-notification-icon" class="notification-anchor-icon" role="button"/> |
808 + </box> |
820 + </box> |
809 + <!-- Use onclick instead of normal popup= syntax since the popup |
821 + <!-- Use onclick instead of normal popup= syntax since the popup |
810 + code fires onmousedown, and hence eats our favicon drag events. |
822 + code fires onmousedown, and hence eats our favicon drag events. |
811 + We only add the identity-box button to the tab order when the location bar |
823 + We only add the identity-box button to the tab order when the location bar |
812 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
824 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
1302 default="true" |
1314 default="true" |
1303 oncommand="StarUI.panel.hidePopup();"/> |
1315 oncommand="StarUI.panel.hidePopup();"/> |
1304 <button id="editBookmarkPanelDeleteButton" |
1316 <button id="editBookmarkPanelDeleteButton" |
1305 class="editBookmarkPanelBottomButton" |
1317 class="editBookmarkPanelBottomButton" |
1306 label="&editBookmark.cancel.label;" |
1318 label="&editBookmark.cancel.label;" |
1307 @@ -1202,17 +1202,17 @@ |
1319 @@ -1214,17 +1214,17 @@ |
1308 |
1320 |
1309 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1321 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1310 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1322 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1311 <vbox id="full-screen-warning-message" align="center"> |
1323 <vbox id="full-screen-warning-message" align="center"> |
1312 <description id="full-screen-domain-text"/> |
1324 <description id="full-screen-domain-text"/> |
1335 * content/browser/browser.css (content/browser.css) |
1347 * content/browser/browser.css (content/browser.css) |
1336 * content/browser/browser.js (content/browser.js) |
1348 * content/browser/browser.js (content/browser.js) |
1337 * content/browser/browser.xul (content/browser.xul) |
1349 * content/browser/browser.xul (content/browser.xul) |
1338 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1350 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1339 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1351 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
|
1352 * content/browser/browser-eme.properties (content/browser-eme.properties) |
1340 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1353 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1341 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1354 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1342 content/browser/content.js (content/content.js) |
1355 content/browser/content.js (content/content.js) |
1343 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1356 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1344 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1357 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1345 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1358 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1346 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1359 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1347 content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
|
1348 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1360 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1349 --- a/browser/components/build/nsModule.cpp |
1361 --- a/browser/components/build/nsModule.cpp |
1350 +++ b/browser/components/build/nsModule.cpp |
1362 +++ b/browser/components/build/nsModule.cpp |
1351 @@ -8,17 +8,17 @@ |
1363 @@ -8,17 +8,17 @@ |
1352 #include "nsBrowserCompsCID.h" |
1364 #include "nsBrowserCompsCID.h" |