Makefile.lcc mentions version.o instead of .obj (not that it matters, probably)

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

diff --git a/mac/mac_res.r b/mac/mac_res.r
index 965b715..fd688d3 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1,6 +1,6 @@
-/* $Id: mac_res.r,v 1.28 2003/02/23 11:58:59 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


@@ -72,8 +72,8 @@ resource 'SIZE' (-1) {
     reserved,
     reserved,
     reserved,
     reserved,
     reserved,
     reserved,

+    2048 * 1024,       /* Preferred size */

     1024 * 1024,       /* Minimum size */
     1024 * 1024,       /* Minimum size */

-    1024 * 1024,       /* Preferred size */

 };
 
 #define FREF_APPL 128
 };
 
 #define FREF_APPL 128


@@ -162,6 +162,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.putty</string>\n"
+    "    <key>CFBundleName</key>                  <string>PuTTY</string>\n"
+    "    <key>CFBundlePackageType</key>           <string>APPL</string>\n"
+    "    <key>CFBundleSignature</key>             <string>pTTY</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 */
 
 /* Application icon */
 /* Icons, courtesy of DeRez */
 
 /* Application icon */


@@ -865,13 +895,15 @@ resource 'MENU' (mApple, preload) {
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,

-    0b11111111111111111111111101111011,
+    0b11111111111111111111110111101011,

     enabled,
     enabled,

-    "Session",
+    "File",

     {
        "New",                  noicon, "N",   nomark, plain,
        "Open\0xc9",            noicon, "O",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,
     {
        "New",                  noicon, "N",   nomark, plain,
        "Open\0xc9",            noicon, "O",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,

+       "Change Settings",      noicon, nokey, nomark, plain,
+       "-",                    noicon, nokey, nomark, plain,

        "Close",                noicon, "W",   nomark, plain,
        "Save",                 noicon, "S",   nomark, plain,
        "Save As\0xc9",         noicon, nokey, nomark, plain,
        "Close",                noicon, "W",   nomark, plain,
        "Save",                 noicon, "S",   nomark, plain,
        "Save As\0xc9",         noicon, nokey, nomark, plain,


@@ -941,6 +973,186 @@ resource 'DITL' (wFatal, "fatalbox", purgeable) {
        }
 };
 
        }
 };
 

+/* Caution box.  Stolen from the Finder. */
+
+resource 'ALRT' (wQuestion, "questionbox", purgeable) {
+       {54, 67, 152, 435},
+       wQuestion,
+       beepStages,
+       alertPositionMainScreen
+};
+
+resource 'DITL' (wQuestion, "fatalbox", purgeable) {
+       {       /* array DITLarray: 3 elements */
+               /* [1] */
+               {68, 299, 88, 358},
+               Button {
+                       enabled,
+                       "OK"
+               },
+               /* [2] */
+               {68, 227, 88, 286},
+               Button {
+                       enabled,
+                       "Cancel"
+               },
+               /* [3] */
+               {7, 74, 55, 358},
+               StaticText {
+                       disabled,
+                       "^0"
+               }
+       }
+};
+
+/* Absent host key */
+
+resource 'ALRT' (wAbsent, "absent", purgeable) {
+       {37, 67, 337, 435},
+       wAbsent,
+       beepStages,
+       alertPositionMainScreen
+};
+
+resource 'DITL' (wAbsent, "absent", purgeable) {
+       {       /* array DITLarray: 8 elements */
+               /* [1] */
+               {10, 72, 60, 357},
+               StaticText {
+                       disabled,
+                       "The server's host key is not cached.  You "
+                       "have no guarantee that the server is the "
+                       "computer you think it is."
+               },
+               /* [2] */
+               {65, 72, 113, 355},
+               StaticText {
+                       disabled,
+                       "The server's ^0 key fingerprint is:\n^1"
+               },
+               /* [3] */
+               {121, 72, 172, 354},
+               StaticText {
+                       disabled,
+                       "If you trust this host, hit Add Key to add "
+                       "the key to ^2's cache and carry on "
+                       "connecting."
+               },
+               /* [4] */
+               {178, 72, 226, 354},
+               StaticText {
+                       disabled,
+                       "If you want to carry on connecting just "
+                       "once, without adding the key to the cache, "
+                       "select Just Once."
+               },
+               /* [5] */
+               {233, 72, 271, 353},
+               StaticText {
+                       disabled,
+                       "If you do not trust this host, hit Cancel "
+                       "to abandon the connection."
+               },
+               /* [6] */
+               {275, 72, 295, 139},
+               Button {
+                       enabled,
+                       "Add Key"
+               },
+               /* [7] */
+               {275, 217, 295, 277},
+               Button {
+                       enabled,
+                       "Cancel"
+               },
+               /* [8] */
+               {275, 290, 295, 360},
+               Button {
+                       enabled,
+                       "Just Once"
+               }
+       }
+};
+
+/* Wrong host key */
+
+resource 'ALRT' (wWrong, "wrong", purgeable) {
+       {32, 67, 422, 435},
+       wWrong,
+       beepStages,
+       alertPositionMainScreen
+};
+
+resource 'DITL' (wWrong, "wrong", purgeable) {
+       {       /* array DITLarray: 9 elements */
+               /* [1] */
+               {10, 72, 26, 358},
+               StaticText {
+                       disabled,
+                       "WARNING - POTENTIAL SECURITY BREACH!"
+               },
+               /* [2] */
+               {32, 72, 131, 357},
+               StaticText {
+                       disabled,
+                       "The server's host key does not match the "
+                       "one ^0 has cached.  This means that either "
+                       "the server administrator has changed "
+                       "the host key, or you have actually connected "
+                       "to another computer pretending to be the "
+                       "server."
+               },
+               /* [3] */
+               {136, 72, 190, 356},
+               StaticText {
+                       disabled,
+                       "The new ^1 key fingerprint is:\n^2"
+               },
+               /* [4] */
+               {190, 72, 238, 357},
+               StaticText {
+                       disabled,
+                       "If you were expecting this change and "
+                       "trust the new key, hit Update Key to update "
+                       "^0's cache and continue connecting."
+               },
+               /* [5] */
+               {246, 72, 294, 358},
+               StaticText {
+                       disabled,
+                       "If you want to carry on connecting just "
+                       "once, without adding the key to the cache, "
+                       "select Just Once."
+               },
+               /* [6] */
+               {301, 72, 349, 358},
+               StaticText {
+                       disabled,
+                       "If you do not trust this host, hit Cancel "
+                       "to abandon the connection.  This is the "
+                       "ONLY guaranteed safe choice."
+               },
+               /* [7] */
+               {360, 72, 380, 163},
+               Button {
+                       enabled,
+                       "Update Key"
+               },
+               /* [8] */
+               {360, 217, 380, 277},
+               Button {
+                       enabled,
+                       "Cancel"
+               },
+               /* [9] */
+               {360, 290, 380, 360},
+               Button {
+                       enabled,
+                       "Just Once"
+               }
+       }
+};
+

 /* Terminal window */
 
 resource 'WIND' (wTerminal, "terminal", purgeable) {
 /* Terminal window */
 
 resource 'WIND' (wTerminal, "terminal", purgeable) {


@@ -961,30 +1173,16 @@ resource 'CNTL' (cVScroll, "vscroll", purgeable) {
 
 /* Settings dialogue */
 
 
 /* Settings dialogue */
 

-resource 'DLOG' (wSettings, "settings", purgeable) {
-    { 0, 0, 46, 240 },
+resource 'WIND' (wSettings, "settings", purgeable) {
+    { 0, 0, 432, 626 },

     noGrowDocProc,
     invisible,
     goAway,
     noGrowDocProc,
     invisible,
     goAway,

-    wSettings,
-    wSettings,
-    "Settings",
+    0x0,
+    "untitled",

     staggerParentWindowScreen
 };
 
     staggerParentWindowScreen
 };
 

-resource 'dlgx' (wSettings, "settings", purgeable) {
-    versionZero {
-       kDialogFlagsUseThemeBackground | kDialogFlagsUseThemeControls
-    }
-};
-
-resource 'DITL' (wSettings, "settings", purgeable) {
-    {
-       { 13, 13, 33, 227 },
-       Button { enabled, "Open" },
-    }
-};        
-

 /* Event log */
 resource 'WIND' (wEventLog, "event log", purgeable) {
     { 0, 0, 200, 200 },
 /* Event log */
 resource 'WIND' (wEventLog, "event log", purgeable) {
     { 0, 0, 200, 200 },


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

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

     }
 };
 
     }
 };
 


@@ -1044,11 +1242,11 @@ type 'TEXT' {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {

-    "PuTTY is copyright 1997-2003 Simon Tatham.\n"
+    "PuTTY is 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,"

-    "Justin Bradford, Ben Harris, and CORE SDI S.A.\n"
+    "Justin Bradford, Ben Harris, Malcolm Smith, 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 "
     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "


@@ -1071,3 +1269,31 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE "
     "SOFTWARE."
 };
     "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE "
     "SOFTWARE."
 };

+
+/* Custom xDEFs */
+
+data 'CDEF' (CDEF_EditBox) {
+    $"4EF9 00000000"
+};
+data 'CDEF' (CDEF_Default) {
+    $"4EF9 00000000"
+};
+data 'CDEF' (CDEF_ListBox) {
+    $"4EF9 00000000"
+};
+data 'CDEF' (CDEF_GroupBox) {
+    $"43F9 00000000"
+};
+
+/* List box template */
+
+resource 'ldes' (ldes_Default) {
+    versionZero {
+       0, /* rows */
+       1, /* cols */
+       0, 0, /* default cell size */
+       hasVertScroll, noHorizScroll,
+       0, /* LDEF number */
+       noGrowSpace
+    }
+};