1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 4311c6bdf61ac317bc60b25cd89ff67662a75049 |
2 # Parent 07e419c2bbc63c486d25fd8ce117abd10e9ebdba |
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,1160 @@ |
8 @@ -0,0 +1,1174 @@ |
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 |
146 + |
146 + |
147 + <!-- for search with one-off buttons --> |
147 + <!-- for search with one-off buttons --> |
148 + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
148 + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
149 + |
149 + |
150 + <!-- for url bar autocomplete --> |
150 + <!-- for url bar autocomplete --> |
151 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"> |
151 + <panel type="autocomplete-richlistbox" |
|
152 + id="PopupAutoCompleteRichResult" |
|
153 + noautofocus="true" |
|
154 + hidden="true" |
|
155 + flip="none" |
|
156 + level="parent"> |
152 +#ifdef NIGHTLY_BUILD |
157 +#ifdef NIGHTLY_BUILD |
153 + <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end"> |
158 + <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end"> |
154 + <button id="urlbar-search-settings" label="&changeSearchSettings.button;" |
159 + <button id="urlbar-search-settings" label="&changeSearchSettings.button;" |
155 + oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/> |
160 + oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/> |
156 + </hbox> |
161 + </hbox> |
226 + noautohide="true" |
230 + noautohide="true" |
227 + align="start" |
231 + align="start" |
228 + orient="vertical" |
232 + orient="vertical" |
229 + role="alert"> |
233 + role="alert"> |
230 + <vbox> |
234 + <vbox> |
231 + <hbox pack="end"> |
|
232 + <toolbarbutton id="UITourTooltipClose" class="close-icon" |
|
233 + tooltiptext="&uiTour.infoPanel.close;"/> |
|
234 + </hbox> |
|
235 + <hbox id="UITourTooltipBody"> |
235 + <hbox id="UITourTooltipBody"> |
236 + <vbox id="UITourTooltipIconContainer"> |
236 + <image id="UITourTooltipIcon"/> |
237 + <image id="UITourTooltipIcon"/> |
|
238 + </vbox> |
|
239 + <vbox flex="1"> |
237 + <vbox flex="1"> |
240 + <label id="UITourTooltipTitle" flex="1"/> |
238 + <hbox id="UITourTooltipTitleContainer"> |
|
239 + <label id="UITourTooltipTitle" flex="1"/> |
|
240 + <toolbarbutton id="UITourTooltipClose" class="close-icon" |
|
241 + tooltiptext="&uiTour.infoPanel.close;"/> |
|
242 + </hbox> |
241 + <description id="UITourTooltipDescription" flex="1"/> |
243 + <description id="UITourTooltipDescription" flex="1"/> |
242 + </vbox> |
244 + </vbox> |
243 + </hbox> |
245 + </hbox> |
244 + <hbox id="UITourTooltipButtons" flex="1" align="center"/> |
246 + <hbox id="UITourTooltipButtons" flex="1" align="center"/> |
245 + </vbox> |
247 + </vbox> |
467 + |
469 + |
468 + <tooltip id="dynamic-shortcut-tooltip" |
470 + <tooltip id="dynamic-shortcut-tooltip" |
469 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
471 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
470 + |
472 + |
471 + <menupopup id="SyncedTabsSidebarContext"> |
473 + <menupopup id="SyncedTabsSidebarContext"> |
472 + <menuitem label="&syncedTabs.context.openTab.label;" |
474 + <menuitem label="&syncedTabs.context.open.label;" |
473 + accesskey="&syncedTabs.context.openTab.accesskey;" |
475 + accesskey="&syncedTabs.context.open.accesskey;" |
474 + id="syncedTabsOpenSelected"/> |
476 + id="syncedTabsOpenSelected" where="current"/> |
|
477 + <menuitem label="&syncedTabs.context.openInNewTab.label;" |
|
478 + accesskey="&syncedTabs.context.openInNewTab.accesskey;" |
|
479 + id="syncedTabsOpenSelectedInTab" where="tab"/> |
|
480 + <menuitem label="&syncedTabs.context.openInNewWindow.label;" |
|
481 + accesskey="&syncedTabs.context.openInNewWindow.accesskey;" |
|
482 + id="syncedTabsOpenSelectedInWindow" where="window"/> |
|
483 + <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;" |
|
484 + accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;" |
|
485 + id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/> |
|
486 + <menuseparator/> |
475 + <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;" |
487 + <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;" |
476 + accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;" |
488 + accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;" |
477 + id="syncedTabsBookmarkSelected"/> |
489 + id="syncedTabsBookmarkSelected"/> |
|
490 + <menuitem label="&syncedTabs.context.copy.label;" |
|
491 + accesskey="&syncedTabs.context.copy.accesskey;" |
|
492 + id="syncedTabsCopySelected"/> |
478 + <menuseparator/> |
493 + <menuseparator/> |
479 + <menuitem label="&syncSyncNowItem.label;" |
494 + <menuitem label="&syncSyncNowItem.label;" |
480 + accesskey="&syncSyncNowItem.accesskey;" |
495 + accesskey="&syncSyncNowItem.accesskey;" |
481 + id="syncedTabsRefresh"/> |
496 + id="syncedTabsRefresh"/> |
482 + </menupopup> |
497 + </menupopup> |
682 + tooltip="forward-button-tooltip" |
697 + tooltip="forward-button-tooltip" |
683 + context="backForwardMenu"/> |
698 + context="backForwardMenu"/> |
684 + <textbox id="urlbar" flex="1" |
699 + <textbox id="urlbar" flex="1" |
685 + placeholder="&urlbar.placeholder2;" |
700 + placeholder="&urlbar.placeholder2;" |
686 + type="autocomplete" |
701 + type="autocomplete" |
687 + autocompletesearch="urlinline history" |
702 + autocompletesearch="unifiedcomplete" |
688 + autocompletesearchparam="enable-actions" |
703 + autocompletesearchparam="enable-actions" |
689 + autocompletepopup="PopupAutoCompleteRichResult" |
704 + autocompletepopup="PopupAutoCompleteRichResult" |
690 + completeselectedindex="true" |
705 + completeselectedindex="true" |
691 + shrinkdelay="250" |
706 + shrinkdelay="250" |
692 + tabscrolling="true" |
707 + tabscrolling="true" |
693 + showcommentcolumn="true" |
708 + showcommentcolumn="true" |
694 + showimagecolumn="true" |
709 + showimagecolumn="true" |
695 + enablehistory="true" |
710 + enablehistory="true" |
696 + maxrows="6" |
711 + maxrows="10" |
697 + newlines="stripsurroundingwhitespace" |
712 + newlines="stripsurroundingwhitespace" |
698 + ontextentered="this.handleCommand(param);" |
713 + ontextentered="this.handleCommand(param);" |
699 + ontextreverted="return this.handleRevert();" |
714 + ontextreverted="return this.handleRevert();" |
700 + pageproxystate="invalid" |
715 + pageproxystate="invalid" |
701 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
716 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
711 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
726 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
712 + <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button" |
727 + <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button" |
713 + aria-label="&urlbar.loginFillNotificationAnchor.label;"/> |
728 + aria-label="&urlbar.loginFillNotificationAnchor.label;"/> |
714 + <image id="password-notification-icon" class="notification-anchor-icon" role="button" |
729 + <image id="password-notification-icon" class="notification-anchor-icon" role="button" |
715 + aria-label="&urlbar.passwordNotificationAnchor.label;"/> |
730 + aria-label="&urlbar.passwordNotificationAnchor.label;"/> |
716 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button" |
|
717 + aria-label="&urlbar.webappsNotificationAnchor.label;"/> |
|
718 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button" |
731 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button" |
719 + aria-label="&urlbar.pluginsNotificationAnchor.label;"/> |
732 + aria-label="&urlbar.pluginsNotificationAnchor.label;"/> |
720 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button" |
733 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button" |
721 + aria-label="&urlbar.webNotsNotificationAnchor3.label;"/> |
734 + aria-label="&urlbar.webNotsNotificationAnchor3.label;"/> |
722 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button" |
735 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button" |
863 + <!-- Bookmarks toolbar items --> |
876 + <!-- Bookmarks toolbar items --> |
864 + </menupopup> |
877 + </menupopup> |
865 + </menu> |
878 + </menu> |
866 + <menu id="BMB_unsortedBookmarks" |
879 + <menu id="BMB_unsortedBookmarks" |
867 + class="menu-iconic bookmark-item subviewbutton" |
880 + class="menu-iconic bookmark-item subviewbutton" |
868 + label="&bookmarksMenuButton.unsorted.label;" |
881 + label="&bookmarksMenuButton.other.label;" |
869 + container="true"> |
882 + container="true"> |
870 + <menupopup id="BMB_unsortedBookmarksPopup" |
883 + <menupopup id="BMB_unsortedBookmarksPopup" |
871 + placespopup="true" |
884 + placespopup="true" |
872 + context="placesContext" |
885 + context="placesContext" |
873 + onpopupshowing="if (!this.parentNode._placesView) |
886 + onpopupshowing="if (!this.parentNode._placesView) |
885 + </toolbarbutton> |
898 + </toolbarbutton> |
886 + |
899 + |
887 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
900 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
888 + during the customization of the toolbar, in the palette, and before |
901 + during the customization of the toolbar, in the palette, and before |
889 + the Downloads Indicator overlay is loaded. --> |
902 + the Downloads Indicator overlay is loaded. --> |
890 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
903 + <toolbarbutton id="downloads-button" |
|
904 + class="toolbarbutton-1 chromeclass-toolbar-additional badged-button" |
891 + key="key_openDownloads" |
905 + key="key_openDownloads" |
892 + oncommand="DownloadsIndicatorView.onCommand(event);" |
906 + oncommand="DownloadsIndicatorView.onCommand(event);" |
893 + ondrop="DownloadsIndicatorView.onDrop(event);" |
907 + ondrop="DownloadsIndicatorView.onDrop(event);" |
894 + ondragover="DownloadsIndicatorView.onDragOver(event);" |
908 + ondragover="DownloadsIndicatorView.onDragOver(event);" |
895 + ondragenter="DownloadsIndicatorView.onDragOver(event);" |
909 + ondragenter="DownloadsIndicatorView.onDragOver(event);" |
1167 + |
1181 + |
1168 +</window> |
1182 +</window> |
1169 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1183 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1170 --- a/browser/base/jar.mn |
1184 --- a/browser/base/jar.mn |
1171 +++ b/browser/base/jar.mn |
1185 +++ b/browser/base/jar.mn |
1172 @@ -71,16 +71,18 @@ browser.jar: |
1186 @@ -69,16 +69,18 @@ browser.jar: |
1173 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1187 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1174 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1188 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1175 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1189 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1176 * content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml) |
1190 * content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml) |
1177 content/browser/aboutTabGroupsMigration.js (content/aboutTabGroupsMigration.js) |
1191 content/browser/aboutTabGroupsMigration.js (content/aboutTabGroupsMigration.js) |
1183 content/browser/browser-addons.js (content/browser-addons.js) |
1197 content/browser/browser-addons.js (content/browser-addons.js) |
1184 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1198 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1185 content/browser/browser-customization.js (content/browser-customization.js) |
1199 content/browser/browser-customization.js (content/browser-customization.js) |
1186 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1200 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1187 content/browser/browser-devedition.js (content/browser-devedition.js) |
1201 content/browser/browser-devedition.js (content/browser-devedition.js) |
1188 content/browser/browser-eme.js (content/browser-eme.js) |
|
1189 content/browser/browser-feeds.js (content/browser-feeds.js) |
1202 content/browser/browser-feeds.js (content/browser-feeds.js) |
1190 content/browser/browser-fullScreen.js (content/browser-fullScreen.js) |
1203 content/browser/browser-fullScreen.js (content/browser-fullScreen.js) |
|
1204 content/browser/browser-fullZoom.js (content/browser-fullZoom.js) |
1191 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1205 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1192 --- a/browser/components/build/nsModule.cpp |
1206 --- a/browser/components/build/nsModule.cpp |
1193 +++ b/browser/components/build/nsModule.cpp |
1207 +++ b/browser/components/build/nsModule.cpp |
1194 @@ -8,17 +8,17 @@ |
1208 @@ -8,17 +8,17 @@ |
1195 #include "nsBrowserCompsCID.h" |
1209 #include "nsBrowserCompsCID.h" |
1309 ] |
1323 ] |
1310 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1324 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1311 SOURCES += [ |
1325 SOURCES += [ |
1312 'nsMacShellService.cpp', |
1326 'nsMacShellService.cpp', |
1313 ] |
1327 ] |
1314 elif CONFIG['MOZ_WIDGET_GTK']: |
1328 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
1315 SOURCES += [ |
1329 SOURCES += [ |
1316 'nsGNOMEShellService.cpp', |
1330 'nsGNOMEShellService.cpp', |
1317 + 'nsKDEShellService.cpp', |
1331 + 'nsKDEShellService.cpp', |
1318 + 'nsUnixShellService.cpp', |
1332 + 'nsUnixShellService.cpp', |
1319 ] |
1333 ] |
1320 |
1334 |
1321 if SOURCES: |
1335 if SOURCES: |
1322 FINAL_LIBRARY = 'browsercomps' |
1336 FINAL_LIBRARY = 'browsercomps' |
1323 |
1337 |
1615 + |
1629 + |
1616 +#endif // nsunixshellservice_h____ |
1630 +#endif // nsunixshellservice_h____ |
1617 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1631 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1618 --- a/browser/installer/package-manifest.in |
1632 --- a/browser/installer/package-manifest.in |
1619 +++ b/browser/installer/package-manifest.in |
1633 +++ b/browser/installer/package-manifest.in |
1620 @@ -697,16 +697,17 @@ |
1634 @@ -689,16 +689,17 @@ |
1621 @RESPATH@/greprefs.js |
1635 @RESPATH@/greprefs.js |
1622 @RESPATH@/defaults/autoconfig/prefcalls.js |
1636 @RESPATH@/defaults/autoconfig/prefcalls.js |
1623 @RESPATH@/browser/defaults/permissions |
1637 @RESPATH@/browser/defaults/permissions |
1624 |
1638 |
1625 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1639 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |