This is the mail archive of the
cygwin-patches@sources.redhat.com
mailing list for the Cygwin project.
cinstall patches
- To: cygwin-patches at sources dot redhat dot com
- Subject: cinstall patches
- From: Matt <matt at use dot net>
- Date: Tue, 26 Dec 2000 03:59:14 -0800
The default selection is to Install from Internet with a Direct
Connection. Now, most users will just press enter to get through the
entire install. Yay! :)
When using Direct Connection, setup.exe leaks socket handles for each file
it gets (can be verified with HandleEx from sysinternals.com). I'll try
and track this down tomorrow if I get a chance.
Tue Dec 26 03:46:00 2000 Matt Hargett <matt@use.net>
* winsup/cinstall/res.rc: Added accelerators and improved focus
order. Removed WS_DISABLED from "OK" buttons to accomodate
default focus changes in net.cc and source.cc.
* winsup/cinstall/net.cc (dialog_proc): If no radio button
is selected, a default is selected.
* winsup/cinstall/source.cc (dialog_proc): Ditto.
(check_if_enable_next): Removed. No longer needed since
a radio button will always be selected.
(load_dialog): Removed call to check_if_enable_next.
(dialog_cmd): Ditto. Also added default to switch.
--- //c/temp/winsup/cinstall/res.rc Sun Nov 19 20:55:14 2000
+++ res.rc-new Tue Dec 26 03:13:07 2000
@@ -33,15 +33,15 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15,WS_DISABLED
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
ICON IDI_CYGWIN,-1,5,5,20,20
- CONTROL "Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
+ CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
BS_AUTORADIOBUTTON,55,15,152,10
- CONTROL "Install from Internet",IDC_SOURCE_NETINST,"Button",
+ CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
BS_AUTORADIOBUTTON,55,30,75,10
- CONTROL "Install from Local Directory",IDC_SOURCE_CWD,"Button",
+ CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
BS_AUTORADIOBUTTON,55,45,104,10
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 215, 95
@@ -49,13 +49,13 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Local package directory"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
- EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
- LTEXT "Local Package Directory",IDC_STATIC,55,15,85,11
- PUSHBUTTON "<-- Back",IDC_BACK,55,75,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- PUSHBUTTON "Browse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
+ PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
+ LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11
+ EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,55,75,45,15
END
IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
@@ -63,23 +63,23 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
- EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
- LTEXT "Select install root directory",IDC_STATIC,55,15,85,11
- PUSHBUTTON "<-- Back",IDC_BACK,55,75,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- PUSHBUTTON "Browse...",IDC_ROOT_BROWSE,150,10,34,14
+ PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
+ LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11
+ EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
+ RTEXT "Default &Text File Type :",IDC_STATIC,20,45,100,8
CONTROL "DOS",IDC_ROOT_TEXT,"Button",BS_AUTORADIOBUTTON,125,45,
31,8
CONTROL "Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON,160,
45,30,8
+ RTEXT "&Install For :",IDC_STATIC,55,60,65,8
CONTROL "All",IDC_ROOT_SYSTEM,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,125,60,25,8
CONTROL "Just Me",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON,160,
60,50,8
- RTEXT "Default Text File Type :",IDC_STATIC,20,45,100,8
- RTEXT "Install For :",IDC_STATIC,55,60,65,8
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,55,75,45,15
END
IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
@@ -87,13 +87,13 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,105,185,45,15
- PUSHBUTTON "Cancel",IDCANCEL,170,185,45,15
- LTEXT "Select Download Site",IDC_STATIC,55,5,135,11
- PUSHBUTTON "<-- Back",IDC_BACK,60,185,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11
LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "&Next -->",IDOK,105,185,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,170,185,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,60,185,45,15
END
IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
@@ -101,12 +101,12 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
+ ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11
EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
- LTEXT "Select URL to download from",IDC_STATIC,55,15,135,11
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
- PUSHBUTTON "<-- Back",IDC_BACK,55,75,45,15
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ PUSHBUTTON "<-- &Back",IDC_BACK,55,75,45,15
END
IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95
@@ -114,22 +114,22 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15,WS_DISABLED
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- CONTROL "Use IE5 Settings",IDC_NET_IE5,"Button",
+ CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
BS_AUTORADIOBUTTON,55,10,69,10
- CONTROL "Direct Connection",IDC_NET_DIRECT,"Button",
+ CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
BS_AUTORADIOBUTTON,55,25,73,10
- CONTROL "Use HTTP/FTP Proxy:",IDC_NET_PROXY,"Button",
+ CONTROL "Use HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",
BS_AUTORADIOBUTTON,55,40,88,10
- EDITTEXT IDC_PROXY_HOST,65,55,80,12,ES_AUTOHSCROLL | WS_DISABLED
- LTEXT "Proxy",IDC_STATIC,10,55,50,15,SS_CENTERIMAGE,
+ LTEXT "Proxy &Host",IDC_STATIC,10,55,50,15,SS_CENTERIMAGE,
WS_EX_RIGHT
- LTEXT "Port",IDC_STATIC,155,55,20,15,SS_CENTERIMAGE,
+ EDITTEXT IDC_PROXY_HOST,65,55,80,12,ES_AUTOHSCROLL | WS_DISABLED
+ LTEXT "Por&t",IDC_STATIC,155,55,20,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_PROXY_PORT,180,55,30,12,ES_AUTOHSCROLL | WS_DISABLED
- PUSHBUTTON "<-- Back",IDC_BACK,55,75,45,15
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,55,75,45,15
END
IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
@@ -138,13 +138,13 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND |
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
+ ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Downloading...",IDC_STATIC,55,15,135,8
LTEXT "(URL)",IDC_DLS_URL,55,30,150,8
LTEXT "(RATE)",IDC_DLS_RATE,55,45,155,8
CONTROL "Progress1",IDC_DLS_PROGRESS,"msctls_progress32",
PBS_SMOOTH | WS_BORDER,55,60,155,10
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
END
IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
@@ -153,13 +153,13 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND |
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
+ ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8
LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8
LTEXT "(FILE)",IDC_INS_FILE,55,25,155,8
CONTROL "Progress1",IDC_INS_DISKFULL,"msctls_progress32",
PBS_SMOOTH | WS_BORDER,55,60,155,10
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
CONTROL "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",
PBS_SMOOTH | WS_BORDER,55,50,155,10
CONTROL "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",
@@ -175,14 +175,14 @@ CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
- LTEXT "Proxy User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ LTEXT "&Password",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
- LTEXT "Password",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
- WS_EX_RIGHT
LTEXT "Proxy Authorization Required",IDC_STATIC,65,10,145,10
- DEFPUSHBUTTON "OK",IDOK,100,75,45,15,WS_DISABLED
+ DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
@@ -192,14 +192,14 @@ CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
- LTEXT "User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ LTEXT "&Password",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL
- LTEXT "Password",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE,
- WS_EX_RIGHT
LTEXT "Server Authorization Required",IDC_STATIC,65,10,145,10
- DEFPUSHBUTTON "OK",IDOK,100,75,45,15,WS_DISABLED
+ DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
@@ -208,8 +208,6 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
8
@@ -217,6 +215,8 @@ BEGIN
LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8
LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150,
10
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206
@@ -224,11 +224,8 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,175,185,45,15
- PUSHBUTTON "Cancel",IDCANCEL,240,185,45,15
- LTEXT "Select packages to install",IDC_STATIC,55,5,85,8
- PUSHBUTTON "<-- Back",IDC_BACK,130,185,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ LTEXT "Select packages to install",IDC_STATIC,55,5,85,8
CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
WS_VISIBLE,55,15,230,155
CONTROL "SPIN",IDC_STATIC,"Static",SS_BITMAP,55,170,15,13
@@ -238,6 +235,9 @@ BEGIN
PUSHBUTTON "Exp",IDC_CHOOSE_EXP,215,5,25,10
PUSHBUTTON "Curr",IDC_CHOOSE_CURR,190,5,25,10
PUSHBUTTON "Prev",IDC_CHOOSE_PREV,165,5,25,10
+ DEFPUSHBUTTON "&Next -->",IDOK,175,185,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,240,185,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,130,185,45,15
END
IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
@@ -245,14 +245,14 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
CAPTION "Cygwin Setup"
FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "Next -->",IDOK,100,75,45,15
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
- PUSHBUTTON "<-- Back",IDC_BACK,55,75,45,15
ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- CONTROL "Create Desktop Icon",IDC_ROOT_DESKTOP,"Button",
+ CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
BS_AUTOCHECKBOX,55,25,100,8
- CONTROL "Add to Start Menu",IDC_ROOT_MENU,"Button",
+ CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
BS_AUTOCHECKBOX,55,40,100,8
+ DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+ PUSHBUTTON "<-- &Back",IDC_BACK,55,75,45,15
END
--- //c/temp/winsup/cinstall/net.cc Thu Sep 7 20:59:06 2000
+++ net.cc-new Tue Dec 26 03:25:22 2000
@@ -126,6 +126,13 @@ dialog_proc (HWND h, UINT message, WPARA
{
case WM_INITDIALOG:
load_dialog (h);
+
+ // Check to see if any radio buttons are selected. If not, select a default.
+ if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED)
+ && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED))
+ {
+ SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0);
+ }
return FALSE;
case WM_COMMAND:
return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
--- //c/temp/winsup/cinstall/source.cc Thu Sep 7 20:59:06 2000
+++ source.cc-new Tue Dec 26 03:26:17 2000
@@ -27,20 +27,13 @@ static char *cvsid = "\n%%% $Id: source.
#include "msg.h"
#include "log.h"
-static int rb[] = { IDC_SOURCE_DOWNLOAD, IDC_SOURCE_NETINST, IDC_SOURCE_CWD, 0 };
-
-static void
-check_if_enable_next (HWND h)
-{
- EnableWindow (GetDlgItem (h, IDOK), source ? 1 : 0);
-}
+static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 };
static void
load_dialog (HWND h)
{
int i;
rbset (h, rb, source);
- check_if_enable_next (h);
}
static void
@@ -60,7 +53,6 @@ dialog_cmd (HWND h, int id, HWND hwndctl
case IDC_SOURCE_NETINST:
case IDC_SOURCE_CWD:
save_dialog (h);
- check_if_enable_next (h);
break;
case IDOK:
@@ -76,6 +68,9 @@ dialog_cmd (HWND h, int id, HWND hwndctl
case IDCANCEL:
NEXT (0);
break;
+
+ default:
+ break;
}
}
@@ -86,6 +81,12 @@ dialog_proc (HWND h, UINT message, WPARA
{
case WM_INITDIALOG:
load_dialog (h);
+ // Check to see if any radio buttons are selected. If not, select a default.
+ if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED)
+ && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED))
+ {
+ SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0);
+ }
return FALSE;
case WM_COMMAND:
return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);