This commit was generated by cvs2svn to compensate for changes in r5670,
[chise/xemacs-chise.git.1] / netinstall / res.rc
index e6133c0..2d59534 100644 (file)
@@ -33,20 +33,20 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "XEmacs Setup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "Next >",IDOK,199,176,45,15, WS_GROUP\r
+    DEFPUSHBUTTON   "Next >",IDOK,199,176,45,15,WS_DISABLED\r
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15\r
-    CONTROL         "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,102,152,10\r
-    CONTROL         "Install from the Internet",IDC_SOURCE_NETINST,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,121,87,10\r
-    CONTROL         "Install from Local Directory",IDC_SOURCE_CWD,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,140,104,10\r
     LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
     LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
     LTEXT           "Setup will use the following installation method.",\r
                     IDC_STATIC,112,11,170,17\r
     LTEXT           "To exit setup click Cancel at any time.",IDC_STATIC,112,\r
                     32,166,17\r
+    CONTROL         "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",\r
+                    BS_AUTORADIOBUTTON,127,102,152,10\r
+    CONTROL         "Install from the Internet",IDC_SOURCE_NETINST,"Button",\r
+                    BS_AUTORADIOBUTTON,127,121,87,10\r
+    CONTROL         "Install from Local Directory",IDC_SOURCE_CWD,"Button",\r
+                    BS_AUTORADIOBUTTON,127,140,104,10\r
     GROUPBOX        "Installation method",IDC_STATIC,113,84,188,77\r
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
 END\r
@@ -142,26 +142,26 @@ BEGIN
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
 END\r
 \r
-IDD_NET DIALOG DISCARDABLE  0, 0, 311, 201\r
+IDD_NET DIALOGEX 0, 0, 311, 201\r
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "XEmacs Setup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "Next >",IDOK,199,176,45,15,WS_GROUP\r
+    DEFPUSHBUTTON   "Next >",IDOK,199,176,45,15\r
     PUSHBUTTON      "< Back",IDC_BACK,154,176,45,15\r
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15\r
     LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
     LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
     LTEXT           "Setup will use the following connection method.",\r
-                    IDC_STATIC,112,11,170,17,NOT WS_GROUP\r
+                    IDC_STATIC,112,11,170,17\r
     LTEXT           "To exit setup click Cancel at any time.",IDC_STATIC,112,\r
-                    32,166,17,NOT WS_GROUP\r
+                    32,166,17\r
     CONTROL         "Use IE5 Settings",IDC_NET_IE5,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,93,69,10\r
+                    BS_AUTORADIOBUTTON,128,93,69,10\r
     CONTROL         "Direct Connection",IDC_NET_DIRECT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,109,73,10\r
+                    BS_AUTORADIOBUTTON,128,109,73,10\r
     CONTROL         "Use HTTP/FTP Proxy:",IDC_NET_PROXY,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,124,88,10\r
+                    BS_AUTORADIOBUTTON,128,124,88,10\r
     EDITTEXT        IDC_PROXY_HOST,128,141,80,12,ES_AUTOHSCROLL | \r
                     WS_DISABLED\r
     LTEXT           "Proxy",IDC_STATIC,10,55,50,15,SS_CENTERIMAGE,\r
@@ -174,70 +174,41 @@ BEGIN
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
 END\r
 \r
-IDD_DLSTATUS DIALOG DISCARDABLE  0, 0, 311, 201\r
+IDD_DLSTATUS DIALOG DISCARDABLE  0, 0, 215, 95\r
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | \r
     WS_CAPTION | WS_SYSMENU\r
 CAPTION "XEmacs Setup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15\r
-    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "Downloading Packages",IDC_STATIC,112,10,170,17\r
-    LTEXT           "(URL)",IDC_DLS_URL,112,26,170,11\r
-    LTEXT           "(RATE)",IDC_DLS_RATE,112,41,166,11\r
+    PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15\r
+    LTEXT           "Downloading...",IDC_STATIC,55,15,135,8\r
+    LTEXT           "(URL)",IDC_DLS_URL,55,30,150,8\r
+    LTEXT           "(RATE)",IDC_DLS_RATE,55,45,155,8\r
     CONTROL         "Progress1",IDC_DLS_PROGRESS,"msctls_progress32",\r
-                    WS_BORDER,123,143,165,10\r
-    GROUPBOX        "Progress",IDC_STATIC,112,130,186,31\r
-    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
+                    PBS_SMOOTH | WS_BORDER,55,60,155,10\r
+    ICON            IDI_XEMACS,IDC_STATIC,5,5,20,20\r
 END\r
 \r
-IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 311, 201\r
+IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 215, 95\r
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | \r
     WS_CAPTION | WS_SYSMENU\r
 CAPTION "XEmacs Setup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15\r
-    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "Installing Packages",IDC_STATIC,112,10,170,17\r
-    LTEXT           "(PKG)",IDC_INS_PKG,112,26,170,11\r
-    LTEXT           "(FILE)",IDC_INS_FILE,112,41,166,11\r
+    PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15\r
+    LTEXT           "Installing...",IDC_INS_ACTION,55,5,135,8\r
+    LTEXT           "(PKG)",IDC_INS_PKG,55,15,150,8\r
+    LTEXT           "(FILE)",IDC_INS_FILE,55,25,155,8\r
     CONTROL         "Progress1",IDC_INS_DISKFULL,"msctls_progress32",\r
-                    WS_BORDER,123,143,165,10\r
+                    PBS_SMOOTH | WS_BORDER,55,60,155,10\r
+    ICON            IDI_XEMACS,IDC_STATIC,5,5,20,20\r
     CONTROL         "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",\r
-                    WS_BORDER,125,106,163,10\r
+                    PBS_SMOOTH | WS_BORDER,55,50,155,10\r
     CONTROL         "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",\r
-                    WS_BORDER,125,67,163,10\r
-    GROUPBOX        "Disk",IDC_STATIC,112,130,186,31\r
-    GROUPBOX        "Package",IDC_STATIC,112,54,186,31\r
-    GROUPBOX        "Total",IDC_STATIC,112,93,186,31\r
-    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
-END\r
-\r
-IDD_UNINSTALL DIALOG DISCARDABLE  0, 0, 311, 201\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Uninstall XEmacs"\r
-FONT 8, "MS Sans Serif"\r
-BEGIN\r
-    PUSHBUTTON      "Cancel",IDCANCEL,199,176,45,15\r
-    DEFPUSHBUTTON   "Uninstall",IDOK,256,176,45,15\r
-    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "Uninstalling Packages",IDC_STATIC,112,10,170,17\r
-    LTEXT           "(PKG)",IDC_UNINS_PKG,112,26,170,11\r
-    LTEXT           "(FILE)",IDC_UNINS_FILE,112,41,166,11\r
-    CONTROL         "Progress1",IDC_UNINS_DISKFULL,"msctls_progress32",\r
-                    WS_BORDER,123,143,165,10\r
-    CONTROL         "Progress1",IDC_UNINS_IPROGRESS,"msctls_progress32",\r
-                    WS_BORDER,125,106,163,10\r
-    CONTROL         "Progress1",IDC_UNINS_PPROGRESS,"msctls_progress32",\r
-                    WS_BORDER,125,67,163,10\r
-    GROUPBOX        "Disk",IDC_STATIC,112,130,186,31\r
-    GROUPBOX        "Package",IDC_STATIC,112,54,186,31\r
-    GROUPBOX        "Total",IDC_STATIC,112,93,186,31\r
-    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
+                    PBS_SMOOTH | WS_BORDER,55,40,155,10\r
+    RTEXT           "Package",IDC_STATIC,5,40,45,8\r
+    RTEXT           "Total",IDC_STATIC,10,50,40,8\r
+    RTEXT           "Disk",IDC_STATIC,5,60,45,8\r
 END\r
 \r
 IDD_PROXY_AUTH DIALOG DISCARDABLE  0, 0, 215, 95\r
@@ -274,7 +245,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15\r
 END\r
 \r
-IDD_SPLASH DIALOG DISCARDABLE  0, 0, 311, 201\r
+IDD_SPLASH DIALOGEX 0, 0, 311, 201\r
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "XEmacs Setup"\r
 FONT 8, "MS Sans Serif"\r
@@ -325,29 +296,17 @@ BEGIN
     DEFPUSHBUTTON   "Finish",IDOK,199,176,45,15\r
     PUSHBUTTON      "< Back",IDC_BACK,154,176,45,15\r
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15\r
+    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
+    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
     LTEXT           "Setup has now finished. To create desktop shortcuts, please select from the following options.",\r
                     IDC_STATIC,112,11,170,17\r
     LTEXT           "To complete setup click Finish.",IDC_STATIC,112,32,166,\r
                     17\r
     CONTROL         "Create Desktop Icon",IDC_ROOT_DESKTOP,"Button",\r
-                    BS_AUTOCHECKBOX,113,50,100,8\r
+                    BS_AUTOCHECKBOX,113,76,100,8\r
     CONTROL         "Add to Start Menu",IDC_ROOT_MENU,"Button",\r
-                    BS_AUTOCHECKBOX,113,66,100,8\r
-    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
-    CONTROL         "Text",IDC_TXT_TYPE,"Button",BS_AUTOCHECKBOX,209,101,38,\r
-                    8\r
-    CONTROL         "Java",IDC_JAVA_TYPE,"Button",BS_AUTOCHECKBOX,113,100,50,\r
-                    8\r
-    CONTROL         "C",IDC_C_TYPE,"Button",BS_AUTOCHECKBOX,113,116,41,8\r
-    CONTROL         "C++",IDC_CPP_TYPE,"Button",BS_AUTOCHECKBOX,113,133,38,8\r
-    CONTROL         "E-Lisp",IDC_ELISP_TYPE,"Button",BS_AUTOCHECKBOX,113,148,\r
-                    38,8\r
-    LTEXT           "Register XEmacs for these file types:",IDC_STATIC,113,\r
-                    84,166,13\r
-    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP\r
-    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP\r
+                    BS_AUTOCHECKBOX,113,97,100,8\r
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
-    CONTROL         "IDL",IDC_IDL_TYPE,"Button",BS_AUTOCHECKBOX,209,116,38,8\r
 END\r
 \r
 \r
@@ -435,13 +394,6 @@ BEGIN
         HORZGUIDE, 153\r
     END\r
 \r
-    IDD_INSTATUS, DIALOG\r
-    BEGIN\r
-        VERTGUIDE, 112\r
-        VERTGUIDE, 125\r
-        VERTGUIDE, 288\r
-    END\r
-\r
     IDD_PROXY_AUTH, DIALOG\r
     BEGIN\r
         BOTTOMMARGIN, 49\r
@@ -469,8 +421,6 @@ BEGIN
     IDD_DESKTOP, DIALOG\r
     BEGIN\r
         VERTGUIDE, 113\r
-        VERTGUIDE, 209\r
-        HORZGUIDE, 124\r
     END\r
 END\r
 #endif    // APSTUDIO_INVOKED\r
@@ -487,7 +437,7 @@ IDB_RTARROW             BITMAP  DISCARDABLE     "choose-rtarrow.bmp"
 IDB_CHECK_YES           BITMAP  DISCARDABLE     "check-yes.bmp"\r
 IDB_CHECK_NO            BITMAP  DISCARDABLE     "check-no.bmp"\r
 IDB_CHECK_NA            BITMAP  DISCARDABLE     "check-na.bmp"\r
-GNU                     BITMAP  DISCARDABLE     "gnu.bmp"\r
+GNU                 BITMAP  DISCARDABLE     "gnu.bmp"\r
 IDB_GNU                 BITMAP  DISCARDABLE     "gnu.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -499,7 +449,7 @@ STRINGTABLE DISCARDABLE
 BEGIN\r
     IDS_ROOT_SLASH          "Warning: we recommend you do NOT use the root of your hard drive as the XEmacs root.  Proceed anyway?"\r
     IDS_ROOT_SPACE          "You should not choose a root path that include spaces in directory names.  Proceed anyway?"\r
-    IDS_MIRROR_LST          "http://www.xemacs.org/Download/mirrors.lst"\r
+    IDS_MIRROR_LST          "http://ftp.xemacs.org/pub/xemacs/mirrors.lst"\r
     IDS_DIALOG_FAILED       "Unable to create Dialog Box"\r
     IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"\r
     IDS_DOWNLOAD_SHORT      "Download error: %s too short (%d, wanted %d)"\r
@@ -516,12 +466,11 @@ BEGIN
     IDS_ERR_OPEN_READ       "Can't open %s for reading: %s"\r
     IDS_ROOT_ABSOLUTE       "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"\r
     IDS_DOWNLOAD_COMPLETE   "Download Complete"\r
-    IDS_CVSID               "\n%%% $Id: res.rc,v 1.2.2.1 2001/12/17 05:49:18 stephent Exp $\n"\r
+    IDS_CVSID               "\n%%% $Id: res.rc,v 1.1.2.3 2000/12/27 09:35:11 andyp Exp $\n"\r
     IDS_NOLOGFILE           "Cannot open log file %s for writing"\r
     IDS_UNINSTALL_COMPLETE  "Uninstalls complete."\r
     IDS_WININET             "Unable to find or load the Internet Explorer 5 DLLs"\r
     IDS_ERR_CHDIR           "Could not change dir to %s"\r
-    IDS_CREATE_DIR           "The directory %s does not exist, create it?"\r
     IDS_OLD_SETUP_VERSION   "This setup is version %s, but setup.ini claims version %s is available.\nYou might want to upgrade to get the latest features and bug fixes."\r
     IDS_DOWNLOAD_FAILED     "Unable to download %s"\r
     IDS_DOWNLOAD_INCOMPLETE "Download Incomplete.  Try again?"\r
@@ -533,6 +482,24 @@ END
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 \r
+/////////////////////////////////////////////////////////////////////////////\r
+// English (U.K.) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Bitmap\r
+//\r
+\r
+#endif    // English (U.K.) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
 \r
 #ifndef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r