152 + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
152 + <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/> |
153 + |
153 + |
154 + <!-- for url bar autocomplete --> |
154 + <!-- for url bar autocomplete --> |
155 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
155 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
156 + |
156 + |
157 + <!-- for select dropdowns --> |
157 + <!-- for select dropdowns. The menupopup is what shows the list of options, |
158 + <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/> |
158 + and the popuponly menulist makes things like the menuactive attributes |
|
159 + work correctly on the menupopup. ContentSelectDropdown expects the |
|
160 + popuponly menulist to be its immediate parent. --> |
|
161 + <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
|
162 + <menupopup rolluponmousewheel="true"/> |
|
163 + </menulist> |
159 + |
164 + |
160 + <!-- for invalid form error message --> |
165 + <!-- for invalid form error message --> |
161 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
166 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
162 + <description/> |
167 + <description/> |
163 + </panel> |
168 + </panel> |
246 + flip="none" |
251 + flip="none" |
247 + consumeoutsideclicks="false" |
252 + consumeoutsideclicks="false" |
248 + mousethrough="always"> |
253 + mousethrough="always"> |
249 + <box id="UITourHighlight"></box> |
254 + <box id="UITourHighlight"></box> |
250 + </panel> |
255 + </panel> |
251 + <!-- Used to highlight the new search experience --> |
|
252 + <panel id="SearchHighlight1" |
|
253 + class="SearchHighlight" |
|
254 + type="arrow" |
|
255 + hidden="true" |
|
256 + noautofocus="true" |
|
257 + noautohide="true" |
|
258 + orient="vertical" |
|
259 + align="stretch"> |
|
260 + <label class="SearchHighlightTitle">&SearchHighlight1.title;</label> |
|
261 + <description class="SearchHighlightText" flex="1">&SearchHighlight1.text;</description> |
|
262 + <hbox class="SearchHighlightFooter" align="center"> |
|
263 + <spacer class="dot filled"/> |
|
264 + <spacer class="dot"/> |
|
265 + <spacer flex="1"/> |
|
266 + <button label="&SearchHighlightNext;"/> |
|
267 + </hbox> |
|
268 + </panel> |
|
269 + <panel id="SearchHighlight2" |
|
270 + class="SearchHighlight" |
|
271 + type="arrow" |
|
272 + hidden="true" |
|
273 + noautofocus="true" |
|
274 + noautohide="true" |
|
275 + orient="vertical" |
|
276 + align="stretch"> |
|
277 + <label class="SearchHighlightTitle">&SearchHighlight2.title;</label> |
|
278 + <description class="SearchHighlightText" flex="1">&SearchHighlight2.text;</description> |
|
279 + <hbox class="SearchHighlightFooter" align="center"> |
|
280 + <spacer class="dot"/> |
|
281 + <spacer class="dot filled"/> |
|
282 + <spacer flex="1"/> |
|
283 + <button label="&SearchHighlightClose;"/> |
|
284 + </hbox> |
|
285 + </panel> |
|
286 + |
256 + |
287 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true" |
257 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true" |
288 + onclick="this.hidePopup()"> |
258 + onclick="this.hidePopup()"> |
289 + <hbox id="abouthome-search-panel-manage" |
259 + <hbox id="abouthome-search-panel-manage" |
290 + onclick="openPreferences('paneSearch')"> |
260 + onclick="openPreferences('paneSearch')"> |
339 + <panel id="loop-panel" |
309 + <panel id="loop-panel" |
340 + class="loop-panel social-panel" |
310 + class="loop-panel social-panel" |
341 + type="arrow" |
311 + type="arrow" |
342 + orient="horizontal" |
312 + orient="horizontal" |
343 + hidden="true"/> |
313 + hidden="true"/> |
|
314 + |
|
315 + <menupopup id="processHangOptions" |
|
316 + onpopupshowing="ProcessHangMonitor.refreshMenu(window);"> |
|
317 + <menuitem id="processHangTerminateScript" |
|
318 + oncommand="ProcessHangMonitor.terminateScript(window)" |
|
319 + accesskey="&processHang.terminateScript.accessKey;" |
|
320 + label="&processHang.terminateScript.label;"/> |
|
321 + <menuitem id="processHangDebugScript" |
|
322 + oncommand="ProcessHangMonitor.debugScript(window)" |
|
323 + accesskey="&processHang.debugScript.accessKey;" |
|
324 + label="&processHang.debugScript.label;"/> |
|
325 + <menuitem id="processHangTerminatePlugin" |
|
326 + oncommand="ProcessHangMonitor.terminatePlugin(window)" |
|
327 + accesskey="&processHang.terminatePlugin.accessKey;" |
|
328 + label="&processHang.terminatePlugin.label;"/> |
|
329 + <menuitem id="processHangTerminateProcess" |
|
330 + oncommand="ProcessHangMonitor.terminateProcess(window)" |
|
331 + accesskey="&processHang.terminateProcess.accessKey;" |
|
332 + label="&processHang.terminateProcess.label;"/> |
|
333 + </menupopup> |
344 + |
334 + |
345 + <menupopup id="toolbar-context-menu" |
335 + <menupopup id="toolbar-context-menu" |
346 + onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> |
336 + onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> |
347 + <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" |
337 + <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" |
348 + accesskey="&customizeMenu.moveToPanel.accesskey;" |
338 + accesskey="&customizeMenu.moveToPanel.accesskey;" |
586 + <tooltip id="dynamic-shortcut-tooltip" |
576 + <tooltip id="dynamic-shortcut-tooltip" |
587 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
577 + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> |
588 + |
578 + |
589 + <menupopup id="emeNotificationsPopup"> |
579 + <menupopup id="emeNotificationsPopup"> |
590 + <menuitem id="emeNotificationsNotNow" |
580 + <menuitem id="emeNotificationsNotNow" |
591 + label="Not now" |
581 + label="&emeNotificationsNotNow.label;" |
592 + acceskey="N" |
582 + acceskey="&emeNotificationsNotNow.accesskey;" |
593 + oncommand="gEMEHandler.onNotNow(this);"/> |
583 + oncommand="gEMEHandler.onNotNow(this);"/> |
594 + <menuitem id="emeNotificationsDontAskAgain" |
584 + <menuitem id="emeNotificationsDontAskAgain" |
595 + label="Don't ask me again" |
585 + label="&emeNotificationsDontAskAgain.label;" |
596 + acceskey="D" |
586 + acceskey="&emeNotificationsDontAskAgain.accesskey;" |
597 + oncommand="gEMEHandler.onDontAskAgain(this);"/> |
587 + oncommand="gEMEHandler.onDontAskAgain(this);"/> |
598 + </menupopup> |
588 + </menupopup> |
599 + </popupset> |
589 + </popupset> |
600 + |
590 + |
601 +#ifdef CAN_DRAW_IN_TITLEBAR |
591 +#ifdef CAN_DRAW_IN_TITLEBAR |
843 + <image id="page-report-button" |
833 + <image id="page-report-button" |
844 + class="urlbar-icon" |
834 + class="urlbar-icon" |
845 + hidden="true" |
835 + hidden="true" |
846 + tooltiptext="&pageReportIcon.tooltip;" |
836 + tooltiptext="&pageReportIcon.tooltip;" |
847 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
837 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
|
838 + <image id="readinglist-addremove-button" |
|
839 + class="urlbar-icon" |
|
840 + hidden="true" |
|
841 + onclick="ReadingListUI.togglePageByBrowser(gBrowser.selectedBrowser);"/> |
|
842 + <image id="reader-mode-button" |
|
843 + class="urlbar-icon" |
|
844 + hidden="true" |
|
845 + onclick="ReaderParent.buttonClick(event);"/> |
848 + </hbox> |
846 + </hbox> |
849 + <toolbarbutton id="urlbar-go-button" |
847 + <toolbarbutton id="urlbar-go-button" |
850 + class="chromeclass-toolbar-additional" |
848 + class="chromeclass-toolbar-additional" |
851 + onclick="gURLBar.handleCommand(event);" |
849 + onclick="gURLBar.handleCommand(event);" |
852 + tooltiptext="&goEndCap.tooltip;"/> |
850 + tooltiptext="&goEndCap.tooltip;"/> |
896 + tooltip="bhTooltip" popupsinherittooltip="true"> |
894 + tooltip="bhTooltip" popupsinherittooltip="true"> |
897 + <menuitem id="BMB_viewBookmarksSidebar" |
895 + <menuitem id="BMB_viewBookmarksSidebar" |
898 + class="subviewbutton" |
896 + class="subviewbutton" |
899 + label="&viewBookmarksSidebar2.label;" |
897 + label="&viewBookmarksSidebar2.label;" |
900 + type="checkbox" |
898 + type="checkbox" |
901 + oncommand="toggleSidebar('viewBookmarksSidebar');"> |
899 + oncommand="SidebarUI.toggle('viewBookmarksSidebar');"> |
902 + <observes element="viewBookmarksSidebar" attribute="checked"/> |
900 + <observes element="viewBookmarksSidebar" attribute="checked"/> |
903 + </menuitem> |
901 + </menuitem> |
904 + <!-- NB: temporary solution for bug 985024, this should go away soon. --> |
902 + <!-- NB: temporary solution for bug 985024, this should go away soon. --> |
905 + <menuitem id="BMB_bookmarksShowAllTop" |
903 + <menuitem id="BMB_bookmarksShowAllTop" |
906 + class="menuitem-iconic subviewbutton" |
904 + class="menuitem-iconic subviewbutton" |
960 + placespopup="true" |
958 + placespopup="true" |
961 + context="placesContext" |
959 + context="placesContext" |
962 + onpopupshowing="if (!this.parentNode._placesView) |
960 + onpopupshowing="if (!this.parentNode._placesView) |
963 + new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS', |
961 + new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS', |
964 + PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> |
962 + PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/> |
|
963 + </menu> |
|
964 + <menuseparator> |
|
965 + <observes element="readingListSidebar" attribute="hidden"/> |
|
966 + </menuseparator> |
|
967 + <menu id="BMB_readingList" |
|
968 + class="menu-iconic bookmark-item subviewbutton" |
|
969 + label="&readingList.label;" |
|
970 + container="true"> |
|
971 + <observes element="readingListSidebar" attribute="hidden"/> |
|
972 + <menupopup id="BMB_readingListPopup" |
|
973 + placespopup="true" |
|
974 + onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);"> |
|
975 + <menuitem id="BMB_viewReadingListSidebar" class="subviewbutton" |
|
976 + oncommand="SidebarUI.show('readingListSidebar');" |
|
977 + label="&readingList.showSidebar.label;"/> |
|
978 + </menupopup> |
965 + </menu> |
979 + </menu> |
966 + <menuseparator/> |
980 + <menuseparator/> |
967 + <!-- Bookmarks menu items will go here --> |
981 + <!-- Bookmarks menu items will go here --> |
968 + <menuitem id="BMB_bookmarksShowAll" |
982 + <menuitem id="BMB_bookmarksShowAll" |
969 + class="subviewbutton panel-subview-footer" |
983 + class="subviewbutton panel-subview-footer" |
1149 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1163 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1150 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1164 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1151 + <sidebarheader id="sidebar-header" align="center"> |
1165 + <sidebarheader id="sidebar-header" align="center"> |
1152 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1166 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1153 + <image id="sidebar-throbber"/> |
1167 + <image id="sidebar-throbber"/> |
1154 + <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
1168 + <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/> |
1155 + </sidebarheader> |
1169 + </sidebarheader> |
1156 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1170 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1157 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1171 + style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/> |
1158 + </vbox> |
1172 + </vbox> |
1159 + |
1173 + |
1160 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
1174 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
1161 + <vbox id="appcontent" flex="1"> |
1175 + <vbox id="appcontent" flex="1"> |
1162 + <notificationbox id="high-priority-global-notificationbox"/> |
1176 + <notificationbox id="high-priority-global-notificationbox"/> |
1163 + <tabbrowser id="content" |
1177 + <tabbrowser id="content" |
1164 + flex="1" contenttooltip="aHTMLTooltip" |
1178 + flex="1" contenttooltip="aHTMLTooltip" |
1165 + tabcontainer="tabbrowser-tabs" |
1179 + tabcontainer="tabbrowser-tabs" |
1166 + contentcontextmenu="contentAreaContextMenu" |
1180 + contentcontextmenu="contentAreaContextMenu" |
1167 + autocompletepopup="PopupAutoComplete" |
1181 + autocompletepopup="PopupAutoComplete" |
1168 + selectpopup="ContentSelectDropdown"/> |
1182 + selectmenulist="ContentSelectDropdown"/> |
1169 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1183 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1170 + </vbox> |
1184 + </vbox> |
1171 + <splitter id="social-sidebar-splitter" |
1185 + <splitter id="social-sidebar-splitter" |
1172 + class="chromeclass-extrachrome sidebar-splitter" |
1186 + class="chromeclass-extrachrome sidebar-splitter" |
1173 + observes="socialSidebarBroadcaster"/> |
1187 + observes="socialSidebarBroadcaster"/> |
1295 + |
1309 + |
1296 +</window> |
1310 +</window> |
1297 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1311 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1298 --- a/browser/base/content/browser.xul |
1312 --- a/browser/base/content/browser.xul |
1299 +++ b/browser/base/content/browser.xul |
1313 +++ b/browser/base/content/browser.xul |
1300 @@ -174,17 +174,17 @@ |
1314 @@ -179,17 +179,17 @@ |
1301 class="editBookmarkPanelHeaderButton" |
1315 class="editBookmarkPanelHeaderButton" |
1302 oncommand="StarUI.removeBookmarkButtonCommand();" |
1316 oncommand="StarUI.removeBookmarkButtonCommand();" |
1303 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1317 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1304 </hbox> |
1318 </hbox> |
1305 </vbox> |
1319 </vbox> |
1314 default="true" |
1328 default="true" |
1315 oncommand="StarUI.panel.hidePopup();"/> |
1329 oncommand="StarUI.panel.hidePopup();"/> |
1316 <button id="editBookmarkPanelDeleteButton" |
1330 <button id="editBookmarkPanelDeleteButton" |
1317 class="editBookmarkPanelBottomButton" |
1331 class="editBookmarkPanelBottomButton" |
1318 label="&editBookmark.cancel.label;" |
1332 label="&editBookmark.cancel.label;" |
1319 @@ -1214,17 +1214,17 @@ |
1333 @@ -1228,17 +1228,17 @@ |
1320 |
1334 |
1321 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1335 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1322 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1336 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1323 <vbox id="full-screen-warning-message" align="center"> |
1337 <vbox id="full-screen-warning-message" align="center"> |
1324 <description id="full-screen-domain-text"/> |
1338 <description id="full-screen-domain-text"/> |
1336 #else |
1350 #else |
1337 <button label="&fullscreenAllowButton.label;" |
1351 <button label="&fullscreenAllowButton.label;" |
1338 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1352 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1339 --- a/browser/base/jar.mn |
1353 --- a/browser/base/jar.mn |
1340 +++ b/browser/base/jar.mn |
1354 +++ b/browser/base/jar.mn |
1341 @@ -69,16 +69,18 @@ browser.jar: |
1355 @@ -70,16 +70,18 @@ browser.jar: |
1342 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
|
1343 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1356 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1344 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1357 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
|
1358 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1345 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1359 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1346 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1360 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1347 * content/browser/browser.css (content/browser.css) |
1361 * content/browser/browser.css (content/browser.css) |
1348 * content/browser/browser.js (content/browser.js) |
1362 * content/browser/browser.js (content/browser.js) |
1349 * content/browser/browser.xul (content/browser.xul) |
1363 * content/browser/browser.xul (content/browser.xul) |
1350 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1364 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1351 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1365 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1352 * content/browser/browser-eme.properties (content/browser-eme.properties) |
|
1353 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1366 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1354 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1367 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1355 content/browser/content.js (content/content.js) |
1368 content/browser/content.js (content/content.js) |
1356 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1369 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1357 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1370 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1358 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1371 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1359 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1372 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
|
1373 content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
1360 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1374 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1361 --- a/browser/components/build/nsModule.cpp |
1375 --- a/browser/components/build/nsModule.cpp |
1362 +++ b/browser/components/build/nsModule.cpp |
1376 +++ b/browser/components/build/nsModule.cpp |
1363 @@ -8,17 +8,17 @@ |
1377 @@ -8,17 +8,17 @@ |
1364 #include "nsBrowserCompsCID.h" |
1378 #include "nsBrowserCompsCID.h" |
1909 + |
1923 + |
1910 +#endif // nsunixshellservice_h____ |
1924 +#endif // nsunixshellservice_h____ |
1911 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1925 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1912 --- a/browser/installer/package-manifest.in |
1926 --- a/browser/installer/package-manifest.in |
1913 +++ b/browser/installer/package-manifest.in |
1927 +++ b/browser/installer/package-manifest.in |
1914 @@ -688,19 +688,21 @@ |
1928 @@ -698,19 +698,21 @@ |
1915 @RESPATH@/defaults/autoconfig/prefcalls.js |
1929 @RESPATH@/defaults/autoconfig/prefcalls.js |
1916 @RESPATH@/browser/defaults/profile/prefs.js |
1930 @RESPATH@/browser/defaults/profile/prefs.js |
1917 |
1931 |
1918 #ifndef LIBXUL_SDK |
1932 #ifndef LIBXUL_SDK |
1919 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1933 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |