Thanks to D H Becker for sending in an icon. I'd have liked to have

[u/mdw/putty] / mac / macpgen.r

diff --git a/mac/macpgen.r b/mac/macpgen.r
index ea0e25d..82a25ff 100644 (file)
--- a/mac/macpgen.r
+++ b/mac/macpgen.r
@@ -1,6 +1,6 @@
-/* $Id: macpgen.r,v 1.2 2003/02/15 14:20:43 ben Exp $ */
+/* $Id$ */

 /*
 /*

- * Copyright (c) 1999, 2002 Ben Harris
+ * Copyright (c) 1999, 2002, 2003 Ben Harris

  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person


@@ -58,10 +58,10 @@ resource 'pGen' (0, purgeable) {
 
 resource 'SIZE' (-1) {
     reserved,
 
 resource 'SIZE' (-1) {
     reserved,

-    ignoreSuspendResumeEvents,
+    acceptSuspendResumeEvents,

     reserved,
     canBackground,
     reserved,
     canBackground,

-    needsActivateOnFGSwitch,
+    doesActivateOnFGSwitch,

     backgroundAndForeground,
     dontGetFrontClicks,
     ignoreAppDiedEvents,
     backgroundAndForeground,
     dontGetFrontClicks,
     ignoreAppDiedEvents,


@@ -111,6 +111,36 @@ resource 'kind' (129) {
     }
 };
 
     }
 };
 

+#if TARGET_API_MAC_CARBON
+/*
+ * Mac OS X Info.plist.
+ * See Tech Note TN2013 for details.
+ * We don't bother with things that Mac OS X seems to be able to get from
+ * other resources.
+ */
+type 'plst' as 'TEXT';
+
+resource 'plst' (0) {
+    "<?xml version='1.0' encoding='UTF-8'?>\n"
+    "<!DOCTYPE plist PUBLIC '-//Apple Computer//DTD PLIST 1.0//EN'\n"
+    " 'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>\n"
+    "<plist version='1.0'>\n"
+    "  <dict>\n"
+    "    <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>\n"
+    "    <key>CFBundleIdentifier</key>\n"
+    "      <string>org.tartarus.projects.putty.puttygen</string>\n"
+    "    <key>CFBundleName</key>                  <string>PuTTYgen</string>\n"
+    "    <key>CFBundlePackageType</key>           <string>APPL</string>\n"
+    "    <key>CFBundleSignature</key>             <string>pGen</string>\n"
+    "  </dict>\n"
+    "</plist>\n"
+};
+
+/* Mac OS X doesn't use this, but Mac OS 9 does. */
+type 'carb' as 'TEXT';
+resource 'carb' (0) { "" };
+#endif
+

 /* Icons, courtesy of DeRez */
 
 /* Random seed icon */
 /* Icons, courtesy of DeRez */
 
 /* Random seed icon */


@@ -392,7 +422,7 @@ resource 'DITL' (wAbout, "about", purgeable) {
        StaticText { disabled, "PuTTYgen"},
        { 42, 13, 74, 227 },
        StaticText { disabled, "Some version or other\n"
        StaticText { disabled, "PuTTYgen"},
        { 42, 13, 74, 227 },
        StaticText { disabled, "Some version or other\n"

-                              "Copyright © 1997-9 Simon Tatham"},
+                              "Copyright © 1997-2005 Simon Tatham"},

     }
 };
 
     }
 };
 


@@ -413,7 +443,7 @@ type 'TEXT' {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {

-    "Copyright 1997-2003 Simon Tatham.\n"
+    "Copyright 1997-2005 Simon Tatham.\n"

     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian"
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,"
     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian"
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,"


@@ -448,8 +478,8 @@ resource 'DLOG' (wKey, "key", purgeable) {
     noGrowDocProc,
     invisible,
     goAway,
     noGrowDocProc,
     invisible,
     goAway,

-    wAbout,            /* RefCon -- identifies the window to PuTTY */
-    wAbout,            /* DITL ID */
+    wKey,              /* RefCon -- identifies the window to PuTTY */
+    wKey,              /* DITL ID */

     "untitled",
     staggerParentWindowScreen
 };
     "untitled",
     staggerParentWindowScreen
 };


@@ -460,8 +490,19 @@ resource 'dlgx' (wKey, "key", purgeable) {
     }
 };
 
     }
 };
 

+#define cProgress 129
+

 resource 'DITL' (wKey, "key", purgeable) {
     {
 resource 'DITL' (wKey, "key", purgeable) {
     {

+       { 13, 13, 33, 227 },
+       Button { enabled, "Generate" },
+       { 46, 13, 12, 227 },
+       Control { enabled, cProgress },

     }
 };
 
     }
 };
 

+resource 'CNTL' (cProgress) {
+    { 46, 13, 12, 227 },
+    0, visible, 0, 0,
+    kControlProgressBarProc, 0, ""
+};