projects / chise / xemacs-chise.git.1 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
XEmacs 21.2.43 "Terspichore".
[chise/xemacs-chise.git.1] / netinstall / res.rc
diff --git a/netinstall/res.rc b/netinstall/res.rc
index 2d59534..170aa9d 100644 (file)
--- a/netinstall/res.rc
+++ b/netinstall/res.rc
@@ -142,7 +142,7 @@ BEGIN
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
 END\r
 \r
-IDD_NET DIALOGEX 0, 0, 311, 201\r
+IDD_NET DIALOG 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
@@ -174,41 +174,46 @@ BEGIN
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62\r
 END\r
 \r
-IDD_DLSTATUS DIALOG DISCARDABLE  0, 0, 215, 95\r
+IDD_DLSTATUS DIALOG DISCARDABLE  0, 0, 311, 201\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,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
+    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
     CONTROL         "Progress1",IDC_DLS_PROGRESS,"msctls_progress32",\r
-                    PBS_SMOOTH | WS_BORDER,55,60,155,10\r
-    ICON            IDI_XEMACS,IDC_STATIC,5,5,20,20\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
 END\r
 \r
-IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 215, 95\r
+IDD_INSTATUS DIALOG DISCARDABLE  0, 0, 311, 201\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,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
+    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
     CONTROL         "Progress1",IDC_INS_DISKFULL,"msctls_progress32",\r
-                    PBS_SMOOTH | WS_BORDER,55,60,155,10\r
-    ICON            IDI_XEMACS,IDC_STATIC,5,5,20,20\r
+                    WS_BORDER,123,143,165,10\r
     CONTROL         "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",\r
-                    PBS_SMOOTH | WS_BORDER,55,50,155,10\r
+                    WS_BORDER,125,106,163,10\r
     CONTROL         "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",\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
+                    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_PROXY_AUTH DIALOG DISCARDABLE  0, 0, 215, 95\r
@@ -245,7 +250,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15\r
 END\r
 \r
-IDD_SPLASH DIALOGEX 0, 0, 311, 201\r
+IDD_SPLASH DIALOG 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
@@ -394,6 +399,13 @@ 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
@@ -437,7 +449,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
@@ -466,7 +478,7 @@ 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.1.2.3 2000/12/27 09:35:11 andyp Exp $\n"\r
+    IDS_CVSID               "\n%%% $Id: res.rc,v 1.1.2.4 2001/01/24 09:18:30 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
@@ -482,24 +494,6 @@ 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