equal
deleted
inserted
replaced
21 |
21 |
22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
23 new file mode 100644 |
23 new file mode 100644 |
24 --- /dev/null |
24 --- /dev/null |
25 +++ b/browser/base/content/browser-kde.xul |
25 +++ b/browser/base/content/browser-kde.xul |
26 @@ -0,0 +1,1042 @@ |
26 @@ -0,0 +1,1058 @@ |
27 +#filter substitution |
27 +#filter substitution |
28 +<?xml version="1.0"?> |
28 +<?xml version="1.0"?> |
29 +# -*- Mode: HTML -*- |
29 +# -*- Mode: HTML -*- |
30 +# |
30 +# |
31 +# ***** BEGIN LICENSE BLOCK ***** |
31 +# ***** BEGIN LICENSE BLOCK ***** |
327 + label="&viewCustomizeToolbar.label;" |
327 + label="&viewCustomizeToolbar.label;" |
328 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
328 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
329 + </menupopup> |
329 + </menupopup> |
330 + |
330 + |
331 + <menupopup id="blockedPopupOptions" |
331 + <menupopup id="blockedPopupOptions" |
332 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
332 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);" |
|
333 + onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);"> |
333 + <menuitem observes="blockedPopupAllowSite"/> |
334 + <menuitem observes="blockedPopupAllowSite"/> |
334 + <menuitem observes="blockedPopupEditSettings"/> |
335 + <menuitem observes="blockedPopupEditSettings"/> |
335 + <menuitem observes="blockedPopupDontShowMessage"/> |
336 + <menuitem observes="blockedPopupDontShowMessage"/> |
336 + <menuseparator observes="blockedPopupsSeparator"/> |
337 + <menuseparator observes="blockedPopupsSeparator"/> |
337 + </menupopup> |
338 + </menupopup> |
396 + </vbox> |
397 + </vbox> |
397 + <description id="identity-popup-encryption-label" flex="1" |
398 + <description id="identity-popup-encryption-label" flex="1" |
398 + class="identity-popup-description"/> |
399 + class="identity-popup-description"/> |
399 + </hbox> |
400 + </hbox> |
400 + <!-- Footer button to open security page info --> |
401 + <!-- Footer button to open security page info --> |
401 + <hbox pack="end"> |
402 + <hbox id="identity-popup-button-container" pack="end"> |
402 + <button id="identity-popup-more-info-button" |
403 + <button id="identity-popup-more-info-button" |
403 + label="&identity.moreInfoLinkText;" |
404 + label="&identity.moreInfoLinkText;" |
404 + onblur="gIdentityHandler.hideIdentityPopup();" |
405 + onblur="gIdentityHandler.hideIdentityPopup();" |
405 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
406 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
406 + </hbox> |
407 + </hbox> |
508 + <toolbaritem id="menubar-items" align="center"> |
509 + <toolbaritem id="menubar-items" align="center"> |
509 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by |
510 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by |
510 +# hiddenWindow.xul. |
511 +# hiddenWindow.xul. |
511 +#include browser-menubar.inc |
512 +#include browser-menubar.inc |
512 + </toolbaritem> |
513 + </toolbaritem> |
|
514 + |
|
515 +#ifdef CAN_DRAW_IN_TITLEBAR |
|
516 + <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> |
|
517 + <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> |
|
518 +#endif |
513 + </toolbar> |
519 + </toolbar> |
514 + |
520 + |
515 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
521 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
516 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
522 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
517 + fullscreentoolbar="true" mode="icons" customizable="true" |
523 + fullscreentoolbar="true" mode="icons" customizable="true" |
590 + </hbox> |
596 + </hbox> |
591 + </hbox> |
597 + </hbox> |
592 + </box> |
598 + </box> |
593 + <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
599 + <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> |
594 + <hbox id="urlbar-icons"> |
600 + <hbox id="urlbar-icons"> |
|
601 + <image id="page-report-button" |
|
602 + class="urlbar-icon" |
|
603 + hidden="true" |
|
604 + tooltiptext="&pageReportIcon.tooltip;" |
|
605 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
|
606 + |
595 + <image id="star-button" |
607 + <image id="star-button" |
596 + class="urlbar-icon" |
608 + class="urlbar-icon" |
597 + onclick="PlacesStarButton.onClick(event);"/> |
609 + onclick="PlacesStarButton.onClick(event);"/> |
598 + <image id="go-button" |
610 + <image id="go-button" |
599 + class="urlbar-icon" |
611 + class="urlbar-icon" |
867 + class="close-button tabs-closebutton" |
879 + class="close-button tabs-closebutton" |
868 + command="cmd_close" |
880 + command="cmd_close" |
869 + label="&closeTab.label;" |
881 + label="&closeTab.label;" |
870 + tooltiptext="&closeTab.label;"/> |
882 + tooltiptext="&closeTab.label;"/> |
871 + |
883 + |
|
884 +#ifdef CAN_DRAW_IN_TITLEBAR |
|
885 + <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> |
|
886 + <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> |
|
887 +#endif |
872 + </toolbar> |
888 + </toolbar> |
873 + |
889 + |
874 + <toolbarpalette id="BrowserToolbarPalette"> |
890 + <toolbarpalette id="BrowserToolbarPalette"> |
875 + |
891 + |
876 +# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding |
892 +# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding |
1541 + |
1557 + |
1542 +#endif // nsunixshellservice_h____ |
1558 +#endif // nsunixshellservice_h____ |
1543 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1559 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1544 --- a/browser/installer/package-manifest.in |
1560 --- a/browser/installer/package-manifest.in |
1545 +++ b/browser/installer/package-manifest.in |
1561 +++ b/browser/installer/package-manifest.in |
1546 @@ -441,16 +441,17 @@ |
1562 @@ -442,16 +442,17 @@ |
1547 #endif |
1563 #endif |
1548 #endif |
1564 #endif |
1549 |
1565 |
1550 ; [Default Preferences] |
1566 ; [Default Preferences] |
1551 ; All the pref files must be part of base to prevent migration bugs |
1567 ; All the pref files must be part of base to prevent migration bugs |