255 + hidden="true" |
255 + hidden="true" |
256 + noautofocus="true" |
256 + noautofocus="true" |
257 + noautohide="true" |
257 + noautohide="true" |
258 + orient="vertical" |
258 + orient="vertical" |
259 + align="stretch"> |
259 + align="stretch"> |
260 + <label class="SearchHighlightTitle">One-Click Searches</label> |
260 + <label class="SearchHighlightTitle">&SearchHighlight1.title;</label> |
261 + <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description> |
261 + <description class="SearchHighlightText" flex="1">&SearchHighlight1.text;</description> |
262 + <hbox class="SearchHighlightFooter" align="center"> |
262 + <hbox class="SearchHighlightFooter" align="center"> |
263 + <spacer class="dot filled"/> |
263 + <spacer class="dot filled"/> |
264 + <spacer class="dot"/> |
264 + <spacer class="dot"/> |
265 + <spacer flex="1"/> |
265 + <spacer flex="1"/> |
266 + <button label="Next"/> |
266 + <button label="&SearchHighlightNext;"/> |
267 + </hbox> |
267 + </hbox> |
268 + </panel> |
268 + </panel> |
269 + <panel id="SearchHighlight2" |
269 + <panel id="SearchHighlight2" |
270 + class="SearchHighlight" |
270 + class="SearchHighlight" |
271 + type="arrow" |
271 + type="arrow" |
272 + hidden="true" |
272 + hidden="true" |
273 + noautofocus="true" |
273 + noautofocus="true" |
274 + noautohide="true" |
274 + noautohide="true" |
275 + orient="vertical" |
275 + orient="vertical" |
276 + align="stretch"> |
276 + align="stretch"> |
277 + <label class="SearchHighlightTitle">Smart Suggestions</label> |
277 + <label class="SearchHighlightTitle">&SearchHighlight2.title;</label> |
278 + <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description> |
278 + <description class="SearchHighlightText" flex="1">&SearchHighlight2.text;</description> |
279 + <hbox class="SearchHighlightFooter" align="center"> |
279 + <hbox class="SearchHighlightFooter" align="center"> |
280 + <spacer class="dot"/> |
280 + <spacer class="dot"/> |
281 + <spacer class="dot filled"/> |
281 + <spacer class="dot filled"/> |
282 + <spacer flex="1"/> |
282 + <spacer flex="1"/> |
283 + <button label="Thanks!"/> |
283 + <button label="&SearchHighlightClose;"/> |
284 + </hbox> |
284 + </hbox> |
285 + </panel> |
285 + </panel> |
286 + |
286 + |
287 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> |
287 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true" |
|
288 + onclick="this.hidePopup()"> |
288 + <hbox id="abouthome-search-panel-manage" |
289 + <hbox id="abouthome-search-panel-manage" |
289 + onclick="openPreferences('paneSearch')"> |
290 + onclick="openPreferences('paneSearch')"> |
290 + <label>&cmd_engineManager.label;</label> |
291 + <label>&changeSearchSettings.button;</label> |
291 + </hbox> |
292 + </hbox> |
292 + </panel> |
293 + </panel> |
293 + |
294 + |
294 + <panel id="social-share-panel" |
295 + <panel id="social-share-panel" |
295 + class="social-panel" |
296 + class="social-panel" |
730 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
731 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
731 + aria-label="&navbarCmd.label;" |
732 + aria-label="&navbarCmd.label;" |
732 + fullscreentoolbar="true" mode="icons" customizable="true" |
733 + fullscreentoolbar="true" mode="icons" customizable="true" |
733 + iconsize="small" |
734 + iconsize="small" |
734 +#ifdef MOZ_DEV_EDITION |
735 +#ifdef MOZ_DEV_EDITION |
735 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" |
736 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" |
736 +#else |
737 +#else |
737 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" |
738 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button" |
738 +#endif |
739 +#endif |
739 + customizationtarget="nav-bar-customization-target" |
740 + customizationtarget="nav-bar-customization-target" |
740 + overflowable="true" |
741 + overflowable="true" |
741 + overflowbutton="nav-bar-overflow-button" |
742 + overflowbutton="nav-bar-overflow-button" |
742 + overflowtarget="widget-overflow-list" |
743 + overflowtarget="widget-overflow-list" |
771 + showcommentcolumn="true" |
772 + showcommentcolumn="true" |
772 + showimagecolumn="true" |
773 + showimagecolumn="true" |
773 + enablehistory="true" |
774 + enablehistory="true" |
774 + maxrows="6" |
775 + maxrows="6" |
775 + newlines="stripsurroundingwhitespace" |
776 + newlines="stripsurroundingwhitespace" |
776 + oninput="gBrowser.userTypedValue = this.value;" |
|
777 + ontextentered="this.handleCommand(param);" |
777 + ontextentered="this.handleCommand(param);" |
778 + ontextreverted="return this.handleRevert();" |
778 + ontextreverted="return this.handleRevert();" |
779 + pageproxystate="invalid" |
779 + pageproxystate="invalid" |
780 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
780 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
781 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
781 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
1334 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1334 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1335 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1335 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1336 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1336 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1337 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1337 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1338 content/browser/content.js (content/content.js) |
1338 content/browser/content.js (content/content.js) |
|
1339 content/browser/content-UITour.js (content/content-UITour.js) |
1339 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1340 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1340 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1341 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1341 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1342 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1342 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1343 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1343 content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
|
1344 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1344 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1345 --- a/browser/components/build/nsModule.cpp |
1345 --- a/browser/components/build/nsModule.cpp |
1346 +++ b/browser/components/build/nsModule.cpp |
1346 +++ b/browser/components/build/nsModule.cpp |
1347 @@ -8,17 +8,17 @@ |
1347 @@ -8,17 +8,17 @@ |
1348 #include "nsBrowserCompsCID.h" |
1348 #include "nsBrowserCompsCID.h" |
1893 + |
1893 + |
1894 +#endif // nsunixshellservice_h____ |
1894 +#endif // nsunixshellservice_h____ |
1895 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1895 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1896 --- a/browser/installer/package-manifest.in |
1896 --- a/browser/installer/package-manifest.in |
1897 +++ b/browser/installer/package-manifest.in |
1897 +++ b/browser/installer/package-manifest.in |
1898 @@ -698,19 +698,21 @@ |
1898 @@ -689,19 +689,21 @@ |
1899 @BINPATH@/defaults/autoconfig/prefcalls.js |
1899 @RESPATH@/defaults/autoconfig/prefcalls.js |
1900 @BINPATH@/browser/defaults/profile/prefs.js |
1900 @RESPATH@/browser/defaults/profile/prefs.js |
1901 |
1901 |
1902 #ifndef LIBXUL_SDK |
1902 #ifndef LIBXUL_SDK |
1903 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1903 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1904 ; Technically this is an app pref file, but we are keeping it in the original |
1904 ; Technically this is an app pref file, but we are keeping it in the original |
1905 ; gre location for now. |
1905 ; gre location for now. |
1906 @BINPATH@/defaults/pref/channel-prefs.js |
1906 @RESPATH@/defaults/pref/channel-prefs.js |
1907 +@BINPATH@/defaults/pref/kde.js |
1907 +@BINPATH@/defaults/pref/kde.js |
1908 #else |
1908 #else |
1909 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
1909 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
1910 @BINPATH@/@PREF_DIR@/channel-prefs.js |
1910 @RESPATH@/@PREF_DIR@/channel-prefs.js |
1911 +@BINPATH@/@PREF_DIR@/kde.js |
1911 +@BINPATH@/@PREF_DIR@/kde.js |
1912 #endif |
1912 #endif |
1913 |
1913 |
1914 ; Services (gre) prefs |
1914 ; Services (gre) prefs |
1915 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1915 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1916 @BINPATH@/defaults/pref/services-notifications.js |
1916 @RESPATH@/defaults/pref/services-notifications.js |
1917 #endif |
1917 #endif |
1918 #ifdef MOZ_SERVICES_SYNC |
1918 #ifdef MOZ_SERVICES_SYNC |
1919 @BINPATH@/defaults/pref/services-sync.js |
1919 @RESPATH@/defaults/pref/services-sync.js |