475 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls" |
475 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls" |
476 + context="toolbar-context-menu"> |
476 + context="toolbar-context-menu"> |
477 + |
477 + |
478 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
478 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
479 + context="backForwardMenu" removable="true" |
479 + context="backForwardMenu" removable="true" |
|
480 + forwarddisabled="true" |
480 + title="&backForwardItem.title;"> |
481 + title="&backForwardItem.title;"> |
481 + <toolbarbutton id="back-button" class="toolbarbutton-1" |
482 + <toolbarbutton id="back-button" class="toolbarbutton-1" |
482 + label="&backCmd.label;" |
483 + label="&backCmd.label;" |
483 + command="Browser:BackOrBackDuplicate" |
484 + command="Browser:BackOrBackDuplicate" |
484 + onclick="checkForMiddleClick(this, event);" |
485 + onclick="checkForMiddleClick(this, event);" |
486 + <toolbarbutton id="forward-button" class="toolbarbutton-1" |
487 + <toolbarbutton id="forward-button" class="toolbarbutton-1" |
487 + label="&forwardCmd.label;" |
488 + label="&forwardCmd.label;" |
488 + command="Browser:ForwardOrForwardDuplicate" |
489 + command="Browser:ForwardOrForwardDuplicate" |
489 + onclick="checkForMiddleClick(this, event);" |
490 + onclick="checkForMiddleClick(this, event);" |
490 + tooltip="forward-button-tooltip"/> |
491 + tooltip="forward-button-tooltip"/> |
|
492 + <dummyobservertarget hidden="true" |
|
493 + onbroadcast="if (this.getAttribute('disabled') == 'true') |
|
494 + this.parentNode.setAttribute('forwarddisabled', 'true'); |
|
495 + else |
|
496 + this.parentNode.removeAttribute('forwarddisabled');"> |
|
497 + <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/> |
|
498 + </dummyobservertarget> |
491 + </toolbaritem> |
499 + </toolbaritem> |
492 + |
500 + |
493 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
501 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
494 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
502 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
495 + <textbox id="urlbar" flex="1" |
503 + <textbox id="urlbar" flex="1" |
961 + contentcontextmenu="contentAreaContextMenu" |
969 + contentcontextmenu="contentAreaContextMenu" |
962 + autocompletepopup="PopupAutoComplete" |
970 + autocompletepopup="PopupAutoComplete" |
963 + onclick="return contentAreaClick(event, false);"/> |
971 + onclick="return contentAreaClick(event, false);"/> |
964 + <statuspanel id="statusbar-display" inactive="true"/> |
972 + <statuspanel id="statusbar-display" inactive="true"/> |
965 + </vbox> |
973 + </vbox> |
|
974 + <splitter id="devtools-side-splitter" hidden="true"/> |
|
975 + <vbox id="devtools-sidebar-box" hidden="true" |
|
976 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
|
977 + <toolbar id="devtools-sidebar-toolbar" nowindowdrag="true"/> |
|
978 + <deck id="devtools-sidebar-deck" flex="1"/> |
|
979 + </vbox> |
966 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
980 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
|
981 + </hbox> |
|
982 + |
|
983 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
|
984 + <hbox style="min-width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
|
985 + <hbox id="full-screen-warning-message"> |
|
986 + <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description> |
|
987 + </hbox> |
|
988 + </hbox> |
967 + </hbox> |
989 + </hbox> |
968 + |
990 + |
969 + <vbox id="browser-bottombox" layer="true"> |
991 + <vbox id="browser-bottombox" layer="true"> |
970 + <toolbar id="inspector-toolbar" |
992 + <toolbar id="inspector-toolbar" |
971 + nowindowdrag="true" |
993 + nowindowdrag="true" |
972 + hidden="true"> |
994 + hidden="true"> |
973 + <toolbarbutton id="inspector-inspect-toolbutton" |
995 + <vbox flex="1"> |
974 + label="&inspectButton.label;" |
996 + <resizer id="inspector-top-resizer" flex="1" |
975 + accesskey="&inspectButton.accesskey;" |
997 + class="inspector-resizer" |
976 + class="toolbarbutton-text" |
998 + dir="top" disabled="true" |
977 + command="Inspector:Inspect"/> |
999 + element="inspector-tree-box"/> |
978 + <toolbarseparator /> |
1000 + <hbox> |
979 + <hbox id="inspector-tools"> |
1001 +#ifdef XP_MACOSX |
980 + <!-- registered tools go here --> |
1002 + <toolbarbutton id="highlighter-closebutton" |
981 + </hbox> |
1003 + oncommand="InspectorUI.closeInspectorUI(false);" |
|
1004 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
|
1005 +#endif |
|
1006 + <toolbarbutton id="inspector-inspect-toolbutton" |
|
1007 + label="&inspectButton.label;" |
|
1008 + accesskey="&inspectButton.accesskey;" |
|
1009 + command="Inspector:Inspect"/> |
|
1010 + <arrowscrollbox id="inspector-breadcrumbs" |
|
1011 + flex="1" orient="horizontal" |
|
1012 + clicktoscroll="true"/> |
|
1013 + <hbox id="inspector-tools"> |
|
1014 + <toolbarbutton id="inspector-style-button" |
|
1015 + label="&inspectStyleButton.label;" |
|
1016 + accesskey="&inspectStyleButton.accesskey;" |
|
1017 + command="Inspector:Sidebar"/> |
|
1018 + <!-- registered tools go here --> |
|
1019 + </hbox> |
|
1020 +#ifndef XP_MACOSX |
|
1021 + <toolbarbutton id="highlighter-closebutton" |
|
1022 + oncommand="InspectorUI.closeInspectorUI(false);" |
|
1023 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
|
1024 +#endif |
|
1025 + <resizer id="inspector-end-resizer" |
|
1026 + class="inspector-resizer" |
|
1027 + dir="top" disabled="true" |
|
1028 + element="inspector-tree-box"/> |
|
1029 + </hbox> |
|
1030 + </vbox> |
982 + </toolbar> |
1031 + </toolbar> |
983 + <toolbar id="addon-bar" |
1032 + <toolbar id="addon-bar" |
984 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
1033 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
985 + collapsed="true" |
1034 + collapsed="true" |
986 + class="toolbar-primary chromeclass-toolbar" |
1035 + class="toolbar-primary chromeclass-toolbar" |
1005 + </svg:mask> |
1054 + </svg:mask> |
1006 + <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
1055 + <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
1007 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1056 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1008 + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
1057 + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
1009 + </svg:mask> |
1058 + </svg:mask> |
|
1059 + <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> |
|
1060 + <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> |
|
1061 + <svg:circle cx="-11" cy="13" r="15"/> |
|
1062 + </svg:mask> |
1010 + </svg:svg> |
1063 + </svg:svg> |
1011 +#endif |
1064 +#endif |
1012 +#ifdef XP_MACOSX |
1065 +#ifdef XP_MACOSX |
1013 + <svg:svg height="0"> |
1066 + <svg:svg height="0"> |
1014 + <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
1067 + <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
1015 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1068 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1016 + <svg:circle cx="-0.41" cy="0.5" r="0.65"/> |
1069 + <svg:circle cx="-0.41" cy="0.5" r="0.65"/> |
|
1070 + </svg:mask> |
|
1071 + <svg:mask id="pinstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> |
|
1072 + <svg:rect x="0" y="-5" width="10000" height="55" fill="white"/> |
|
1073 + <svg:circle cx="-9" cy="11" r="15"/> |
1017 + </svg:mask> |
1074 + </svg:mask> |
1018 + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
1075 + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
1019 + <svg:circle cx="9" cy="3" r="3" fill="white"/> |
1076 + <svg:circle cx="9" cy="3" r="3" fill="white"/> |
1020 + <svg:rect x="9" y="0" width="3" height="3" fill="white"/> |
1077 + <svg:rect x="9" y="0" width="3" height="3" fill="white"/> |
1021 + <svg:rect x="6" y="3" width="6" height="19" fill="white"/> |
1078 + <svg:rect x="6" y="3" width="6" height="19" fill="white"/> |
1140 #elif defined(XP_MACOSX) |
1197 #elif defined(XP_MACOSX) |
1141 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1198 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1142 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1199 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1143 --- a/browser/components/preferences/advanced.js |
1200 --- a/browser/components/preferences/advanced.js |
1144 +++ b/browser/components/preferences/advanced.js |
1201 +++ b/browser/components/preferences/advanced.js |
1145 @@ -683,24 +683,42 @@ var gAdvancedPane = { |
1202 @@ -690,24 +690,42 @@ var gAdvancedPane = { |
1146 var brandBundle = document.getElementById("bundleBrand"); |
1203 var brandBundle = document.getElementById("bundleBrand"); |
1147 var shellBundle = document.getElementById("bundleShell"); |
1204 var shellBundle = document.getElementById("bundleShell"); |
1148 var brandShortName = brandBundle.getString("brandShortName"); |
1205 var brandShortName = brandBundle.getString("brandShortName"); |
1149 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1206 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1150 var promptMessage; |
1207 var promptMessage; |
1269 + } |
1326 + } |
1270 + |
1327 + |
1271 +NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService) |
1328 +NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService) |
1272 + |
1329 + |
1273 +NS_IMETHODIMP |
1330 +NS_IMETHODIMP |
1274 +nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck, |
1331 +nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, |
1275 + PRBool* aIsDefaultBrowser) |
1332 + bool* aIsDefaultBrowser) |
1276 + { |
1333 + { |
1277 + *aIsDefaultBrowser = PR_FALSE; |
1334 + *aIsDefaultBrowser = PR_FALSE; |
1278 + if (aStartupCheck) |
1335 + if (aStartupCheck) |
1279 + mCheckedThisSession = PR_TRUE; |
1336 + mCheckedThisSession = PR_TRUE; |
1280 + nsCStringArray command; |
1337 + nsTArray<nsCString> command; |
1281 + command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); |
1338 + command.AppendElement( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); |
1282 + if( nsKDEUtils::command( command )) |
1339 + if( nsKDEUtils::command( command )) |
1283 + *aIsDefaultBrowser = PR_TRUE; |
1340 + *aIsDefaultBrowser = PR_TRUE; |
1284 + return NS_OK; |
1341 + return NS_OK; |
1285 + } |
1342 + } |
1286 + |
1343 + |
1287 +NS_IMETHODIMP |
1344 +NS_IMETHODIMP |
1288 +nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes, |
1345 +nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes, |
1289 + PRBool aForAllUsers) |
1346 + bool aForAllUsers) |
1290 + { |
1347 + { |
1291 + nsCStringArray command; |
1348 + nsTArray<nsCString> command; |
1292 + command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); |
1349 + command.AppendElement( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); |
1293 + command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); |
1350 + command.AppendElement( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); |
1294 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1351 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1295 + } |
1352 + } |
1296 + |
1353 + |
1297 +NS_IMETHODIMP |
1354 +NS_IMETHODIMP |
1298 +nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult) |
1355 +nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult) |
1299 +{ |
1356 +{ |
1300 + // If we've already checked, the browser has been started and this is a |
1357 + // If we've already checked, the browser has been started and this is a |
1301 + // new window open, and we don't want to check again. |
1358 + // new window open, and we don't want to check again. |
1302 + if (mCheckedThisSession) { |
1359 + if (mCheckedThisSession) { |
1303 + *aResult = PR_FALSE; |
1360 + *aResult = PR_FALSE; |
1304 + return NS_OK; |
1361 + return NS_OK; |
1305 + } |
1362 + } |
1349 + } |
1406 + } |
1350 + |
1407 + |
1351 +NS_IMETHODIMP |
1408 +NS_IMETHODIMP |
1352 +nsKDEShellService::OpenApplication(PRInt32 aApplication) |
1409 +nsKDEShellService::OpenApplication(PRInt32 aApplication) |
1353 + { |
1410 + { |
1354 + nsCStringArray command; |
1411 + nsTArray<nsCString> command; |
1355 + if( aApplication == APPLICATION_MAIL ) |
1412 + if( aApplication == APPLICATION_MAIL ) |
1356 + command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" )); |
1413 + command.AppendElement( NS_LITERAL_CSTRING( "OPENMAIL" )); |
1357 + else if( aApplication == APPLICATION_NEWS ) |
1414 + else if( aApplication == APPLICATION_NEWS ) |
1358 + command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" )); |
1415 + command.AppendElement( NS_LITERAL_CSTRING( "OPENNEWS" )); |
1359 + else |
1416 + else |
1360 + return NS_ERROR_NOT_IMPLEMENTED; |
1417 + return NS_ERROR_NOT_IMPLEMENTED; |
1361 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1418 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1362 + } |
1419 + } |
1363 + |
1420 + |
1364 +NS_IMETHODIMP |
1421 +NS_IMETHODIMP |
1365 +nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI) |
1422 +nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI) |
1366 + { |
1423 + { |
1367 + nsCStringArray command; |
1424 + nsTArray<nsCString> command; |
1368 + command.AppendCString( NS_LITERAL_CSTRING( "RUN" )); |
1425 + command.AppendElement( NS_LITERAL_CSTRING( "RUN" )); |
1369 + nsCString app; |
1426 + nsCString app; |
1370 + nsresult rv = aApplication->GetNativePath( app ); |
1427 + nsresult rv = aApplication->GetNativePath( app ); |
1371 + NS_ENSURE_SUCCESS( rv, rv ); |
1428 + NS_ENSURE_SUCCESS( rv, rv ); |
1372 + command.AppendCString( app ); |
1429 + command.AppendElement( app ); |
1373 + command.AppendCString( aURI ); |
1430 + command.AppendElement( aURI ); |
1374 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1431 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1375 + } |
1432 + } |
1376 + |
1433 + |
1377 +NS_IMETHODIMP |
1434 +NS_IMETHODIMP |
1378 +nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval) |
1435 +nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval) |
1379 + { |
1436 + { |
1380 + *_retval = nsnull; |
1437 + *_retval = nsnull; |
1381 + |
1438 + |
1382 + nsCStringArray command; |
1439 + nsTArray<nsCString> command; |
1383 + command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); |
1440 + command.AppendElement( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); |
1384 + nsCStringArray output; |
1441 + nsTArray<nsCString> output; |
1385 + if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 ) |
1442 + if( !nsKDEUtils::command( command, &output ) || output.Length() != 1 ) |
1386 + return NS_ERROR_FAILURE; |
1443 + return NS_ERROR_FAILURE; |
1387 + |
1444 + |
1388 + nsCString path; |
1445 + nsCString path; |
1389 + path = *output[ 0 ]; |
1446 + path = output[ 0 ]; |
1390 + if (path.IsEmpty()) |
1447 + if (path.IsEmpty()) |
1391 + return NS_ERROR_FAILURE; |
1448 + return NS_ERROR_FAILURE; |
1392 + |
1449 + |
1393 + nsresult rv; |
1450 + nsresult rv; |
1394 + nsCOMPtr<nsILocalFile> defaultReader = |
1451 + nsCOMPtr<nsILocalFile> defaultReader = |
1579 + |
1636 + |
1580 +#endif // nsunixshellservice_h____ |
1637 +#endif // nsunixshellservice_h____ |
1581 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1638 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1582 --- a/browser/installer/package-manifest.in |
1639 --- a/browser/installer/package-manifest.in |
1583 +++ b/browser/installer/package-manifest.in |
1640 +++ b/browser/installer/package-manifest.in |
1584 @@ -424,16 +424,17 @@ |
1641 @@ -426,16 +426,17 @@ |
1585 #endif |
1642 #endif |
1586 #endif |
1643 #endif |
1587 |
1644 |
1588 ; [Default Preferences] |
1645 ; [Default Preferences] |
1589 ; All the pref files must be part of base to prevent migration bugs |
1646 ; All the pref files must be part of base to prevent migration bugs |