Use c2pstrcpy() rather than silly sprintf() tricks.

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

diff --git a/mac/mac_res.r b/mac/mac_res.r
index 01ac6b1..ee34fe1 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1,6 +1,6 @@
-/* $Id: mac_res.r,v 1.4 2002/12/13 00:45:08 ben Exp $ */
+/* $Id: mac_res.r,v 1.11 2003/01/09 19:27:29 ben Exp $ */

 /*
 /*

- * Copyright (c) 1999 Ben Harris
+ * Copyright (c) 1999, 2002 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


@@ -27,9 +27,16 @@
 
 /* PuTTY resources */
 
 
 /* PuTTY resources */
 

-#include "Types.r"
-#include "Dialogs.r"
-#include "Palettes.r"
+/*
+ * The space after the # for system includes is to stop mkfiles.pl
+ * trying to chase them (Rez doesn't support the angle-bracket
+ * syntax).
+ */
+
+# include "Types.r"
+# include "Dialogs.r"
+# include "Palettes.r"
+# include "Script.r"

 
 /* Get resource IDs we share with C code */
 #include "macresid.h"
 
 /* Get resource IDs we share with C code */
 #include "macresid.h"


@@ -50,7 +57,7 @@ resource 'SIZE' (-1) {
     reserved,
     ignoreSuspendResumeEvents,
     reserved,
     reserved,
     ignoreSuspendResumeEvents,
     reserved,

-    cannotBackground,
+    canBackground,

     needsActivateOnFGSwitch,
     backgroundAndForeground,
     dontGetFrontClicks,
     needsActivateOnFGSwitch,
     backgroundAndForeground,
     dontGetFrontClicks,


@@ -336,6 +343,53 @@ resource 'icl8' (130, purgeable) {
        $"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
        $"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 

+resource 'vers' (1, purgeable) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    development,
+#endif
+    0, /* No prerelease version */
+    verBritain,
+#ifdef RELEASESTR
+    RELEASESTR,
+    "Release " RELEASESTR,
+#else
+#ifdef SNAPSHOTSTR
+    SNAPSHOTSTR,
+    "Development snapshot " SNAPSHOTSTR,
+#else
+    "unknown",
+    "Unidentified build, " $$Date " " $$Time,
+#endif
+#endif
+};
+
+resource 'vers' (2, purgeable) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    development,
+#endif
+    0, /* No prerelease version */
+    verBritain,
+#ifdef RELEASESTR
+    RELEASESTR,
+    "PuTTY " RELEASESTR,
+#else
+#ifdef SNAPSHOTSTR
+    SNAPSHOTSTR,
+    "PuTTY snapshot " SNAPSHOTSTR,
+#else
+    "unknown",
+    "PuTTY",
+#endif
+#endif
+};

 
 /*
  * Internal resources
 
 /*
  * Internal resources


@@ -354,7 +408,7 @@ resource 'MENU' (mApple, preload) {
     enabled,
     apple,
     {
     enabled,
     apple,
     {

-       "About PuTTYÉ",         noicon, nokey, nomark, plain,
+       "About PuTTY\0xc9",     noicon, nokey, nomark, plain,

        "-",                    noicon, nokey, nomark, plain,
     }
 };
        "-",                    noicon, nokey, nomark, plain,
     }
 };


@@ -362,11 +416,12 @@ resource 'MENU' (mApple, preload) {
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,

-    0b11111111111111111111111111111011,
+    0b11111111111111111111111111110111,

     enabled,
     enabled,

-    "File",
+    "Session",

     {
     {

-       "New Session",          noicon, "N",   nomark, plain,
+       "New",                  noicon, "N",   nomark, plain,
+       "Open\0xc9",            noicon, "O",   nomark, plain,

        "Close",                noicon, "W",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,
        "Close",                noicon, "W",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,


@@ -440,6 +495,32 @@ resource 'CNTL' (cVScroll, "vscroll", purgeable) {
     scrollBarProc, 0, ""
 };
 
     scrollBarProc, 0, ""
 };
 

+/* Settings dialogue */
+
+resource 'DLOG' (wSettings, "settings", purgeable) {
+    { 0, 0, 46, 240 },
+    noGrowDocProc,
+    invisible,
+    goAway,
+    wSettings,
+    wSettings,
+    "Settings",
+    staggerParentWindowScreen
+};
+
+resource 'dlgx' (wSettings, "settings", purgeable) {
+    versionZero {
+       kDialogFlagsUseThemeBackground | kDialogFlagsUseThemeControls
+    }
+};
+
+resource 'DITL' (wSettings, "settings", purgeable) {
+    {
+       { 13, 13, 33, 227 },
+       Button { enabled, "Open" },
+    }
+};        
+

 /* "About" box */
 
 resource 'DLOG' (wAbout, "about", purgeable) {
 /* "About" box */
 
 resource 'DLOG' (wAbout, "about", purgeable) {


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

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