193 + <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/> |
193 + <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/> |
194 + <vbox flex="1"> |
194 + <vbox flex="1"> |
195 + <description id="social-activation-message" class="popup-notification-description"/> |
195 + <description id="social-activation-message" class="popup-notification-description"/> |
196 + <spacer flex="1"/> |
196 + <spacer flex="1"/> |
197 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
197 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
198 +#ifdef XP_UNIX |
198 +#ifndef XP_UNIX |
199 + <button id="social-undoactivation-button" |
199 + <button id="social-undoactivation-button" |
200 + label="&social.activated.undobutton.label;" |
200 + label="&social.activated.undobutton.label;" |
201 + accesskey="&social.activated.undobutton.accesskey;" |
201 + accesskey="&social.activated.undobutton.accesskey;" |
202 + onclick="SocialUI.undoActivation();"/> |
202 + onclick="SocialUI.undoActivation();"/> |
203 + <button default="true" |
203 + <button default="true" |
243 + <spacer flex="1"/> |
243 + <spacer flex="1"/> |
244 + <label id="socialUserRecommendedText"/> |
244 + <label id="socialUserRecommendedText"/> |
245 + </vbox> |
245 + </vbox> |
246 + </row> |
246 + </row> |
247 + <hbox id="unsharePopupBottomButtons" pack="end"> |
247 + <hbox id="unsharePopupBottomButtons" pack="end"> |
248 +#ifdef XP_UNIX |
248 +#ifndef XP_UNIX |
249 + <button id="unsharePopupStopSharingButton" |
249 + <button id="unsharePopupStopSharingButton" |
250 + class="unsharePopupBottomButton" |
250 + class="unsharePopupBottomButton" |
251 + command="Social:UnsharePage"/> |
251 + command="Social:UnsharePage"/> |
252 + <button id="unsharePopupContinueSharingButton" |
252 + <button id="unsharePopupContinueSharingButton" |
253 + class="unsharePopupBottomButton" |
253 + class="unsharePopupBottomButton" |
270 + <panel id="social-notification-panel" |
270 + <panel id="social-notification-panel" |
271 + class="social-panel" |
271 + class="social-panel" |
272 + type="arrow" |
272 + type="arrow" |
273 + hidden="true" |
273 + hidden="true" |
274 + consumeoutsideclicks="true" |
274 + consumeoutsideclicks="true" |
275 + noautofocus="true"> |
275 + noautofocus="true"/> |
276 + <box id="social-notification-box" flex="1"></box> |
|
277 + </panel> |
|
278 + <panel id="social-flyout-panel" |
276 + <panel id="social-flyout-panel" |
279 + class="social-panel" |
277 + class="social-panel" |
280 + onpopupshown="SocialFlyout.onShown()" |
278 + onpopupshown="SocialFlyout.onShown()" |
281 + onpopuphidden="SocialFlyout.onHidden()" |
279 + onpopuphidden="SocialFlyout.onHidden()" |
282 + side="right" |
280 + side="right" |
676 + hidden="true"> |
674 + hidden="true"> |
677 + <toolbarbutton id="social-provider-button" |
675 + <toolbarbutton id="social-provider-button" |
678 + class="toolbarbutton-1" |
676 + class="toolbarbutton-1" |
679 + type="menu"> |
677 + type="menu"> |
680 + <menupopup id="social-statusarea-popup"> |
678 + <menupopup id="social-statusarea-popup"> |
681 + <hbox id="social-statusarea-user" pack="start" align="center" |
679 + <menuitem id="social-statusarea-user" pack="start" align="center" class="menuitem-iconic" |
682 + onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"> |
680 + onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"> |
683 + <image id="social-statusarea-user-portrait"/> |
681 + <image id="social-statusarea-user-portrait"/> |
684 + <vbox> |
682 + <vbox> |
685 + <button id="social-statusarea-notloggedin" |
683 + <label id="social-statusarea-notloggedin" |
686 + class="link" label="&social.notLoggedIn.label;"/> |
684 + value="&social.notLoggedIn.label;"/> |
687 + <button id="social-statusarea-username" class="link"/> |
685 + <label id="social-statusarea-username"/> |
688 + </vbox> |
686 + </vbox> |
689 + </hbox> |
687 + </menuitem> |
|
688 +#ifndef XP_WIN |
|
689 + <menuseparator/> |
|
690 +#endif |
690 + <menuitem id="social-toggle-sidebar-menuitem" |
691 + <menuitem id="social-toggle-sidebar-menuitem" |
691 + type="checkbox" |
692 + type="checkbox" |
692 + autocheck="false" |
693 + autocheck="false" |
693 + command="Social:ToggleSidebar" |
694 + command="Social:ToggleSidebar" |
694 + label="&social.toggleSidebar.label;" |
695 + label="&social.toggleSidebar.label;" |
695 + accesskey="&social.toggleSidebar.accesskey;"/> |
696 + accesskey="&social.toggleSidebar.accesskey;"/> |
|
697 + <menuitem id="social-toggle-notifications-menuitem" |
|
698 + type="checkbox" |
|
699 + autocheck="false" |
|
700 + command="Social:ToggleNotifications" |
|
701 + label="&social.toggleNotifications.label;" |
|
702 + accesskey="&social.toggleNotifications.accesskey;"/> |
696 + </menupopup> |
703 + </menupopup> |
697 + </toolbarbutton> |
704 + </toolbarbutton> |
698 + </toolbaritem> |
705 + </toolbaritem> |
699 + |
706 + |
700 + <toolbaritem id="bookmarks-menu-button-container" |
707 + <toolbaritem id="bookmarks-menu-button-container" |
1365 + kde_session = 1; |
1372 + kde_session = 1; |
1366 + |
1373 + |
1367 #ifdef HAVE_SHELL_SERVICE |
1374 #ifdef HAVE_SHELL_SERVICE |
1368 this.updateSetDefaultBrowser(); |
1375 this.updateSetDefaultBrowser(); |
1369 #ifdef XP_WIN |
1376 #ifdef XP_WIN |
1370 let shellSvc = getShellService(); |
|
1371 // In Windows 8 we launch the control panel since it's the only |
1377 // In Windows 8 we launch the control panel since it's the only |
1372 // way to get all file type association prefs. So we don't know |
1378 // way to get all file type association prefs. So we don't know |
1373 // when the user will select the default. We refresh here periodically |
1379 // when the user will select the default. We refresh here periodically |
1374 // in case the default changes. |
1380 // in case the default changes. On other Windows OS's defaults can also |
1375 @@ -737,14 +743,25 @@ var gAdvancedPane = { |
1381 // be set while the prefs are open. |
|
1382 @@ -725,14 +731,25 @@ var gAdvancedPane = { |
1376 * Set browser as the operating system default browser. |
1383 * Set browser as the operating system default browser. |
1377 */ |
1384 */ |
1378 setDefaultBrowser: function() |
1385 setDefaultBrowser: function() |
1379 { |
1386 { |
1380 let shellSvc = getShellService(); |
1387 let shellSvc = getShellService(); |
1832 + |
1839 + |
1833 +#endif // nsunixshellservice_h____ |
1840 +#endif // nsunixshellservice_h____ |
1834 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1841 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1835 --- a/browser/installer/package-manifest.in |
1842 --- a/browser/installer/package-manifest.in |
1836 +++ b/browser/installer/package-manifest.in |
1843 +++ b/browser/installer/package-manifest.in |
1837 @@ -559,18 +559,20 @@ |
1844 @@ -561,18 +561,20 @@ |
1838 @BINPATH@/@PREF_DIR@/services-sync.js |
1845 @BINPATH@/@PREF_DIR@/services-sync.js |
1839 #endif |
1846 #endif |
1840 @BINPATH@/greprefs.js |
1847 @BINPATH@/greprefs.js |
1841 @BINPATH@/defaults/autoconfig/platform.js |
1848 @BINPATH@/defaults/autoconfig/platform.js |
1842 @BINPATH@/defaults/autoconfig/prefcalls.js |
1849 @BINPATH@/defaults/autoconfig/prefcalls.js |