At last, merge the putty-gtk2 branch back into the trunk!

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

diff --git a/mac/macpgen.r b/mac/macpgen.r
index 6d3107b..da0dd55 100644 (file)
--- a/mac/macpgen.r
+++ b/mac/macpgen.r
@@ -1,6 +1,6 @@
-/* $Id: macpgen.r,v 1.1 2003/02/12 23:53:15 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
@@ -58,10 +58,10 @@ resource 'pGen' (0, purgeable) {
 
 resource 'SIZE' (-1) {
     reserved,
-    ignoreSuspendResumeEvents,
+    acceptSuspendResumeEvents,
     reserved,
     canBackground,
-    needsActivateOnFGSwitch,
+    doesActivateOnFGSwitch,
     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 */
@@ -260,6 +290,11 @@ resource 'STR ' (-16397, purgeable) {
     "This file is used internally by PuTTY.  It cannot be opened."
 };
 
+/* Missing-application name string, for private keys. */
+/* XXX Private keys should eventually be owned by Pageant */
+resource 'STR ' (-16396, purgeable) {
+    "PuTTYgen"
+};
 
 /*
  * Internal resources
@@ -387,7 +422,7 @@ resource 'DITL' (wAbout, "about", purgeable) {
        StaticText { disabled, "PuTTYgen"},
        { 42, 13, 74, 227 },
        StaticText { disabled, "Some version or other\n"
-                              "Copyright © 1997-9 Simon Tatham"},
+                              "Copyright © 1997-2008 Simon Tatham"},
     }
 };
 
@@ -408,11 +443,12 @@ type 'TEXT' {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {
-    "Copyright 1997-2003 Simon Tatham.\n"
+    "Copyright 1997-2008 Simon Tatham.\n"
     "\n"
-    "Portions copyright Robert de Bath, Joris van Rantwijk, Delian"
-    "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,"
-    "Justin Bradford, Ben Harris, and CORE SDI S.A.\n"
+    "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
+    "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
+    "Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
+    "Kuhn, Colin Watson, and CORE SDI S.A.\n"
     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "
@@ -435,3 +471,39 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE "
     "SOFTWARE."
 };
+
+/* Key box */
+
+resource 'DLOG' (wKey, "key", purgeable) {
+    { 0, 0, 120, 240 },
+    noGrowDocProc,
+    invisible,
+    goAway,
+    wKey,              /* RefCon -- identifies the window to PuTTY */
+    wKey,              /* DITL ID */
+    "untitled",
+    staggerParentWindowScreen
+};
+
+resource 'dlgx' (wKey, "key", purgeable) {
+    versionZero {
+       kDialogFlagsUseThemeBackground | kDialogFlagsUseThemeControls
+    }
+};
+
+#define cProgress 129
+
+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, ""
+};