From eca0d817b7973d678d31608870bea86a141442ab Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 10 Mar 2011 19:03:23 +0000 Subject: Replace the INSTALL file with a template version that is customized to different platforms. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2299 --- pkg/config.make.in | 1 - pkg/osx/GNUmakefile | 4 ++++ pkg/win32/GNUmakefile | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/config.make.in b/pkg/config.make.in index a2bde418..1d1670ec 100644 --- a/pkg/config.make.in +++ b/pkg/config.make.in @@ -21,7 +21,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ DOC_FILES = README \ COPYING \ ChangeLog \ - INSTALL \ NEWS \ BUGS \ NOT-BUGS \ diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index baaec048..f6fa24ff 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -67,6 +67,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ + < $(TOPLEVEL)/man/INSTALL.template \ + > $(STAGING_DIR)/INSTALL + find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true clean : launcher_clean diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile index 31968795..7df4cc16 100644 --- a/pkg/win32/GNUmakefile +++ b/pkg/win32/GNUmakefile @@ -27,6 +27,10 @@ staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) cp $(TOPLEVEL)/$$f staging/$$f.txt; \ unix2dos staging/$$f.txt; \ done + $(TOPLEVEL)/man/simplecpp -D_WIN32 -DPRECOMPILED \ + < $(TOPLEVEL)/man/INSTALL.template \ + > staging/INSTALL.txt + unix2dos staging/INSTALL.txt clean: rm -f $(ZIP) -- cgit v1.2.3 From d4e56754210c2b449c3d7a8dc3eb9886d89ff593 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 10 Mar 2011 19:47:14 +0000 Subject: Include Unix manpages in MacOS package, and set MANPATH to point to them when opening a terminal window. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2302 --- pkg/osx/Execute.m | 2 ++ pkg/osx/GNUmakefile | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'pkg') diff --git a/pkg/osx/Execute.m b/pkg/osx/Execute.m index 608443e2..25f5e67d 100644 --- a/pkg/osx/Execute.m +++ b/pkg/osx/Execute.m @@ -175,6 +175,8 @@ void OpenTerminalWindow(const char *doomwadpath) fprintf(stream, "#!/bin/sh\n"); //fprintf(stream, "set -x\n"); fprintf(stream, "PATH=\"%s:$PATH\"\n", executable_path); + fprintf(stream, "MANPATH=\"%s/man:$(manpath)\"\n", executable_path); + fprintf(stream, "export MANPATH\n"); fprintf(stream, "DOOMWADPATH=\"%s\"\n", doomwadpath); fprintf(stream, "export DOOMWADPATH\n"); fprintf(stream, "rm -f \"%s\"\n", TEMP_SCRIPT); diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index f6fa24ff..f9bb6417 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -73,6 +73,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true + mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6" + cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5" + cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" + clean : launcher_clean rm -f $(DMG) rm -rf $(STAGING_DIR) -- cgit v1.2.3 From 0268c882d96942175f1c6028c636dddce8af593f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 28 Mar 2011 23:48:31 +0000 Subject: Remove the BUGS file as it doesn't really contain any useful information. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2316 --- pkg/config.make.in | 1 - 1 file changed, 1 deletion(-) (limited to 'pkg') diff --git a/pkg/config.make.in b/pkg/config.make.in index 1d1670ec..445e89a9 100644 --- a/pkg/config.make.in +++ b/pkg/config.make.in @@ -22,7 +22,6 @@ DOC_FILES = README \ COPYING \ ChangeLog \ NEWS \ - BUGS \ NOT-BUGS \ CMDLINE \ TODO -- cgit v1.2.3 From b79f27cef85cc975b45ada246ace30b648466483 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 30 Mar 2011 19:16:40 +0000 Subject: Add a symlink hack to work around the fact that OS X doesn't like paths in MANPATH to contain spaces. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2318 --- pkg/osx/Execute.m | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/osx/Execute.m b/pkg/osx/Execute.m index 25f5e67d..ffeddadd 100644 --- a/pkg/osx/Execute.m +++ b/pkg/osx/Execute.m @@ -175,8 +175,19 @@ void OpenTerminalWindow(const char *doomwadpath) fprintf(stream, "#!/bin/sh\n"); //fprintf(stream, "set -x\n"); fprintf(stream, "PATH=\"%s:$PATH\"\n", executable_path); - fprintf(stream, "MANPATH=\"%s/man:$(manpath)\"\n", executable_path); + + // MANPATH is set to point to the directory within the bundle that + // contains the Unix manpages. However, the bundle name or path to + // it can contain a space, and OS X doesn't like this! As a + // workaround, create a symlink in /tmp to point to the real directory, + // and put *this* in MANPATH. + + fprintf(stream, "rm -f \"/tmp/%s.man\"\n", PACKAGE_TARNAME); + fprintf(stream, "ln -s \"%s/man\" \"/tmp/%s.man\"\n", + executable_path, PACKAGE_TARNAME); + fprintf(stream, "MANPATH=\"/tmp/%s.man:$(manpath)\"\n", PACKAGE_TARNAME); fprintf(stream, "export MANPATH\n"); + fprintf(stream, "DOOMWADPATH=\"%s\"\n", doomwadpath); fprintf(stream, "export DOOMWADPATH\n"); fprintf(stream, "rm -f \"%s\"\n", TEMP_SCRIPT); -- cgit v1.2.3 From 1fd0ad08ed4840e681e902bc1b9420a1d41619b4 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 7 May 2011 23:52:26 +0000 Subject: Rework OS X launcher package. Include documentation files within the application bundle and add a help menu with links. Rework .dmg generation to generate a file with a "fancy" background image and overall nicer appearance. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2332 --- pkg/Makefile.am | 3 + pkg/osx/Execute.h | 1 + pkg/osx/Execute.m | 10 + pkg/osx/GNUmakefile | 29 ++- pkg/osx/LauncherManager.h | 6 + pkg/osx/LauncherManager.m | 25 ++ pkg/osx/Resources/launcher.nib/designable.nib | 296 ++++++++++++++++++++++-- pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 24936 -> 27157 bytes pkg/osx/disk/background.png | Bin 0 -> 42578 bytes pkg/osx/disk/dir.DS_Store | Bin 0 -> 8196 bytes pkg/osx/dmgfix | 64 +++++ 11 files changed, 416 insertions(+), 18 deletions(-) create mode 100644 pkg/osx/disk/background.png create mode 100644 pkg/osx/disk/dir.DS_Store create mode 100755 pkg/osx/dmgfix (limited to 'pkg') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index a22e4018..a2850195 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -7,10 +7,13 @@ osx/Resources/wadfile.icns \ osx/Resources/wadfile.png \ osx/Resources/launcher.nib/designable.nib \ osx/Resources/launcher.nib/keyedobjects.nib \ +osx/disk/dir.DS_Store \ +osx/disk/background.png \ osx/GNUmakefile \ osx/Info.plist.in osx/Info-gnustep.plist.in \ osx/PkgInfo \ osx/cp-with-libs \ +osx/dmgfix \ osx/main.m \ osx/AppController.m osx/AppController.h \ osx/Execute.m osx/Execute.h \ diff --git a/pkg/osx/Execute.h b/pkg/osx/Execute.h index 2098be8a..79591f64 100644 --- a/pkg/osx/Execute.h +++ b/pkg/osx/Execute.h @@ -26,6 +26,7 @@ void SetProgramLocation(const char *path); void ExecuteProgram(const char *executable, const char *iwad, const char *args); void OpenTerminalWindow(const char *doomwadpath); +void OpenDocumentation(const char *filename); #endif /* #ifndef LAUNCHER_EXECUTE_H */ diff --git a/pkg/osx/Execute.m b/pkg/osx/Execute.m index ffeddadd..0dcfbb7c 100644 --- a/pkg/osx/Execute.m +++ b/pkg/osx/Execute.m @@ -219,3 +219,13 @@ void OpenTerminalWindow(const char *doomwadpath) withApplication: @"Terminal"]; } +void OpenDocumentation(const char *filename) +{ + NSString *path; + + path = [NSString stringWithFormat: @"%s/Documentation/%s", + executable_path, filename]; + + [[NSWorkspace sharedWorkspace] openFile: path]; +} + diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index f9bb6417..514a208d 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -20,9 +20,17 @@ ifndef GNUSTEP_MAKEFILES # DMG file containing package: -$(DMG) : $(STAGING_DIR) +$(DMG) : tmp.dmg rm -f $@ - hdiutil create -volname "$(PACKAGE_STRING)" -srcdir $(STAGING_DIR) $@ + ./dmgfix "$(realpath tmp.dmg)" "$(PACKAGE_STRING)" "$(PACKAGE_NAME).app" + hdiutil convert -format UDZO -o $@ tmp.dmg + rm -f tmp.dmg + +tmp.dmg : $(STAGING_DIR) + rm -f $@ + hdiutil makehybrid -hfs -hfs-volume-name "$(PACKAGE_STRING)" \ + -hfs-openfolder $(STAGING_DIR) $(STAGING_DIR) \ + -o tmp.dmg endif @@ -46,12 +54,13 @@ APP_BIN_DIR=$(APP_DIR)/Contents/MacOS SRC_INFO_PLIST=Info.plist endif +APP_DOC_DIR=$(APP_BIN_DIR)/Documentation +APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR)) + $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) rm -rf $(STAGING_DIR) mkdir $(STAGING_DIR) - cp $(TOPLEVEL_DOCS) "$(STAGING_DIR)" - mkdir -p "$(APP_TOP_DIR)" cp -R Resources "$(APP_TOP_DIR)" cp PkgInfo "$(APP_TOP_DIR)" @@ -59,6 +68,13 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) mkdir -p "$(APP_BIN_DIR)" + mkdir -p "$(APP_DOC_DIR)" + cp $(TOPLEVEL_DOCS) "$(APP_DOC_DIR)" + + ln -s "$(APP_DOC_RELDIR)/COPYING" "$(STAGING_DIR)/Software License" + ln -s "$(APP_DOC_RELDIR)/README" "$(STAGING_DIR)/README" + ln -s /Applications "$(STAGING_DIR)" + cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" @@ -69,13 +85,16 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ < $(TOPLEVEL)/man/INSTALL.template \ - > $(STAGING_DIR)/INSTALL + > "$(APP_DOC_DIR)/INSTALL" find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6" cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5" cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" + cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store + cp disk/background.png $(STAGING_DIR)/background.png +# setfile -a V $(STAGING_DIR)/background.png clean : launcher_clean rm -f $(DMG) diff --git a/pkg/osx/LauncherManager.h b/pkg/osx/LauncherManager.h index 7e8c35cd..712bc093 100644 --- a/pkg/osx/LauncherManager.h +++ b/pkg/osx/LauncherManager.h @@ -45,6 +45,12 @@ forArgument: (NSString *) args; - (void) openTerminal: (id) sender; +- (void) openREADME: (id) sender; +- (void) openINSTALL: (id) sender; +- (void) openCMDLINE: (id) sender; +- (void) openCOPYING: (id) sender; +- (void) openDocumentation: (id) sender; + @end #endif /* #ifndef LAUNCHER_LAUNCHERMANAGER_H */ diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m index 8c523ab4..df1ad18e 100644 --- a/pkg/osx/LauncherManager.m +++ b/pkg/osx/LauncherManager.m @@ -325,6 +325,31 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) free(doomwadpath); } +- (void) openREADME: (id) sender +{ + OpenDocumentation("README"); +} + +- (void) openINSTALL: (id) sender +{ + OpenDocumentation("INSTALL"); +} + +- (void) openCMDLINE: (id) sender +{ + OpenDocumentation("CMDLINE"); +} + +- (void) openCOPYING: (id) sender +{ + OpenDocumentation("COPYING"); +} + +- (void) openDocumentation: (id) sender +{ + OpenDocumentation(""); +} + - (void) awakeFromNib { [self->launcherWindow setTitle: @PACKAGE_NAME " Launcher"]; diff --git a/pkg/osx/Resources/launcher.nib/designable.nib b/pkg/osx/Resources/launcher.nib/designable.nib index 856ea06f..b3e76d22 100644 --- a/pkg/osx/Resources/launcher.nib/designable.nib +++ b/pkg/osx/Resources/launcher.nib/designable.nib @@ -2,19 +2,19 @@ 1060 - 10F569 - 823 - 1038.29 + 10J869 + 851 + 1038.35 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 851 YES - + - + YES @@ -600,6 +600,73 @@ _NSWindowsMenu + + + Help + + 2147483647 + + + submenuAction: + + Help + + YES + + + Introduction + ? + 1048576 + 2147483647 + + + + + + Set up guide + + 2147483647 + + + + + + Command line reference + + 2147483647 + + + + + + More documentation... + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + Software license + + 2147483647 + + + + + _NSHelpMenu + + _NSMainMenu @@ -921,6 +988,26 @@ 25 + + + 268 + {{17, 16}, {25, 25}} + + YES + + 67239424 + 134217728 + + + + -2038415105 + 161 + + + 200 + 25 + + {480, 316} @@ -1312,6 +1399,54 @@ 322 + + + openINSTALL: + + + + 374 + + + + openCMDLINE: + + + + 376 + + + + openDocumentation: + + + + 378 + + + + openCOPYING: + + + + 381 + + + + openREADME: + + + + 382 + + + + openINSTALL: + + + + 385 + @@ -1442,6 +1577,7 @@ + MainMenu @@ -1693,6 +1829,7 @@ + @@ -2035,6 +2172,73 @@ + + 369 + + + YES + + + + + + 370 + + + YES + + + + + + + + + + + 371 + + + + + 373 + + + + + 375 + + + + + 377 + + + + + 379 + + + + + 380 + + + + + 383 + + + YES + + + + + + 384 + + + @@ -2043,6 +2247,7 @@ YES 129.IBPluginDependency 129.ImportedFromIB2 + 130.IBEditorWindowLastContentRect 130.IBPluginDependency 130.ImportedFromIB2 131.IBPluginDependency @@ -2131,6 +2336,7 @@ 238.ImportedFromIB2 239.IBPluginDependency 239.ImportedFromIB2 + 24.IBEditorWindowLastContentRect 24.IBPluginDependency 24.ImportedFromIB2 240.IBPluginDependency @@ -2158,6 +2364,7 @@ 270.ImportedFromIB2 274.IBPluginDependency 274.ImportedFromIB2 + 275.IBEditorWindowLastContentRect 275.IBPluginDependency 275.ImportedFromIB2 281.IBPluginDependency @@ -2184,10 +2391,22 @@ 349.IBPluginDependency 350.IBPluginDependency 351.IBPluginDependency + 369.IBPluginDependency + 370.IBEditorWindowLastContentRect + 370.IBPluginDependency + 371.IBPluginDependency + 373.IBPluginDependency + 375.IBPluginDependency + 377.IBPluginDependency + 379.IBPluginDependency + 380.IBPluginDependency + 383.IBPluginDependency + 384.IBPluginDependency 5.IBPluginDependency 5.ImportedFromIB2 56.IBPluginDependency 56.ImportedFromIB2 + 57.IBEditorWindowLastContentRect 57.IBPluginDependency 57.ImportedFromIB2 58.IBPluginDependency @@ -2199,6 +2418,7 @@ YES com.apple.InterfaceBuilder.CocoaPlugin + {{576, 728}, {64, 6}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2231,9 +2451,9 @@ P4AAAL+AAABBiAAAwyEAAA - {{337, 406}, {530, 190}} + {{368, 418}, {530, 190}} com.apple.InterfaceBuilder.CocoaPlugin - {{337, 406}, {530, 190}} + {{368, 418}, {530, 190}} @@ -2274,13 +2494,13 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBYAAAwgQAAA + P4AAAL+AAABBYAAAwigAAA - {{329, 484}, {480, 316}} + {{421, 438}, {480, 316}} com.apple.InterfaceBuilder.CocoaPlugin - {{329, 484}, {480, 316}} + {{421, 438}, {480, 316}} {213, 107} @@ -2303,6 +2523,7 @@ com.apple.InterfaceBuilder.CocoaPlugin + {{469, 741}, {194, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2330,6 +2551,7 @@ com.apple.InterfaceBuilder.CocoaPlugin + {{425, 661}, {151, 153}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2340,7 +2562,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{329, 814}, {223, 20}} + {{329, 814}, {272, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2357,9 +2579,21 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{540, 701}, {238, 113}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{341, 611}, {235, 203}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2384,7 +2618,7 @@ - 351 + 385 @@ -2410,6 +2644,7 @@ FirstResponder + NSObject IBUserSource @@ -2560,6 +2795,11 @@ YES launch: + openCMDLINE: + openCOPYING: + openDocumentation: + openINSTALL: + openREADME: openTerminal: runSetup: @@ -2568,6 +2808,11 @@ id id id + id + id + id + id + id @@ -2575,6 +2820,11 @@ YES launch: + openCMDLINE: + openCOPYING: + openDocumentation: + openINSTALL: + openREADME: openTerminal: runSetup: @@ -2584,6 +2834,26 @@ launch: id + + openCMDLINE: + id + + + openCOPYING: + id + + + openDocumentation: + id + + + openINSTALL: + id + + + openREADME: + id + openTerminal: id diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib index 93066265..7df7670c 100644 Binary files a/pkg/osx/Resources/launcher.nib/keyedobjects.nib and b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ diff --git a/pkg/osx/disk/background.png b/pkg/osx/disk/background.png new file mode 100644 index 00000000..07c3d81b Binary files /dev/null and b/pkg/osx/disk/background.png differ diff --git a/pkg/osx/disk/dir.DS_Store b/pkg/osx/disk/dir.DS_Store new file mode 100644 index 00000000..b7104637 Binary files /dev/null and b/pkg/osx/disk/dir.DS_Store differ diff --git a/pkg/osx/dmgfix b/pkg/osx/dmgfix new file mode 100755 index 00000000..560b17ed --- /dev/null +++ b/pkg/osx/dmgfix @@ -0,0 +1,64 @@ +#!/usr/bin/osascript +-- +-- Copyright(C) 2009 Simon Howard +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-- 02111-1307, USA. +-- +-- +-- AppleScript script to automatically set the view properties in a +-- .dmg file - ie. the background image, other Finder view options +-- and icon positions. +-- +-- Usage: dmgfix +-- + +on run argv + set dmgFile to POSIX file (item 1 of argv) + set diskName to item 2 of argv + set appName to item 3 of argv + + tell application "Finder" + --activate + open dmgFile + delay 1 + set win to the front Finder window + set theDisk to disk diskName + set the target of win to theDisk + + -- window options: + + set bgfile to file "background.png" of theDisk + set the bounds of win to {200, 200, 717, 536} + set icon size of icon view options of win to 96 + set background picture of icon view options of win to bgfile + set toolbar visible of win to false + + -- hide background file: + + set bgloc to quoted form of POSIX path of (bgfile as text) + do shell script "SetFile -a V " & bgloc + + -- icon positions: + + set position of file "README" of theDisk to {120, 250} + set position of file "Software License" of theDisk to {380, 250} + set position of file appName of theDisk to {70, 110} + set position of file "Applications" of theDisk to {450, 110} + + eject theDisk + end tell +end run + -- cgit v1.2.3 From 351c1be33154d12b55e658cfb8f3101858fba63c Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 8 May 2011 18:29:46 +0000 Subject: Allow IWAD files to be double-clicked in the finder to set the IWAD configuration. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2334 --- pkg/osx/AppController.m | 8 ++++++++ pkg/osx/IWADController.h | 1 + pkg/osx/IWADController.m | 39 +++++++++++++++++++++++++++++++++++++++ pkg/osx/LauncherManager.h | 1 + pkg/osx/LauncherManager.m | 5 +++++ 5 files changed, 54 insertions(+) (limited to 'pkg') diff --git a/pkg/osx/AppController.m b/pkg/osx/AppController.m index a26a7c9e..ba8dae9b 100644 --- a/pkg/osx/AppController.m +++ b/pkg/osx/AppController.m @@ -83,6 +83,14 @@ { NSString *extension; + // This may be an IWAD. If so, add it to the IWAD configuration; + // don't add it like a PWAD. + + if ([self->launcherManager addIWADPath: fileName]) + { + return YES; + } + // If this is the first file added, clear out the existing // command line. This allows us to select multiple files // in the finder and open them all together (for TCs, etc). diff --git a/pkg/osx/IWADController.h b/pkg/osx/IWADController.h index 90f44667..7464af9f 100644 --- a/pkg/osx/IWADController.h +++ b/pkg/osx/IWADController.h @@ -47,6 +47,7 @@ - (void) saveConfig; - (char *) doomWadPath; - (void) setEnvironment; +- (BOOL) addIWADPath: (NSString *) path; @end diff --git a/pkg/osx/IWADController.m b/pkg/osx/IWADController.m index 3c596850..0c55b3f5 100644 --- a/pkg/osx/IWADController.m +++ b/pkg/osx/IWADController.m @@ -343,5 +343,44 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = //free(env); } +// Examine a path to a WAD and determine whether it is an IWAD file. +// If so, it is added to the IWAD configuration, and true is returned. + +- (BOOL) addIWADPath: (NSString *) path +{ + IWADLocation *iwadList[NUM_IWAD_TYPES]; + NSArray *pathComponents; + NSString *filename; + unsigned int i; + + [self getIWADList: iwadList]; + + // Find an IWAD file that matches the filename in the path that we + // have been given. + + pathComponents = [path pathComponents]; + filename = [pathComponents objectAtIndex: [pathComponents count] - 1]; + + for (i = 0; i < NUM_IWAD_TYPES; ++i) + { + if ([filename caseInsensitiveCompare: IWADFilenames[i]] == 0) + { + // Configure this IWAD. + + [iwadList[i] setLocation: path]; + + // Rebuild dropdown list and select the new IWAD. + + [self setDropdownList]; + [self->iwadSelector selectItemWithTitle:IWADLabels[i]]; + return YES; + } + } + + // No IWAD found with this name. + + return NO; +} + @end diff --git a/pkg/osx/LauncherManager.h b/pkg/osx/LauncherManager.h index 712bc093..1c8a5187 100644 --- a/pkg/osx/LauncherManager.h +++ b/pkg/osx/LauncherManager.h @@ -41,6 +41,7 @@ - (void) runSetup: (id)sender; - (void) awakeFromNib; - (void) clearCommandLine; +- (BOOL) addIWADPath: (NSString *) path; - (void) addFileToCommandLine: (NSString *) fileName forArgument: (NSString *) args; - (void) openTerminal: (id) sender; diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m index df1ad18e..937c0d98 100644 --- a/pkg/osx/LauncherManager.m +++ b/pkg/osx/LauncherManager.m @@ -358,5 +358,10 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) [self setConfig]; } +- (BOOL) addIWADPath: (NSString *) path +{ + return [self->iwadController addIWADPath: path]; +} + @end -- cgit v1.2.3 From 184ea9ba501adf04b9b352760774fde268c0cc7f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 14 May 2011 20:11:26 +0000 Subject: Convert build system to using the PROGRAM_PREFIX system used on raven-branch. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2336 --- pkg/config.make.in | 1 + pkg/osx/GNUmakefile | 9 ++++----- pkg/osx/LauncherManager.m | 6 +++--- pkg/win32/GNUmakefile | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pkg') diff --git a/pkg/config.make.in b/pkg/config.make.in index 445e89a9..8f94f945 100644 --- a/pkg/config.make.in +++ b/pkg/config.make.in @@ -10,6 +10,7 @@ STRIP = @STRIP@ # Package name and version number: +PROGRAM_PREFIX = @PROGRAM_PREFIX@ PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index 514a208d..d53a9981 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -78,10 +78,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" - ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)" - ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" + ./cp-with-libs $(TOPLEVEL)/setup/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup" $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ < $(TOPLEVEL)/man/INSTALL.template \ @@ -94,7 +94,6 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store cp disk/background.png $(STAGING_DIR)/background.png -# setfile -a V $(STAGING_DIR)/background.png clean : launcher_clean rm -f $(DMG) diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m index 937c0d98..69c59577 100644 --- a/pkg/osx/LauncherManager.m +++ b/pkg/osx/LauncherManager.m @@ -294,8 +294,8 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) return; } - ExecuteProgram(PACKAGE_TARNAME, [iwad UTF8String], - [args UTF8String]); + ExecuteProgram(PROGRAM_PREFIX "doom", [iwad UTF8String], + [args UTF8String]); [NSApp terminate:sender]; } @@ -306,7 +306,7 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) [self saveConfig]; [self->iwadController setEnvironment]; - ExecuteProgram("chocolate-setup", NULL, NULL); + ExecuteProgram(PROGRAM_PREFIX "setup", NULL, NULL); } // Invoked when the "Terminal" option is selected from the menu, to open diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile index 7df4cc16..34f2c9bd 100644 --- a/pkg/win32/GNUmakefile +++ b/pkg/win32/GNUmakefile @@ -3,9 +3,9 @@ include ../config.make TOPLEVEL=../.. -EXE_FILES=$(TOPLEVEL)/src/$(PACKAGE_TARNAME).exe \ - $(TOPLEVEL)/src/chocolate-server.exe \ - $(TOPLEVEL)/setup/chocolate-setup.exe +EXE_FILES=$(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom.exe \ + $(TOPLEVEL)/src/$(PROGRAM_PREFIX)server.exe \ + $(TOPLEVEL)/setup/$(PROGRAM_PREFIX)setup.exe DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ $(TOPLEVEL)/src/SDL_mixer.dll \ -- cgit v1.2.3 From 1cfa4409aff87bc730f32744693a02eb7dc57187 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 13 Jun 2011 23:45:10 +0000 Subject: Rework configuration window; add Heretic/Hexen configuration boxes. Subversion-branch: /branches/raven-branch Subversion-revision: 2348 --- pkg/osx/IWADController.m | 4 - pkg/osx/Resources/launcher.nib/designable.nib | 1488 +++++++++++++++-------- pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 27157 -> 30957 bytes 3 files changed, 981 insertions(+), 511 deletions(-) (limited to 'pkg') diff --git a/pkg/osx/IWADController.m b/pkg/osx/IWADController.m index b420d59d..ec181350 100644 --- a/pkg/osx/IWADController.m +++ b/pkg/osx/IWADController.m @@ -279,10 +279,6 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = - (void) awakeFromNib { - // TODO: This is temporary: - self->heretic = self->doom1; - self->hexen = self->doom2; - [self->configWindow center]; // Set configuration for all IWADs from configuration file. diff --git a/pkg/osx/Resources/launcher.nib/designable.nib b/pkg/osx/Resources/launcher.nib/designable.nib index b3e76d22..6bb8f144 100644 --- a/pkg/osx/Resources/launcher.nib/designable.nib +++ b/pkg/osx/Resources/launcher.nib/designable.nib @@ -12,9 +12,9 @@ YES + - YES @@ -679,7 +679,7 @@ 7 2 - {{377, 409}, {480, 316}} + {{377, 417}, {518, 308}} 1886912512 IWAD configuration @@ -695,280 +695,10 @@ 256 YES - - - 256 - {{17, 285}, {446, 11}} - - YES - - 67239424 - 272629760 - Doom IWAD location (doom.wad): - - - - - - - - - 256 - {{20, 255}, {369, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{397, 255}, {63, 23}} - - YES - - 67239424 - 134217728 - Set... - - - -2038021889 - 32 - - - - 400 - 75 - - - - - 256 - {{17, 236}, {446, 11}} - - YES - - 67239424 - 272629760 - Doom II IWAD location (doom2.wad): - - - - - - - - - 256 - {{20, 206}, {369, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{397, 206}, {63, 23}} - - YES - - 67239424 - 134217728 - Set... - - - -2038021889 - 32 - - - - 400 - 75 - - - - - 256 - {{17, 187}, {446, 11}} - - YES - - 67239424 - 272629760 - RmluYWwgRG9vbTogVE5UOiBFdmlsdXRpb24gbG9jYXRpb24gKHRudC53YWQpOgo - - - - - - - - - 256 - {{20, 157}, {369, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{397, 157}, {63, 23}} - - YES - - 67239424 - 134217728 - Set... - - - -2038021889 - 32 - - - - 400 - 75 - - - - - 256 - {{17, 138}, {446, 11}} - - YES - - 67239424 - 272629760 - RmluYWwgRG9vbTogUGx1dG9uaWEgRXhwZXJpbWVudCBsb2NhdGlvbiAocGx1dG9uaWEud2FkKToKA - - - - - - - - - 256 - {{20, 108}, {369, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{397, 108}, {63, 23}} - - YES - - 67239424 - 134217728 - Set... - - - -2038021889 - 32 - - - - 400 - 75 - - - - - 256 - {{17, 89}, {446, 11}} - - YES - - 67239424 - 272629760 - Chex Quest IWAD location (chex.wad): - - - - - - - - - 256 - {{20, 59}, {369, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{397, 59}, {63, 23}} - - YES - - 67239424 - 134217728 - Set... - - - -2038021889 - 32 - - - - 400 - 75 - - 256 - {{384, 12}, {82, 32}} + {{422, 12}, {82, 32}} YES @@ -1008,8 +738,433 @@ 25 + + + 12 + {{13, 42}, {492, 260}} + + + YES + + 1 + + + 256 + + YES + + + 256 + {{14, 200}, {446, 11}} + + YES + + 67239424 + 272629760 + Doom IWAD location (doom.wad): + + + + + + + + + 256 + {{17, 171}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{393, 169}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + + 256 + {{14, 151}, {446, 11}} + + YES + + 67239424 + 272629760 + Doom II IWAD location (doom2.wad): + + + + + + + + + 256 + {{17, 121}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{393, 121}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + + 256 + {{14, 103}, {446, 11}} + + YES + + 67239424 + 272629760 + RmluYWwgRG9vbTogVE5UOiBFdmlsdXRpb24gbG9jYXRpb24gKHRudC53YWQpOgo + + + + + + + + + 256 + {{17, 73}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{395, 73}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + + 256 + {{14, 54}, {446, 11}} + + YES + + 67239424 + 272629760 + RmluYWwgRG9vbTogUGx1dG9uaWEgRXhwZXJpbWVudCBsb2NhdGlvbiAocGx1dG9uaWEud2FkKToKA + + + + + + + + + 256 + {{17, 24}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{395, 24}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + {{10, 33}, {472, 214}} + + + Doom + + + + + 2 + + + 256 + + YES + + + 256 + {{14, 103}, {446, 11}} + + YES + + 67239424 + 272629760 + Chex Quest IWAD location (chex.wad): + + + + + + + + + 256 + {{17, 73}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{395, 73}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + + 256 + {{393, 122}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + + 268 + {{17, 122}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{17, 171}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 256 + {{14, 146}, {446, 17}} + + YES + + 67239424 + 272629760 + Hexen IWAD location (hexen.wad): + + + + + + + + + 256 + {{14, 194}, {446, 17}} + + YES + + 67239424 + 272629760 + Heretic IWAD location (heretic.wad): + + + + + + + + + 256 + {{393, 169}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + + + {{10, 33}, {472, 214}} + + Other games + + + + + + + 0 + YES + YES + + YES + + + - {480, 316} + {518, 308} {{0, 0}, {1440, 878}} @@ -1034,14 +1189,11 @@ AppController - - LauncherManager - - - LauncherManager + + IWADLocation - - LauncherManager + + IWADLocation @@ -1447,6 +1599,54 @@ 385 + + + locationConfigBox + + + + 403 + + + + locationConfigBox + + + + 404 + + + + setButtonClicked: + + + + 411 + + + + setButtonClicked: + + + + 412 + + + + heretic + + + + 413 + + + + hexen + + + + 414 + @@ -1813,161 +2013,12 @@ YES - - - - - - - - - - - - - - - + - - 234 - - - YES - - - - - - 235 - - - YES - - - - - - 236 - - - YES - - - - - - 238 - - - YES - - - - - - 239 - - - YES - - - - - - 240 - - - YES - - - - - - 241 - - - YES - - - - - - 242 - - - YES - - - - - - 243 - - - YES - - - - - - 244 - - - YES - - - - - - 245 - - - YES - - - - - - 246 - - - YES - - - - - - 247 - - - YES - - - - - - 248 - - - YES - - - - - - 249 - - - YES - - - - 250 @@ -2057,187 +2108,468 @@ + + 348 + + + + + 212 + + + YES + + + + + + 213 + + + + + -3 + + + Application + + + 369 + + + YES + + + + + + 370 + + + YES + + + + + + + + + + + 371 + + + + + 373 + + + + + 375 + + + + + 377 + + + + + 379 + + + + + 380 + + + + + 383 + + + YES + + + + + + 384 + + + + + 386 + + + YES + + + + + + + 387 + + + YES + + + + + + 388 + + + YES + + + + + + 389 + + + YES + + + + + + + + + + + + + + 390 + + + YES + + + + + + + + + + + + + + + + + 234 + + + YES + + + + 333 + + 235 + + + YES + + + + 334 + + 236 + + + YES + + + + 335 + + 238 + + + YES + + + + 336 + + 239 + + + YES + + + + 337 + + 240 + + + YES + + + + 338 + + 241 + + + YES + + + + 339 + + 242 + + + YES + + + + 340 + + 243 + + + YES + + + + 341 + + 244 + + + YES + + + + 342 + + 245 + + + YES + + + + 343 + + 246 + + + YES + + + + 344 + + 247 + + + YES + + + + 345 + + 248 + + + YES + + + + 346 + + 249 + + + YES + + + + 347 - 348 - - - - - 212 - + 391 + YES - + - - - - 213 - - - - - -3 - - - Application + - 349 - - + 392 + + - 350 - - + 393 + + + YES + + + - 351 - - + 394 + + - 369 - + 397 + YES - + - + - 370 - + 398 + + + + + 399 + YES - - - - - - + - - - - 371 - - + - 373 - - + 400 + + - 375 - - + 401 + + + HereticIWAD - 377 - - + 402 + + + HexenIWAD - 379 - - + 405 + + + YES + + + - 380 - - + 406 + + - 383 - + 408 + YES - + - + - 384 - - + 409 + + @@ -2327,39 +2659,55 @@ 232.ImportedFromIB2 233.ImportedFromIB2 234.IBPluginDependency + 234.IBViewBoundsToFrameTransform 234.ImportedFromIB2 235.IBPluginDependency + 235.IBViewBoundsToFrameTransform 235.ImportedFromIB2 236.IBPluginDependency + 236.IBViewBoundsToFrameTransform 236.ImportedFromIB2 238.IBPluginDependency + 238.IBViewBoundsToFrameTransform 238.ImportedFromIB2 239.IBPluginDependency + 239.IBViewBoundsToFrameTransform 239.ImportedFromIB2 24.IBEditorWindowLastContentRect 24.IBPluginDependency 24.ImportedFromIB2 240.IBPluginDependency + 240.IBViewBoundsToFrameTransform 240.ImportedFromIB2 241.IBPluginDependency + 241.IBViewBoundsToFrameTransform 241.ImportedFromIB2 242.IBPluginDependency + 242.IBViewBoundsToFrameTransform 242.ImportedFromIB2 243.IBPluginDependency + 243.IBViewBoundsToFrameTransform 243.ImportedFromIB2 244.IBPluginDependency + 244.IBViewBoundsToFrameTransform 244.ImportedFromIB2 245.IBPluginDependency + 245.IBViewBoundsToFrameTransform 245.ImportedFromIB2 246.IBPluginDependency + 246.IBViewBoundsToFrameTransform 246.ImportedFromIB2 247.IBPluginDependency + 247.IBViewBoundsToFrameTransform 247.ImportedFromIB2 248.IBPluginDependency + 248.IBViewBoundsToFrameTransform 248.ImportedFromIB2 249.IBPluginDependency + 249.IBViewBoundsToFrameTransform 249.ImportedFromIB2 250.IBPluginDependency + 250.IBViewBoundsToFrameTransform 250.ImportedFromIB2 270.ImportedFromIB2 274.IBPluginDependency @@ -2388,9 +2736,6 @@ 301.ImportedFromIB2 320.IBPluginDependency 320.ImportedFromIB2 - 349.IBPluginDependency - 350.IBPluginDependency - 351.IBPluginDependency 369.IBPluginDependency 370.IBEditorWindowLastContentRect 370.IBPluginDependency @@ -2401,7 +2746,34 @@ 379.IBPluginDependency 380.IBPluginDependency 383.IBPluginDependency + 383.IBViewBoundsToFrameTransform 384.IBPluginDependency + 386.IBPluginDependency + 386.IBViewBoundsToFrameTransform + 387.IBPluginDependency + 388.IBPluginDependency + 389.IBPluginDependency + 390.IBPluginDependency + 391.IBPluginDependency + 391.IBViewBoundsToFrameTransform + 392.IBPluginDependency + 393.IBPluginDependency + 393.IBViewBoundsToFrameTransform + 394.IBPluginDependency + 397.IBPluginDependency + 397.IBViewBoundsToFrameTransform + 397.ImportedFromIB2 + 399.IBPluginDependency + 399.IBViewBoundsToFrameTransform + 399.ImportedFromIB2 + 401.IBPluginDependency + 402.IBPluginDependency + 405.IBPluginDependency + 405.IBViewBoundsToFrameTransform + 405.ImportedFromIB2 + 408.IBPluginDependency + 408.IBViewBoundsToFrameTransform + 408.ImportedFromIB2 5.IBPluginDependency 5.ImportedFromIB2 56.IBPluginDependency @@ -2498,9 +2870,9 @@ - {{421, 438}, {480, 316}} + {{358, 421}, {518, 308}} com.apple.InterfaceBuilder.CocoaPlugin - {{421, 438}, {480, 316}} + {{358, 421}, {518, 308}} {213, 107} @@ -2514,39 +2886,87 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD24AAw5+AAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwz8AAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxoAAxBJAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAxAqAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBoAAAxAXAAA + {{469, 741}, {194, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxIAAwzQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBYAAAwxcAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBcAAAwwQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxIAAwrwAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBQAAAwswAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBoAAAw9qAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxoAAw9sAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCRAAAwoQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCUAAAwjwAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxYAAwrgAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD2gAAwqIAAA + com.apple.InterfaceBuilder.CocoaPlugin @@ -2576,19 +2996,59 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{540, 701}, {238, 113}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{540, 701}, {238, 113}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwhwAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBUAAAw5YAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwwgAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBgAAAw0EAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABClAAAwwIAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBUAAAw1EAAA + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxIAAww0AAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxIAAw0AAAA + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2618,7 +3078,7 @@ - 385 + 414 @@ -2693,6 +3153,8 @@ configWindow doom1 doom2 + heretic + hexen iwadSelector plutonia tnt @@ -2706,6 +3168,8 @@ id id id + id + id @@ -2716,6 +3180,8 @@ configWindow doom1 doom2 + heretic + hexen iwadSelector plutonia tnt @@ -2738,6 +3204,14 @@ doom2 id + + heretic + id + + + hexen + id + iwadSelector id diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib index 7df7670c..2d9b8594 100644 Binary files a/pkg/osx/Resources/launcher.nib/keyedobjects.nib and b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ -- cgit v1.2.3