243 + flip="none" |
243 + flip="none" |
244 + consumeoutsideclicks="false" |
244 + consumeoutsideclicks="false" |
245 + mousethrough="always"> |
245 + mousethrough="always"> |
246 + <box id="UITourHighlight"></box> |
246 + <box id="UITourHighlight"></box> |
247 + </panel> |
247 + </panel> |
248 + |
248 + <!-- Used to highlight the new search experience --> |
249 + <panel id="abouthome-search-panel" orient="vertical" type="arrow"> |
249 + <panel id="SearchHighlight1" |
|
250 + class="SearchHighlight" |
|
251 + type="arrow" |
|
252 + hidden="true" |
|
253 + noautofocus="true" |
|
254 + noautohide="true" |
|
255 + orient="vertical" |
|
256 + align="stretch"> |
|
257 + <label class="SearchHighlightTitle">One-Click Searches</label> |
|
258 + <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description> |
|
259 + <hbox class="SearchHighlightFooter" align="center"> |
|
260 + <spacer class="dot filled"/> |
|
261 + <spacer class="dot"/> |
|
262 + <spacer flex="1"/> |
|
263 + <button label="Next"/> |
|
264 + </hbox> |
|
265 + </panel> |
|
266 + <panel id="SearchHighlight2" |
|
267 + class="SearchHighlight" |
|
268 + type="arrow" |
|
269 + hidden="true" |
|
270 + noautofocus="true" |
|
271 + noautohide="true" |
|
272 + orient="vertical" |
|
273 + align="stretch"> |
|
274 + <label class="SearchHighlightTitle">Smart Suggestions</label> |
|
275 + <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description> |
|
276 + <hbox class="SearchHighlightFooter" align="center"> |
|
277 + <spacer class="dot"/> |
|
278 + <spacer class="dot filled"/> |
|
279 + <spacer flex="1"/> |
|
280 + <button label="Thanks!"/> |
|
281 + </hbox> |
|
282 + </panel> |
|
283 + |
|
284 + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> |
250 + <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item" |
285 + <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item" |
251 + onclick="openPreferences('paneSearch')"> |
286 + onclick="openPreferences('paneSearch')"> |
252 + <label>&cmd_engineManager.label;</label> |
287 + <label>&cmd_engineManager.label;</label> |
253 + </hbox> |
288 + </hbox> |
254 + </panel> |
289 + </panel> |
1257 default="true" |
1292 default="true" |
1258 oncommand="StarUI.panel.hidePopup();"/> |
1293 oncommand="StarUI.panel.hidePopup();"/> |
1259 <button id="editBookmarkPanelDeleteButton" |
1294 <button id="editBookmarkPanelDeleteButton" |
1260 class="editBookmarkPanelBottomButton" |
1295 class="editBookmarkPanelBottomButton" |
1261 label="&editBookmark.cancel.label;" |
1296 label="&editBookmark.cancel.label;" |
1262 @@ -1160,17 +1160,17 @@ |
1297 @@ -1195,17 +1195,17 @@ |
1263 |
1298 |
1264 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1299 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1265 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1300 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1266 <vbox id="full-screen-warning-message" align="center"> |
1301 <vbox id="full-screen-warning-message" align="center"> |
1267 <description id="full-screen-domain-text"/> |
1302 <description id="full-screen-domain-text"/> |
1852 + |
1887 + |
1853 +#endif // nsunixshellservice_h____ |
1888 +#endif // nsunixshellservice_h____ |
1854 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1889 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1855 --- a/browser/installer/package-manifest.in |
1890 --- a/browser/installer/package-manifest.in |
1856 +++ b/browser/installer/package-manifest.in |
1891 +++ b/browser/installer/package-manifest.in |
1857 @@ -685,19 +685,21 @@ |
1892 @@ -686,19 +686,21 @@ |
1858 @BINPATH@/defaults/autoconfig/prefcalls.js |
1893 @BINPATH@/defaults/autoconfig/prefcalls.js |
1859 @BINPATH@/browser/defaults/profile/prefs.js |
1894 @BINPATH@/browser/defaults/profile/prefs.js |
1860 |
1895 |
1861 #ifndef LIBXUL_SDK |
1896 #ifndef LIBXUL_SDK |
1862 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1897 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |