Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #239984 --> [OSX] "Minimize Window" and "Zoom Window" in the "Window" menu, cannot be chosen.

Browse Source 
Patch by bugs.mano@mail-central.com


git-svn-id: svn://10.0.0.236/trunk@164216 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-10-22 21:36:35 +00:00
parent a6a44f9cb5
commit 69b66de0f0
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/mail/base/content/mailCore.js
View File

@@ -213,4 +213,12 @@ function ShowWindowFromResource( node )
toOpenWindow(desiredWindow);
}
}
function zoomWindow()
{
if (window.windowState == STATE_NORMAL)
window.maximize();
else
window.restore();
}
#endif

7
mozilla/mail/base/content/mailWindowOverlay.xul
View File

@@ -277,7 +277,8 @@
#ifdef XP_MACOSX
<commandset id="macWindowMenuItems">
<!-- Mac Window menu -->
<command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
<command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
<command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
<command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
<command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
</commandset>
@@ -392,7 +393,7 @@
<key id="key_mail" key="&messengerCmd.commandkey;" oncommand="toMessengerWindow();" modifiers="accel"/>
<key id="key_addressbook" key="&addressBookCmd.commandkey;" oncommand="toAddressBook();" modifiers="accel"/>
#ifdef XP_MACOSX
<!-- Mac Window keys -->
<!-- Mac Window and Help menu keys -->
<key id="key_minimizeWindow" command="minimizeWindow" key="&minimizeWindow.key;" modifiers="accel"/>
<key id="key_macHelp" key="&hintsAndTipsMac.commandkey;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');" modifiers="accel"/>
#endif
@@ -1654,7 +1655,7 @@
</template>
<menupopup id="windowPopup">
<menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem label="&zoomWindow.label;" disabled="true"/>
<menuitem command="zoomWindow"/>
<menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/>
<menuseparator/>

3
mozilla/mail/base/content/messageWindow.xul
View File

@@ -82,6 +82,9 @@
<commandset id="mailEditContextMenuItems"/>
<commandset id="tasksCommands"/>
<commandset id="commandKeys"/>
#ifdef XP_MACOSX
<commandset id="macWindowMenuItems"/>
#endif
</commandset>
<broadcasterset id="mailBroadcasters">

5
mozilla/mail/components/addrbook/content/addressbook.xul
View File

@@ -95,7 +95,8 @@
<command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')" disabled="true"/>
#ifdef XP_MACOSX
<!-- Mac Window menu -->
<command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
<command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
<command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
<command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
#endif
</commandset>
@@ -442,7 +443,7 @@
</template>
<menupopup id="windowPopup">
<menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem label="&zoomWindow.label;" disabled="true"/>
<menuitem command="zoomWindow"/>
<menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/>
<menuseparator/>

5
mozilla/mail/components/compose/content/messengercompose.xul
View File

@@ -139,7 +139,8 @@
#ifdef XP_MACOSX
<!-- Mac Window menu -->
<command id="minimizeWindow" label="&minimizeWindow.label;" disabled="true"/>
<command id="minimizeWindow" label="&minimizeWindow.label;" oncommand="window.minimize();"/>
<command id="zoomWindow" label="&zoomWindow.label;" oncommand="zoomWindow();"/>
<command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
<command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
#endif
@@ -479,7 +480,7 @@
</template>
<menupopup id="windowPopup">
<menuitem command="minimizeWindow" key="key_minimizeWindow"/>
<menuitem label="&zoomWindow.label;" disabled="true"/>
<menuitem command="zoomWindow"/>
<menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/>
<menuseparator/>