zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 16:32:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

The addition of a `Copy' menu item on OS X was really beginning to

Browse Source 
strain my unconventional menu organisation, so I've reverted to
having `File' and `Edit' menus like everyone else.

[originally from svn r5727]
This commit is contained in:
Simon Tatham
2005-05-01 14:05:03 +00:00
parent 850a70a03c
commit 28f655c821
2 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
osx.m
View File

@ -60,13 +60,9 @@
* nested sheet. On the other hand I think there are good
* practical reasons for wanting it that way. Uncertain.
*
* - User feedback suggests we should have `File' and `Edit' menus
* like everyone else, so some menu reorg is probably required,
* along with some documentation rewording.
*
* - User feedback also dislikes nothing happening when you start
* the app; they suggest a finder-like window containing an icon
* for each puzzle type, enabling you to start one easily. Needs
* - User feedback dislikes nothing happening when you start the
* app; they suggest a finder-like window containing an icon for
* each puzzle type, enabling you to start one easily. Needs
* thought.
*
* Grotty implementation details that could probably be improved:
@ -1151,12 +1147,12 @@ void status_bar(frontend *fe, char *text)
@interface AppController : NSObject
{
}
- (void)newGame:(id)sender;
- (void)newGameWindow:(id)sender;
@end
@implementation AppController
- (void)newGame:(id)sender
- (void)newGameWindow:(id)sender
{
const game *g = [sender getPayload];
id win;
@ -1175,7 +1171,7 @@ void status_bar(frontend *fe, char *text)
id item =
initnewitem([DataMenuItem allocWithZone:[NSMenu menuZone]],
menu, gamelist[i]->name, "", self,
@selector(newGame:));
@selector(newGameWindow:));
[item setPayload:(void *)gamelist[i]];
}
}
@ -1216,30 +1212,31 @@ int main(int argc, char **argv)
item = newitem(menu, "Quit", "q", NSApp, @selector(terminate:));
[NSApp setAppleMenu: menu];
menu = newsubmenu([NSApp mainMenu], "Open");
menu = newsubmenu([NSApp mainMenu], "File");
item = newitem(menu, "New Game", "n", NULL, @selector(newGame:));
item = newitem(menu, "Restart Game", "r", NULL, @selector(restartGame:));
item = newitem(menu, "Specific Game", "", NULL, @selector(specificGame:));
[menu addItem:[NSMenuItem separatorItem]];
{
NSMenu *submenu = newsubmenu(menu, "New Window");
int i;
for (i = 0; i < gamecount; i++) {
id item =
initnewitem([DataMenuItem allocWithZone:[NSMenu menuZone]],
menu, gamelist[i]->name, "", controller,
@selector(newGame:));
submenu, gamelist[i]->name, "", controller,
@selector(newGameWindow:));
[item setPayload:(void *)gamelist[i]];
}
}
menu = newsubmenu([NSApp mainMenu], "Game");
item = newitem(menu, "New", "n", NULL, @selector(newGame:));
item = newitem(menu, "Restart", "r", NULL, @selector(restartGame:));
item = newitem(menu, "Specific", "", NULL, @selector(specificGame:));
[menu addItem:[NSMenuItem separatorItem]];
item = newitem(menu, "Close", "w", NULL, @selector(performClose:));
menu = newsubmenu([NSApp mainMenu], "Edit");
item = newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
item = newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
[menu addItem:[NSMenuItem separatorItem]];
item = newitem(menu, "Copy", "c", NULL, @selector(copy:));
[menu addItem:[NSMenuItem separatorItem]];
item = newitem(menu, "Close", "w", NULL, @selector(performClose:));
menu = newsubmenu([NSApp mainMenu], "Type");
typemenu = menu;