? cinstall-mac-020202-1.patch ? cinstall-mac-020202-2.patch ? res.aps ? Strings.patch Index: res.rc =================================================================== RCS file: /cvs/src/src/winsup/cinstall/res.rc,v retrieving revision 2.36 diff -p -u -r2.36 res.rc --- res.rc 2002/02/18 12:35:23 2.36 +++ res.rc 2002/02/24 07:20:37 @@ -92,7 +92,7 @@ BEGIN 7,0,258,8,NOT WS_GROUP END -IDD_SITE DIALOG DISCARDABLE 0, 0, 317, 179 +IDD_SITE DIALOG DISCARDABLE 0, 0, 317, 179 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT @@ -462,6 +462,10 @@ BEGIN IDS_ERR_RENAME "Can't rename %s to %s: %s" IDS_NOTHING_INSTALLED "Nothing needed to be installed" IDS_INSTALL_COMPLETE "Installation Complete" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_REBOOT_REQUIRED "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot." END @@ -480,6 +484,8 @@ BEGIN IDS_DOWNLOAD_INCOMPLETE "Download Incomplete. Try again?" IDS_INSTALL_INCOMPLETE "Installation incomplete. Check /setup.log.full for details" IDS_VERSION_INFO "Setup.exe version %1" + IDS_CYGWIN_SETUP "Cygwin Setup" + IDS_CYGWIN_SETUP_WITH_PROGRESS "%1!d!%% - Cygwin Setup" END #endif // English (U.S.) resources Index: resource.h =================================================================== RCS file: /cvs/src/src/winsup/cinstall/resource.h,v retrieving revision 2.16 diff -p -u -r2.16 resource.h --- resource.h 2002/01/19 13:33:17 2.16 +++ resource.h 2002/02/24 07:20:37 @@ -28,6 +28,8 @@ #define IDS_DOWNLOAD_INCOMPLETE 26 #define IDS_INSTALL_INCOMPLETE 27 #define IDS_VERSION_INFO 28 +#define IDS_CYGWIN_SETUP 29 +#define IDS_CYGWIN_SETUP_WITH_PROGRESS 30 #define IDD_ROOT 101 #define IDD_SOURCE 102 #define IDD_OTHER_URL 103 @@ -111,7 +113,7 @@ #define IDC_STATIC_WELCOME_TITLE 1061 #define IDC_EDIT_USER_URL 1062 #define IDC_BUTTON_ADD_URL 1063 -#define IDS_REBOOT_REQUIRED 1064 +#define IDS_REBOOT_REQUIRED 1064 #define IDC_STATIC -1 // Next default values for new objects Index: splash.cc =================================================================== RCS file: /cvs/src/src/winsup/cinstall/splash.cc,v retrieving revision 2.8 diff -p -u -r2.8 splash.cc --- splash.cc 2002/01/03 11:27:11 2.8 +++ splash.cc 2002/02/24 07:20:38 @@ -35,7 +35,7 @@ SplashPage::OnInit () ver.Format (IDS_VERSION_INFO, version[0] ? version : "[unknown]"); - SetWindowText (GetDlgItem (IDC_VERSION), ver.c_str ()); + ::SetWindowText (GetDlgItem (IDC_VERSION), ver.c_str ()); // Set the font for the IDC_STATIC_WELCOME_TITLE SetDlgItemFont(IDC_STATIC_WELCOME_TITLE, "Ariel", 12, FW_BOLD); Index: threebar.cc =================================================================== RCS file: /cvs/src/src/winsup/cinstall/threebar.cc,v retrieving revision 2.2 diff -p -u -r2.2 threebar.cc --- threebar.cc 2002/01/03 11:27:11 2.2 +++ threebar.cc 2002/02/24 07:20:38 @@ -25,9 +25,9 @@ #include "propsheet.h" #include "threebar.h" +#include "cistring.h" -bool -ThreeBarProgressPage::Create () +bool ThreeBarProgressPage::Create () { return PropertyPage::Create (IDD_INSTATUS); } @@ -52,19 +52,19 @@ ThreeBarProgressPage::OnInit () void ThreeBarProgressPage::SetText1 (const TCHAR * t) { - SetWindowText (ins_action, t); + ::SetWindowText (ins_action, t); } void ThreeBarProgressPage::SetText2 (const TCHAR * t) { - SetWindowText (ins_pkgname, t); + ::SetWindowText (ins_pkgname, t); } void ThreeBarProgressPage::SetText3 (const TCHAR * t) { - SetWindowText (ins_filename, t); + ::SetWindowText (ins_filename, t); } void @@ -79,6 +79,9 @@ ThreeBarProgressPage::SetBar2 (long prog { int percent = (int) (100.0 * ((double) progress) / (double) max); SendMessage (ins_iprogress, PBM_SETPOS, (WPARAM) percent, 0); + cistring s; + s.Format (IDS_CYGWIN_SETUP_WITH_PROGRESS, percent); + GetOwner ()->SetWindowText (s.c_str ()); } void @@ -126,7 +129,7 @@ ThreeBarProgressPage::OnActivate () } bool -ThreeBarProgressPage::OnMessageApp (UINT uMsg, WPARAM wParam, LPARAM lParam) + ThreeBarProgressPage::OnMessageApp (UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { Index: window.cc =================================================================== RCS file: /cvs/src/src/winsup/cinstall/window.cc,v retrieving revision 2.3 diff -p -u -r2.3 window.cc --- window.cc 2002/01/03 11:27:11 2.3 +++ window.cc 2002/02/24 07:20:39 @@ -19,6 +19,7 @@ #include #include "window.h" +#include "String++.h" ATOM Window::WindowClassAtom = 0; HINSTANCE Window::AppInstance = NULL; @@ -314,4 +315,10 @@ bool FontCounter++; return true; +} + +void +Window::SetWindowText (const String & s) +{ + ::SetWindowText (WindowHandle, s.cstr_oneuse ()); } Index: window.h =================================================================== RCS file: /cvs/src/src/winsup/cinstall/window.h,v retrieving revision 2.3 diff -p -u -r2.3 window.h --- window.h 2002/01/03 11:27:11 2.3 +++ window.h 2002/02/24 07:20:39 @@ -22,6 +22,8 @@ #include +class String; + class Window { static ATOM WindowClassAtom; @@ -84,8 +86,9 @@ public: { return::GetDlgItem (GetHWND (), id); }; - bool SetDlgItemFont(int id, const TCHAR *fontname, int Pointsize, - int Weight = FW_NORMAL, bool Italic = false, bool Underline = false, bool Strikeout = false); + bool SetDlgItemFont (int id, const TCHAR * fontname, int Pointsize, + int Weight = FW_NORMAL, bool Italic = + false, bool Underline = false, bool Strikeout = false); UINT IsButtonChecked (int nIDButton) const; @@ -104,6 +107,9 @@ public: // Center the window on the parent, or on screen if no parent. void CenterWindow (); + + // Set the title of the window. + void SetWindowText (const String & s); };