Index: state.cc =================================================================== --- state.cc (revision 1161) +++ state.cc (working copy) @@ -27,7 +27,9 @@ bool test_mode; bool safe_mode; +int express_mode_option; int source; +int apache_port_number=80; std::string local_dir; Index: res_de.rc =================================================================== --- res_de.rc (revision 1161) +++ res_de.rc (working copy) @@ -245,8 +245,10 @@ "werden davon nur wenige Pakete installiert. Sie können " "diese Programm jederzeit wieder starten, um bei Bedarf " "Pakete zur löschen, hinzufügen oder zu aktualisieren.",IDC_SPLASH_TEXT,35,25,265,90 - CONTROL "Schnellinstallation",IDC_EXPRESS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,124,265,20 + CONTROL "Schnell Desktopinstallation",IDC_EXPRESS_D,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,104,265,20 + CONTROL "Schnell Web-GISinstallation",IDC_EXPRESS_I,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,124,265,20 CONTROL "Fortgeschrittene Installation",IDC_ADVANCED,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,265,20 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 @@ -383,7 +385,7 @@ CONTROL "GDAL",IDC_PKG_GDAL,"Button", BS_AUTOCHECKBOX,108,78,100,8 CONTROL "Apache",IDC_PKG_APACHE,"Button", - BS_AUTOCHECKBOX,108,93,100,8 + BS_AUTOCHECKBOX,108,93,45,8 CONTROL "uDig",IDC_PKG_UDIG,"Button", BS_AUTOCHECKBOX,108,108,100,8 CONTROL "OpenEV",IDC_PKG_OPENEV,"Button", @@ -391,7 +393,9 @@ CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", BS_AUTOCHECKBOX,108,138,100,8 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - + LTEXT "port number:",IDC_APACHE_PORT_LABEL,154,90,40,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_APACHE_PORT,210,90,25,12,ES_AUTOHSCROLL LTEXT "Pakete wählen",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP END @@ -453,4 +457,16 @@ "Infrastrukturpakete sind, die automatisch behandelt werden." IDS_SELPKG_INSTALL "Pakete zur Installation wählen " IDS_SELPKG_DOWNLOAD "Pakete zum Download wählen " + IDS_LIST_CURRENT "Current" + IDS_LIST_NEW "New" + IDS_LIST_BIN "Bin?" + IDS_LIST_SRC "Src?" + IDS_LIST_CATEGORIES "Categories" + IDS_LIST_SIZE "Size" + IDS_LIST_PACKAGE "Package" + IDS_CAPTION_FULL "Full" + IDS_CAPTION_PARTIAL "Partial" + IDS_CAPTION_UPTODATE "Up To Date" + IDS_CAPTION_NOTINSTALLED "Not Installed" + IDS_CAPTION_CATEGORY "Category" END Index: res_ua.rc =================================================================== --- res_ua.rc (revision 1161) +++ res_ua.rc (working copy) @@ -249,10 +249,12 @@ " ïîäàëüøîìó Âè ìîæåòå âèêîðèñòîâóâàòè öþ ïðîãðàìó äëÿ " "äîäàâàííÿ, âèäàëåííÿ àáî îíîâëåííÿ ïàêåò³â ïðè " "íåîáõ³äíîñò³.",IDC_SPLASH_TEXT,35,25,265,90 - CONTROL "Ñòàíäàðòíà ³íñòàëÿö³ÿ",IDC_EXPRESS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,124,102,10 + CONTROL "Ñòàíäàðòíà Desktop ³íñòàëÿö³ÿ",IDC_EXPRESS,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,104,172,10 + CONTROL "Ñòàíäàðòíà Web-GIS ³íñòàëÿö³ÿ",IDC_EXPRESS,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,124,172,10 CONTROL "Ðîçøèðåíà ³íñòàëÿö³ÿ",IDC_ADVANCED,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,97,10 + BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,97,10 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 END @@ -388,15 +390,18 @@ CONTROL "GDAL",IDC_PKG_GDAL,"Button", BS_AUTOCHECKBOX,108,78,100,8 CONTROL "Apache",IDC_PKG_APACHE,"Button", - BS_AUTOCHECKBOX,108,93,100,8 + BS_AUTOCHECKBOX,108,93,45,8 CONTROL "uDig",IDC_PKG_UDIG,"Button", BS_AUTOCHECKBOX,108,108,100,8 CONTROL "OpenEV",IDC_PKG_OPENEV,"Button", BS_AUTOCHECKBOX,108,123,100,8 CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", BS_AUTOCHECKBOX,108,138,100,8 + LTEXT "port number:",IDC_APACHE_PORT_LABEL,154,90,40,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_APACHE_PORT,210,90,25,12,ES_AUTOHSCROLL + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - LTEXT "Âèáåð³òü ïàêåò",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP END @@ -466,4 +471,16 @@ "âèäàëåíèõ, ìîæëèâî, ¿õ çì³ñò âêëþ÷åíî äî ³íøèõ ïàêåò³â àâòîìàòè÷íî." IDS_SELPKG_INSTALL "Select packages to install " IDS_SELPKG_DOWNLOAD "Select packages to download " + IDS_LIST_CURRENT "Current" + IDS_LIST_NEW "New" + IDS_LIST_BIN "Bin?" + IDS_LIST_SRC "Src?" + IDS_LIST_CATEGORIES "Categories" + IDS_LIST_SIZE "Size" + IDS_LIST_PACKAGE "Package" + IDS_CAPTION_FULL "Full" + IDS_CAPTION_PARTIAL "Partial" + IDS_CAPTION_UPTODATE "Up To Date" + IDS_CAPTION_NOTINSTALLED "Not Installed" + IDS_CAPTION_CATEGORY "Category" END Index: desktop.cc =================================================================== --- desktop.cc (revision 1161) +++ desktop.cc (working copy) @@ -419,7 +419,7 @@ save_dialog (h); if( express_mode ) - return IDD_EXP_PACKAGES; + return (long)express_mode_option; else return IDD_CHOOSE; } Index: res_ru.rc =================================================================== --- res_ru.rc (revision 1161) +++ res_ru.rc (working copy) @@ -249,10 +249,12 @@ "ïàêåò. Âû ìîæåòå èñïîëüçîâàòü äàííóþ ïðîãðàììó â äàëüíåéøåì äëÿ " "äîáàâëåíèÿ, óäàëåíèÿ èëè èçìåíåíèÿ ñîäåðæèìîãî ïàêåòîâ ïðè " "íåîáõîäèìîñòè.",IDC_SPLASH_TEXT,35,25,265,90 - CONTROL "Ñòàíäàðòíàÿ óñòàíîâêà",IDC_EXPRESS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,124,102,10 + CONTROL "Ñòàíäàðòíàÿ Desktop óñòàíîâêà",IDC_EXPRESS,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,104,172,10 + CONTROL "Ñòàíäàðòíàÿ Web-GIS óñòàíîâêà",IDC_EXPRESS,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,124,172,10 CONTROL "Ðàñøèðåííàÿ óñòàíîâêà",IDC_ADVANCED,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,97,10 + BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,97,10 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 END @@ -396,6 +398,9 @@ CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", BS_AUTOCHECKBOX,108,138,100,8 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + LTEXT "port number:",IDC_APACHE_PORT_LABEL,154,90,40,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_APACHE_PORT,210,90,25,12,ES_AUTOHSCROLL LTEXT "Âûáåðèòå ïàêåò",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP @@ -467,4 +472,16 @@ "÷òî èõ ñîäåðæèìîå âêëþ÷åíî â äðóãèå ïàêåòû àâòîìàòè÷åñêè." IDS_SELPKG_INSTALL "Select packages to install " IDS_SELPKG_DOWNLOAD "Select packages to download " + IDS_LIST_CURRENT "Current" + IDS_LIST_NEW "New" + IDS_LIST_BIN "Bin?" + IDS_LIST_SRC "Src?" + IDS_LIST_CATEGORIES "Categories" + IDS_LIST_SIZE "Size" + IDS_LIST_PACKAGE "Package" + IDS_CAPTION_FULL "Full" + IDS_CAPTION_PARTIAL "Partial" + IDS_CAPTION_UPTODATE "Up To Date" + IDS_CAPTION_NOTINSTALLED "Not Installed" + IDS_CAPTION_CATEGORY "Category" END Index: PickView.h =================================================================== --- PickView.h (revision 1161) +++ PickView.h (working copy) @@ -55,6 +55,7 @@ PickView (Category & cat); void init(views _mode); ~PickView(); + char *mode_caption (char *, size_t); const char *mode_caption (); void setObsolete (bool doit); void insert_pkg (packagemeta &); @@ -116,6 +117,7 @@ return _value != rhs._value; } const char *caption (); + int captionvalue (); private: int _value; @@ -124,12 +126,14 @@ class Header { public: - const char *text; + char text[1000]; int width; int x; bool needs_clip; }; + + private: static ATOM WindowClassAtom; HWND listheader; @@ -141,6 +145,7 @@ RECTWrapper lastClientRect; void set_headers (); + void set_hederslabel (); void init_headers (HDC dc); void note_width (Header *hdrs, HDC dc, const std::string& string, int addend, int column); Index: choose.cc =================================================================== --- choose.cc (revision 1161) +++ choose.cc (working copy) @@ -85,6 +85,7 @@ void ChooserPage::createListview () { + char buf[1000]; packagedb db; chooser = new PickView (*db.categories.find("All")); RECT r = getDefaultListViewSize(); @@ -96,7 +97,7 @@ chooser->defaultTrust (TRUST_CURR); chooser->setViewMode (PickView::views::Category); - if (!SetDlgItemText (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption ())) + if (!SetDlgItemText (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption (buf,(sizeof (buf) / sizeof ((buf)[0]))))) log (LOG_BABBLE) << "Failed to set View button caption %ld" << GetLastError () << endLog; for_each (db.packages.begin(), db.packages.end(), bind2nd(mem_fun(&packagemeta::set_requirements), chooser->deftrust)); @@ -256,7 +257,10 @@ bool ChooserPage::OnMessageCmd (int id, HWND hwndctl, UINT code) { - if (code != BN_CLICKED) + + char buf[1000]; + + if (code != (UINT)BN_CLICKED) { // Not a click notification, we don't care. return false; @@ -287,7 +291,7 @@ case IDC_CHOOSE_VIEW: chooser->cycleViewMode (); if (!SetDlgItemText - (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption ())) + (GetHWND (), IDC_CHOOSE_VIEWCAPTION, chooser->mode_caption (buf,(sizeof (buf) / sizeof ((buf)[0]))))) log (LOG_BABBLE) << "Failed to set View button caption " << GetLastError () << endLog; break; Index: resource.h =================================================================== --- resource.h (revision 1161) +++ resource.h (working copy) @@ -34,6 +34,19 @@ #define IDS_SELPKG_DOWNLOAD 131 #define IDS_SELPKG_INSTALL 132 +#define IDS_LIST_CURRENT 133 +#define IDS_LIST_NEW 134 +#define IDS_LIST_BIN 135 +#define IDS_LIST_SRC 136 +#define IDS_LIST_CATEGORIES 137 +#define IDS_LIST_SIZE 138 +#define IDS_LIST_PACKAGE 139 +#define IDS_CAPTION_FULL 140 +#define IDS_CAPTION_PARTIAL 141 +#define IDS_CAPTION_UPTODATE 142 +#define IDS_CAPTION_NOTINSTALLED 143 +#define IDS_CAPTION_CATEGORY 144 + // Dialogs #define IDD_SPLASH 200 @@ -59,9 +72,12 @@ #define IDD_PREREQ 220 #define IDD_DROPPED 221 -#define IDD_EXP_PACKAGES 222 +#define IDD_EXP_PACKAGES 222 #define IDD_APACHE_CONF 223 +#define IDD_EXP_DPACKAGES 224 +#define IDD_EXP_IPACKAGES 225 + // Bitmaps #define IDB_SPIN 300 @@ -167,6 +183,10 @@ #define IDC_EXPRESS 585 #define IDC_ADVANCED 586 +#define IDC_EXPRESS_D 587 +#define IDC_EXPRESS_I 588 +#define IDC_APACHE_PORT 589 +#define IDC_APACHE_PORT_LABEL 590 #define IDC_PKG_MAPSERVER 600 #define IDC_PKG_GRASS 601 @@ -175,3 +195,4 @@ #define IDC_PKG_UDIG 604 #define IDC_PKG_OPENEV 605 #define IDC_PKG_QGIS 606 + Index: state.h =================================================================== --- state.h (revision 1161) +++ state.h (working copy) @@ -36,6 +36,8 @@ extern bool test_mode; extern bool safe_mode; +extern int express_mode_option; +extern int apache_port_number; extern int source; extern std::string local_dir; Index: splash.cc =================================================================== --- splash.cc (revision 1161) +++ splash.cc (working copy) @@ -51,10 +51,28 @@ { HWND h = GetHWND (); - express_mode = (IsDlgButtonChecked (h, IDC_EXPRESS) == BST_CHECKED); - if( express_mode ) + + if (IsDlgButtonChecked (h, IDC_EXPRESS_D) == BST_CHECKED) + { unattended_mode = true; - + // add new global for control EXPESS_DESKTOP INSTALL mode + // int express_mode_option (state.cc) + express_mode_option = IDD_EXP_DPACKAGES; + } + else if (IsDlgButtonChecked (h, IDC_EXPRESS_I) == BST_CHECKED) { + // add new global for control EXPESS_DESKTOP_AND_INTERNET INSTALL mode + // int express_mode_option (state.cc) + unattended_mode = true; + express_mode_option = IDD_EXP_IPACKAGES; + } + else + { + express_mode = 0; + unattended_mode = false; + express_mode_option = 0; + } + + return IDD_SOURCE; } @@ -69,8 +87,10 @@ test_mode = TestOption; safe_mode = SafeModeOption; - CheckDlgButton (h, IDC_EXPRESS, + CheckDlgButton (h, IDC_EXPRESS_D, express_mode ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton (h, IDC_EXPRESS_I, + !express_mode ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton (h, IDC_ADVANCED, !express_mode ? BST_CHECKED : BST_UNCHECKED); Index: express_package.cc =================================================================== --- express_package.cc (revision 1161) +++ express_package.cc (working copy) @@ -52,26 +52,32 @@ typedef struct { const char *package_name; int control_id; + int control_type; // add 2010.02.19 for EXPRESS mode } PackageControlPair; static const PackageControlPair PCPList[] = { - { "mapserver", IDC_PKG_MAPSERVER }, - { "qgis-full", IDC_PKG_QGIS }, - { "apache", IDC_PKG_APACHE }, - { "gdal", IDC_PKG_GDAL }, - { "udig", IDC_PKG_UDIG }, - { "openev", IDC_PKG_OPENEV }, - { "grass", IDC_PKG_GRASS }, - { "", -1 } + { "mapserver", IDC_PKG_MAPSERVER,IDD_EXP_IPACKAGES }, + { "qgis-full", IDC_PKG_QGIS,IDD_EXP_DPACKAGES }, + { "apache", IDC_PKG_APACHE,IDD_EXP_IPACKAGES }, + { "gdal", IDC_PKG_GDAL,1 }, + { "udig", IDC_PKG_UDIG,0 }, + { "openev", IDC_PKG_OPENEV,0 }, + { "grass", IDC_PKG_GRASS,IDD_EXP_DPACKAGES }, + { "", -1 ,-1 } }; + + + static void save_dialog( HWND h ) { packagedb db; int iPCP; + apache_port_number = eget(h,IDC_APACHE_PORT); + for( iPCP = 0; PCPList[iPCP].control_id != -1; iPCP++ ) { packagemeta *pack = @@ -112,20 +118,71 @@ { packagedb db; int iPCP; + bool express_type; + for( iPCP = 0; PCPList[iPCP].control_id != -1; iPCP++ ) { + packagemeta *pack = db.findBinary(PackageSpecification(PCPList[iPCP].package_name)); - assert( pack != NULL ); - + assert( pack != NULL ); + if( pack == NULL ) continue; + // initialize EXPRESS_DESKTOP or INTERNET mode + switch( PCPList[iPCP].control_type ) + { + case 0: + express_type = BST_UNCHECKED; + break; + case 1: + express_type = BST_CHECKED; + break; + case IDD_EXP_DPACKAGES: + express_type = + ( express_mode_option == IDD_EXP_DPACKAGES) ? BST_CHECKED : BST_UNCHECKED; + + EnableWindow (GetDlgItem (h, PCPList[iPCP].control_id), + ( express_mode_option == IDD_EXP_DPACKAGES) ? TRUE : FALSE); + break; + case IDD_EXP_IPACKAGES: + express_type = + ( express_mode_option == IDD_EXP_IPACKAGES) ? BST_CHECKED : BST_UNCHECKED; + + EnableWindow (GetDlgItem (h, PCPList[iPCP].control_id), + ( express_mode_option == IDD_EXP_IPACKAGES) ? TRUE : FALSE); + + break; + default: + express_type = BST_UNCHECKED; + break; + } + + CheckDlgButton (h, PCPList[iPCP].control_id, pack->installed ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton (h, PCPList[iPCP].control_id, + express_type); + + //initialize APACHE_PORT_NUMBER + if (express_mode_option != IDD_EXP_DPACKAGES ){ + if(apache_port_number==0){ + apache_port_number = 80; + } + EnableWindow (GetDlgItem (h, IDC_APACHE_PORT_LABEL),TRUE ); + EnableWindow (GetDlgItem (h, IDC_APACHE_PORT),TRUE ); + eset (h, IDC_APACHE_PORT, apache_port_number); + } + else { + EnableWindow (GetDlgItem (h, IDC_APACHE_PORT_LABEL),FALSE ); + EnableWindow (GetDlgItem (h, IDC_APACHE_PORT),FALSE ); } + + } } ExpressPackageSetupPage::ExpressPackageSetupPage () @@ -177,6 +234,7 @@ while(!p.isMet()) p.selectMissing(); + if (source == IDC_SOURCE_CWD) { // Next, install Index: res_ja.rc =================================================================== --- res_ja.rc (revision 1161) +++ res_ja.rc (working copy) @@ -1,439 +1,460 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -// Throughout, we use the font "MS Shell Dlg". This seems to be necessary to -// work around some not-fully-understood issues with PropertySheets. Hopefully, -// using this font will cause things to 'just work'. Further information on -// this topic is at: -// http://sources.redhat.com/ml/cygwin-apps/2003-05/msg00177.html - -IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒ^ƒCƒv‚Ì‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ƒCƒ“ƒ^[ƒlƒbƒg‚©‚çƒCƒ“ƒXƒg[ƒ‹(&I)\niƒ_ƒEƒ“ƒ[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ÍÄ—˜—p‚Ì‚½‚ß‚É•Û‘¶‚³‚ê‚Ü‚·j", - IDC_SOURCE_NETINST, "Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE - | BS_TOP, - 71, 60, 200, 20 - - CONTROL "ƒCƒ“ƒXƒg[ƒ‹‚¹‚¸‚Ƀ_ƒEƒ“ƒ[ƒh(&D)", - IDC_SOURCE_DOWNLOAD, "Button", - BS_AUTORADIOBUTTON | WS_TABSTOP, - 71, 90, 200, 10 - - CONTROL "ƒ[ƒJƒ‹ƒfƒBƒŒƒNƒgƒŠ‚©‚çƒCƒ“ƒXƒg[ƒ‹(&L)",IDC_SOURCE_CWD,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP, - 71,120,200,10 - - ICON IDI_CYGWIN, IDC_HEADICON, 290, 0, 21, 20 - CONTROL "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN, - 0, 28, 317, 1 - LTEXT "ƒ_ƒEƒ“ƒ[ƒhƒ\[ƒX‚ð‘I‚Ô", IDC_STATIC_HEADER_TITLE, - 7, 0, 258, 8, NOT WS_GROUP - LTEXT "ƒCƒ“ƒ^[ƒlƒbƒg‚©‚çƒCƒ“ƒXƒg[ƒ‹/ƒ_ƒEƒ“ƒ[ƒh‚·‚éA‚ ‚é‚¢‚̓[ƒJƒ‹ƒfƒBƒŒƒNƒgƒŠ‚©‚çƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", - IDC_STATIC, - 21, 9, 239, 16, NOT WS_GROUP -END - -IDD_VIRUS DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚éH" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚é(&D)",IDC_DISABLE_AV,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10 - CONTROL "ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚Ì‚Ý‚ðŽÀs‚·‚é(&L)",IDC_LEAVE_AV,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - LTEXT "ƒCƒ“ƒXƒg[ƒ‹’†ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚é‚©‚ð‘I‘ð‚·‚é",IDC_STATIC_HEADER_TITLE,7,0, - 258,8,NOT WS_GROUP - LTEXT "ƒAƒ“ƒ`ƒEƒCƒ‹ƒXƒvƒƒOƒ‰ƒ€i“Á‚ÉMcAfeej‚ÍOSGeo4W‚̃Cƒ“ƒXƒg[ƒ‹’†AWindows NT/ 2000/ XP‚Ƀuƒ‹[ƒXƒNƒŠ[ƒ“‚ð”­¶‚³‚¹‚錴ˆö‚Æ‚È‚è‚Ü‚·B", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - LTEXT "–â‘肪ŒŸo‚³‚ê‚Ü‚µ‚½BOSGeo4WƒZƒbƒgƒAƒbƒv‚̓Cƒ“ƒXƒg[ƒ‹’†‚±‚ê‚𖳌ø‚É‚Å‚«‚Ü‚·BƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚½‚ç—LŒø‚É‚È‚è‚Ü‚·B", - IDC_STATIC,21,32,239,24,NOT WS_GROUP -END - -IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE, - 7,0,258,8,NOT WS_GROUP - LTEXT "ƒ_ƒEƒ“ƒ[ƒh‚·‚éƒCƒ“ƒXƒg[ƒ‹ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢BƒfƒBƒŒƒNƒgƒŠ‚ª‚È‚¢ê‡‚Í쬂µ‚Ä‚­‚¾‚³‚¢B",IDC_STATIC, - 21,9,248,16,NOT WS_GROUP - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - - GROUPBOX "ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ",IDC_LOCALDIR_GRP,5,72,305,35 - EDITTEXT IDC_LOCAL_DIR,13,85,245,14,ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "ƒuƒ‰ƒEƒY...(&r)",IDC_LOCAL_DIR_BROWSE,260,85,44,14 -END - -IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚Ì‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ƒ‹[ƒgƒCƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE, - 7,0,258,8,NOT WS_GROUP - LTEXT "OSGeo4W‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹ƒpƒ‰ƒ[ƒ^‚à‘I‚ñ‚Å‚­‚¾‚³‚¢B", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - - GROUPBOX "ƒ‹[ƒgƒfƒBƒŒƒNƒgƒŠ",IDC_ROOTDIR_GRP,5,35,305,35 - EDITTEXT IDC_ROOT_DIR,13,47,245,14,ES_AUTOHSCROLL | WS_TABSTOP - PUSHBUTTON "ƒuƒ‰ƒEƒY...(&r)",IDC_ROOT_BROWSE,260,47,44,14,WS_TABSTOP - - GROUPBOX "ƒCƒ“ƒXƒg[ƒ‹",IDC_INSTALLFOR_GRP,5,76,150,101 - CONTROL "‚·‚ׂẴ†[ƒU[i„§j(&A)",IDC_ROOT_SYSTEM,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8 - CONTROL "‚±‚̃†[ƒU[‚Ì‚Ý(&M)",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,130,130,8 - LTEXT "OSGeo4W‚̓VƒXƒeƒ€‚Ì‚·‚ׂẴ†[ƒU[‚ª—˜—p‚Å‚«‚Ü‚·B", - IDC_ALLUSERS_TEXT,25,101,125,28 - LTEXT "OSGeo4W‚Í‚±‚̃†[ƒU[‚µ‚©—˜—p‚Å‚«‚Ü‚¹‚ñBŠÇ—ŽÒ‚ÌŒ ŒÀ‚ª‚È‚¢A‚ ‚é‚¢‚Í“Á’è‚̃j[ƒY‚ª‚ ‚é‚Æ‚«‚Ì‚Ý‘I‘ð‚Å‚«‚Ü‚·B", - IDC_JUSTME_TEXT,25,140,125,32 -END - -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 -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒ_ƒEƒ“ƒ[ƒhƒTƒCƒg‚ð‘I‚Ô" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | - WS_TABSTOP - LTEXT "—˜—p‚Å‚«‚éƒ_ƒEƒ“ƒ[ƒhƒTƒCƒgF",IDC_STATIC,66,34,183,8,NOT - WS_GROUP - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - LTEXT "‚±‚̃ŠƒXƒg‚©‚çƒTƒCƒg‚ð‘I‚ÔA‚ ‚é‚¢‚Í“ÆŽ©‚̃TƒCƒg‚ðƒŠƒXƒg‚ɉÁ‚¦‚Ä‚­‚¾‚³‚¢B", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - LTEXT "ƒ_ƒEƒ“ƒ[ƒhƒTƒCƒg‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE,7,0,258, - 8,NOT WS_GROUP - EDITTEXT IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | - WS_GROUP - LTEXT "ƒ†[ƒU[URLF",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP - PUSHBUTTON "’ljÁ",IDC_BUTTON_ADD_URL,255,160,50,14 -END - -IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|Ú‘±ƒ^ƒCƒv‚Ì‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "’¼ÚÚ‘±‚·‚é(&D)",IDC_NET_DIRECT,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,73,10 - CONTROL "IEÝ’è‚ð—˜—p‚·‚é(&I)",IDC_NET_IE5,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,60,170,69,10 - CONTROL "HTTP/FTPƒvƒƒLƒV‚ð—˜—p‚·‚é(&P):",IDC_NET_PROXY,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,60,185,88,10 - EDITTEXT IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | - WS_DISABLED | WS_GROUP - EDITTEXT IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | - WS_DISABLED - GROUPBOX "",IDC_STATIC,60,95,185,50 - RTEXT "ƒvƒƒLƒVƒzƒXƒg(&H)",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE | - NOT WS_GROUP - RTEXT "ƒ|[ƒg(&t)",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT - WS_GROUP - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - LTEXT "ƒCƒ“ƒ^[ƒlƒbƒg‚ÉÚ‘±‚·‚é•û–@‚ðŽw’肵‚Ü‚·B‰º‹L‚©‚ç“K“–‚ÈÝ’è‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - LTEXT "ƒCƒ“ƒ^[ƒlƒbƒgÚ‘±‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢", - IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP -END - -IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ƒCƒ“ƒXƒg[ƒ‹...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS - LTEXT "iƒpƒbƒP[ƒWj",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS - LTEXT "iƒtƒ@ƒCƒ‹j",IDC_INS_FILE,45,85,205,8,SS_ENDELLIPSIS - CONTROL "Progress1",IDC_INS_DISKFULL,"msctls_progress32", - PBS_SMOOTH | WS_BORDER,95,130,155,10 - CONTROL "Progress1",IDC_INS_IPROGRESS,"msctls_progress32", - PBS_SMOOTH | WS_BORDER,95,115,155,10 - CONTROL "Progress1",IDC_INS_PPROGRESS,"msctls_progress32", - PBS_SMOOTH | WS_BORDER,95,100,155,10 - LTEXT "ƒpƒbƒP[ƒW:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP - LTEXT "‘S‘Ì:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP - LTEXT "ƒfƒBƒXƒN:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - LTEXT "‚±‚̃y[ƒW‚̓_ƒEƒ“ƒ[ƒhA‚ ‚é‚¢‚̓Cƒ“ƒXƒg[ƒ‹‚Ìis󋵂ð•\Ž¦‚µ‚Ä‚¢‚Ü‚·B", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - LTEXT "isó‹µ",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT - WS_GROUP -END - -IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "—v‹‚³‚ꂽƒvƒƒLƒV‚Ì”FØ" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 - LTEXT "ƒvƒƒLƒVƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL - LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "—v‹‚³‚ꂽƒvƒƒLƒV‚Ì”FØ",IDC_STATIC,65,10,145,10 - DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED - PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 -END - -IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "—v‹‚³‚ꂽƒT[ƒo[‚Ì”FØ" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 - LTEXT "ƒvƒƒLƒVƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL - LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "—v‹‚³‚ꂽƒT[ƒo[‚Ì”FØ",IDC_STATIC,65,10,145,10 - DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED - PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 -END - -IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "OSGeo4W‚̃lƒbƒgƒŠƒŠ[ƒX‚³‚ê‚Ä‚¢‚éƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€", - IDC_STATIC_WELCOME_TITLE,35,1,195,24 - LTEXT "‚±‚̃ZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ÍŒã‚É‘±‚­ƒAƒbƒvƒf[ƒg‚Æ“¯‚¶‚悤‚ÉAOSGeo4WŠÂ‹«‚̉Šú‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽg—p‚³‚ê‚Ü‚·B•Û‘¶êŠ‚ð–Y‚ê‚È‚¢‚悤‚É‚µ‚Ä‚­‚¾‚³‚¢B\r\n\r\n" - "‚±‚̃y[ƒWˆÈ~‚ÍAƒCƒ“ƒXƒg[ƒ‹‚̃KƒCƒh‚ð‚µ‚Ü‚·BOSGeo4W‚Í‘½–Ú“I‚̃pƒbƒP[ƒW‚©‚ç\¬‚³‚ê‚Ä‚¢‚Ü‚·B‰ŠúÝ’è‚Å‚ÍAƒpƒbƒP[ƒW‚ÌŠî–{Ý’è‚̂݃Cƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚·B•K—v‚ɉž‚¶‚ÄA’ljÁAíœAƒpƒbƒP[ƒW‚̃AƒbƒvƒOƒŒ[ƒh‚Ì‚½‚ßA‚¢‚Â‚Å‚à‚±‚̃vƒƒOƒ‰ƒ€‚ðŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B", - IDC_SPLASH_TEXT,35,25,265,90 - CONTROL "ƒGƒNƒXƒvƒŒƒXƒCƒ“ƒXƒg[ƒ‹",IDC_EXPRESS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,124,73,10 - CONTROL "ƒAƒhƒoƒ“ƒXƒCƒ“ƒXƒg[ƒ‹",IDC_ADVANCED,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,69,10 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 -END - -IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒXƒe[ƒ^ƒX‚ƃAƒCƒRƒ“‚Ìì¬" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ƒfƒXƒNƒgƒbƒv‚ɃAƒCƒRƒ“‚ð쬂·‚é(&D)",IDC_ROOT_DESKTOP,"Button", - BS_AUTOCHECKBOX,108,78,100,8 - CONTROL "ƒXƒ^[ƒgƒƒjƒ…[‚ɒljÁ(&S)",IDC_ROOT_MENU,"Button", - BS_AUTOCHECKBOX,108,93,100,8 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - LTEXT "OSGeo4WŠÂ‹«‚ÉŠÈ’P‚ɃAƒNƒZƒX‚Å‚«‚éƒAƒCƒRƒ“‚ð쬂µ‚Ä‚­‚¾‚³‚¢B", - IDC_STATIC_HEADER,21,9,239,16,NOT WS_GROUP - LTEXT "ƒAƒCƒRƒ“‚Ìì¬",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT - WS_GROUP - CONTROL "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN, - 0,155,317,1 - LTEXT "ƒCƒ“ƒXƒg[ƒ‹ƒXƒe[ƒ^ƒX",IDC_STATUS_HEADER,7,160,258,8,NOT WS_GROUP - LTEXT "OSGeo4W‚ͳí‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚µ‚½B",IDC_STATUS, - 21,169,239,16,NOT WS_GROUP -END - -IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "—v‹‚³‚ꂽFTP‚Ì”FØ" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 - LTEXT "ƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL - LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, - WS_EX_RIGHT - EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "—v‹‚³‚ꂽFTP‚Ì”FØ",IDC_STATIC,65,10,145,10 - DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED - PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 -END - -IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒpƒbƒP[ƒW‚Ì‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "•ÏX‚È‚µ(&K)",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,99,30,30,14 - CONTROL "‘O‰ñ(&P)",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON , - 134,30,27,14 - CONTROL "Œ»Ý(&C)",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON , - 169,30,25,14 - CONTROL "ŠJ”­”Å(&x)",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON , - 204,30,25,14 - PUSHBUTTON "•\Ž¦(&V)",IDC_CHOOSE_VIEW,239,30,26,14,WS_GROUP - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, - 317,1 - CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT - WS_VISIBLE,7,45,303,122 - CONTROL "”pŽ~‚³‚ꂽƒpƒbƒP[ƒW‚ð‰B‚·(&H)",IDC_CHOOSE_HIDE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - LTEXT "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒpƒbƒP[ƒW‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", - IDC_CHOOSE_INST_TEXT,21,9,239,16,NOT WS_GROUP - LTEXT "ƒpƒbƒP[ƒW‚Ì‘I‘ð",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT - WS_GROUP - LTEXT "",IDC_CHOOSE_VIEWCAPTION,270,33,40,10 -END - -IDD_PREREQ DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|‰ðŒˆ‚·‚éˆË‘¶«" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN, - 0,28,317,1 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - LTEXT "ŒxIˆË‘¶ŠÖŒW‚Ì•s®‡",IDC_STATIC_HEADER_TITLE - ,7,0,258,8,NOT WS_GROUP - LTEXT "‰º‹L‚̃pƒbƒP[ƒW‚ð—v‹‚µ‚Ä‚¢‚Ü‚·‚ªA‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ", - IDC_STATIC,21,9,239,16,NOT WS_GROUP - CONTROL "ˆË‘¶ŠÖŒW‚ɑΉž‚·‚éƒpƒbƒP[ƒW‚ðƒCƒ“ƒXƒg[ƒ‹i„§j(&I)" - ,IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,167,225,14 - EDITTEXT IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | - ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | - ES_AUTOVSCROLL - -END - -IDD_DROPPED DIALOG DISCARDABLE 0, 0, 317, 142 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|‰B‚µƒ~ƒ‰[ƒTƒCƒg‚ðŽg—p‚·‚éH" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Œx:",IDC_STATIC,7,8,40,8 - LTEXT "‘I‘ð‚µ‚½ƒ~ƒ‰[ƒTƒCƒg‚ÍŒöŽ®‚ÌOSGeo4Wƒ~ƒ‰[ƒTƒCƒg‚̃ŠƒXƒg‚É‚ ‚è‚Ü‚¹‚ñB" - "—LŒøŠúŒÀ‚ªØ‚ê‚Ä‚¢‚é‚©A•´Ž¸‚µ‚Ä‚¢‚Ü‚·B.\n" - "‚±‚ê‚ÍŽŸ‚̃~ƒ‰[ƒTƒCƒg‚ɉe‹¿‚ð‹y‚Ú‚µ‚Ü‚·:", - IDC_STATIC,47,8,263,32 - EDITTEXT IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL | - ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | - ES_AUTOVSCROLL - LTEXT "ƒCƒ“ƒXƒg[ƒ‹‚É–â‘肪‚ ‚é‚ÆŽv‚í‚ꂽ‚çAŒöŽ®‚̃~ƒ‰[ƒTƒCƒg‚Ì‚Ý‚ðŽg—p‚µ‚Ä‚Ý‚Ä‚­‚¾‚³‚¢B\n\n" - "‚±‚̃~ƒ‰[ƒTƒCƒg‚ÌŽg—p‚𑱂¯‚Ü‚·‚©H", - IDC_STATIC,7,88,303,24 - CONTROL "‚±‚̃~ƒ‰[ƒTƒCƒg‚ÌŒx‚ð•\Ž¦‚µ‚È‚¢(&D)", - IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,120,213,15 - PUSHBUTTON "‚Í‚¢(&Y)",IDYES,220,120,45,15 - DEFPUSHBUTTON "‚¢‚¢‚¦(&N)",IDNO,265,120,45,15 - -END - -IDD_EXP_PACKAGES DIALOG DISCARDABLE 0, 0, 317, 179 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU -CAPTION "OSGeo4W|ƒZƒbƒgƒAƒbƒv|ƒGƒNƒXƒvƒŒƒXƒpƒbƒP[ƒW‚Ì‘I‘ð" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "MapServer",IDC_PKG_MAPSERVER,"Button", - BS_AUTOCHECKBOX,108,48,100,8 - CONTROL "Quantum GIS",IDC_PKG_QGIS,"Button", - BS_AUTOCHECKBOX,108,63,100,8 - CONTROL "GDAL",IDC_PKG_GDAL,"Button", - BS_AUTOCHECKBOX,108,78,100,8 - CONTROL "Apache",IDC_PKG_APACHE,"Button", - BS_AUTOCHECKBOX,108,93,100,8 - CONTROL "uDig",IDC_PKG_UDIG,"Button", - BS_AUTOCHECKBOX,108,108,100,8 - CONTROL "OpenEV",IDC_PKG_OPENEV,"Button", - BS_AUTOCHECKBOX,108,123,100,8 - CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", - BS_AUTOCHECKBOX,108,138,100,8 - ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - - LTEXT "ƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT - WS_GROUP -END - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ROOT_SLASH "ŒxF‚ ‚È‚½‚̃n[ƒhƒhƒ‰ƒCƒu‚̃‹[ƒg‚ðOSGeo4W‚̃‹[ƒg‚Æ‚µ‚ÄŽg—p‚µ‚È‚¢‚±‚Æ‚ð‚¨‚·‚·‚ß‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H" - IDS_ROOT_SPACE "ƒfƒBƒŒƒNƒgƒŠ–¼‚ɃXƒy[ƒXŠÜ‚ñ‚¾ƒ‹[ƒgƒpƒX‚ð‘I‘ð‚·‚é‚ׂ«‚Å‚Í‚ ‚è‚Ü‚¹‚ñB‘±s‚µ‚Ü‚·‚©H" - IDS_MIRROR_LST "http://download.osgeo.org/osgeo4w/mirrors.lst" - IDS_ERR_OPEN_WRITE "‘‚«ž‚Ý—p‚Ì %s ‚ªŠJ‚¯‚Ü‚¹‚ñB: %s" - IDS_SETUPINI_MISSING "%s ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñB <%s> ‚©‚ç" - IDS_OLD_SETUPINI "‚±‚Ìsetup.ini‚Í‘O‚ɃCƒ“ƒXƒg[ƒ‹‚µ‚½OSGeo4W‚æ‚èŒÃ‚¢ƒo[ƒWƒ‡ƒ“‚Å‚·B‘±s‚µ‚Ü‚·‚©H" - IDS_NOTHING_INSTALLED "ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚é‚̂ɉ½‚à•K—v‚ ‚è‚Ü‚¹‚ñB" - IDS_INSTALL_COMPLETE "ƒCƒ“ƒXƒg[ƒ‹Š®—¹" - IDS_REBOOT_REQUIRED "Žg—p’†‚̃tƒ@ƒCƒ‹‚Í’u‚«Š·‚¦‚ç‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ð—LŒø‚É‚·‚é‚É‚Í¡‚·‚®‚ÉÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·BÄ‹N“®‚·‚é‚Ü‚ÅOSGeo4W‚ͳŠm‚É‹@”\‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñB" - IDS_ERR_OPEN_READ "“Ç‚ÝŽæ‚è—p‚Ì %s ‚ªŠJ‚¯‚Ü‚¹‚ñB: %s" - IDS_ROOT_ABSOLUTE "‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚ÍC:\\OSGeo4W‚̂悤‚ÉAƒhƒ‰ƒCƒu–¼‚ƃXƒ‰ƒbƒVƒ…‚©‚ç‚Ȃ銮‘S‚È‚à‚Ì‚Å‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñB" - IDS_DOWNLOAD_COMPLETE "ƒ_ƒEƒ“ƒ[ƒhŠ®—¹" - IDS_NOLOGFILE "‘‚«ž‚Ý—p‚̃ƒOƒtƒ@ƒCƒ‹ %s ‚ªŠJ‚¯‚Ü‚¹‚ñB" - IDS_UNINSTALL_COMPLETE "ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹Š®—¹" - IDS_WININET "Internet Explorer 5 DLLs‚ªŒ©‚‚©‚è‚Ü‚¹‚ñA‚ ‚é‚¢‚̓[ƒh‚Å‚«‚Ü‚¹‚ñB" - IDS_ERR_CHDIR "ƒfƒBƒŒƒNƒgƒŠ‚ð %s ‚É•ÏX‚Å‚«‚Ü‚¹‚ñB : %s [%.8x]" - 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." - IDS_DOWNLOAD_INCOMPLETE "ƒ_ƒEƒ“ƒ[ƒh‚ÉŽ¸”s‚µ‚Ü‚µ‚½BÄŽŽs‚µ‚Ü‚·‚©H" - IDS_INSTALL_ERROR "ƒCƒ“ƒXƒg[ƒ‹ƒGƒ‰[ (%s)A‘¼‚̃pƒbƒP[ƒW‚Å‘±s‚µ‚Ü‚·‚©H" - IDS_INSTALL_INCOMPLETE "ƒCƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½BÚ×‚Í %s ‚ðŒ©‚Ä‚­‚¾‚³‚¢B" - IDS_CORRUPT_PACKAGE "ƒpƒbƒP[ƒWƒtƒ@ƒCƒ‹ %s ‚Í”j‘¹‚µ‚½ƒ[ƒJƒ‹ƒRƒs[‚Å‚·B휂µ‚ăŠƒgƒ‰ƒC‚µ‚Ä‚­‚¾‚³‚¢B" - IDS_SKIP_PACKAGE "%s\n‚±‚̃pƒbƒP[ƒW‚ðƒXƒLƒbƒv‚µ‚Ü‚·‚©H" - IDS_WINDOW_INIT_BADMSG "d‘å‚ȃGƒ‰[FƒEƒBƒ“ƒhƒE‰Šú‰»Žž‚ÉŽŸ‚Ì—\‘zŠO‚̃ƒbƒZ[ƒW “u ‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½B" - IDS_UNCAUGHT_EXCEPTION "d‘å‚ȃGƒ‰[F•ß‘¨‚³‚ê‚È‚©‚Á‚½—áŠO\nƒXƒŒƒbƒhF %s\nƒ^ƒCƒvF %s\nƒƒbƒZ[ƒWF %s" - IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO "d‘å‚ȃGƒ‰[F•ß‘¨‚³‚ê‚È‚©‚Á‚½—áŠO\nƒXƒŒƒbƒhF %s\nƒ^ƒCƒvF %s\nƒƒbƒZ[ƒWF %s\nƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒGƒ‰[”Ô†F %d" - IDS_TRUSTKEEP_TOOLTIP "‘S‚ẴpƒbƒP[ƒW‚ðŒ»ÝƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚Éݒ肵‚Ü‚·B " - "‚±‚ê‚͂ǂ̃pƒbƒP[ƒW‚É‚à•ÏX‚ðs‚í‚È‚¢‚悤ƒZƒbƒgƒAƒbƒv‚ÉŽwŽ¦‚µ‚Ä‚¢‚é‚Ì‚Æ“¯‚¶‚Å‚·B" - IDS_TRUSTPREV_TOOLTIP "Œ»Ý‚̈À’肵‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“ˆÈ‘O‚ɈÀ’肵‚Ä‚¢‚é‚Æ‚³‚ê‚Ä‚¢‚½ƒo[ƒWƒ‡ƒ“‚ðˆÓ–¡‚·‚é 'ˆÈ‘O‚Ì' ‚Æ‹L‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B." - IDS_TRUSTCURR_TOOLTIP "Œ»ÝÅ‚àˆÀ’肵‚Ä‚¢‚é‚Æ‚³‚ê‚éƒo[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢Bi„§j" - IDS_TRUSTEXP_TOOLTIP "ƒo[ƒWƒ‡ƒ“‚ªˆÛŽŽÒ‚É‚æ‚Á‚ÄŠJ”­”Å‚Ü‚½‚ÍŽŽ—p”Å‚Æ‚³‚ê‚Ä‚¢‚éꇂł ‚Á‚Ä‚àÅV‚̃o[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" - IDS_VIEWBUTTON_TOOLTIP "ƒpƒbƒP[ƒWƒrƒ…[‚ðƒTƒCƒNƒ‹‚µ‚Ü‚·B‚±‚ê‚͈ȉº‚̃`ƒ…[ƒU[‚É‚¨‚¢‚Ä•\Ž¦‚³‚ê‚éƒpƒbƒP[ƒW‚ðŒˆ’è‚µ‚Ü‚·B\r\n" - "\r\n" - "ƒJƒeƒSƒŠ[FƒpƒbƒP[ƒWƒJƒeƒSƒŠ[‚É‚æ‚Á‚Ä•ª—Þ‚µ‚Ü‚·B'{'@‚ðƒNƒŠƒbƒN‚µ‚ÄŠg’£‚µ‚Ä‚­‚¾‚³‚¢B\r\n" - "\r\n" - "‘S‚ÄF@‘S‚ẴpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B\r\n" - "\r\n" - "ˆê•”F@ƒCƒ“ƒXƒg[ƒ‹AíœA‚Ü‚½‚̓AƒbƒvƒOƒŒ[ƒh‚³‚ê‚éƒpƒbƒP[ƒW‚Ì‚Ý•\Ž¦‚µ‚Ü‚·B\r\n" - "‚±‚ê‚ÍgŽŸ‚Öh‚ðƒNƒŠƒbƒN‚µ‚½‚Æ‚«‚ɃZƒbƒgƒAƒbƒv‚ªs‚¤‘S‚Ä‚Ì•ÏX‚ðŽ¦‚µ‚Ü‚·B\r\n" - "\r\n" - "ÅV”ÅF@Šù‚ÉÝ’è‚·‚éƒo[ƒWƒ‡ƒ“‚Å‚ ‚邽‚ß‘€ì‚ð•K—v‚Æ‚µ‚È‚¢ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚éƒpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B\r\n" - "\r\n" - "ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚È‚¢F@Œ»ÝƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¨‚炸ƒCƒ“ƒXƒg[ƒ‹‚É‘I‘ð‚³‚ê‚Ä‚¢‚È‚¢ƒpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B" - IDS_HIDEOBS_TOOLTIP " ‘I‘ð‚³‚ê‚é‚ÆAƒZƒbƒgƒAƒbƒv‚Í '_' ‚ÅŽn‚Ü‚é–¼‘O‚̃JƒeƒSƒŠ[‚É‚ ‚éƒpƒbƒP[ƒW‚ɉB‚ê‚Ü‚·B" - "’Ê킱‚̂悤‚ȃpƒbƒP[ƒW‚Ííœ‚à‚µ‚­‚Í–¼‘O‚ª•ÏX‚³‚ꂽƒpƒbƒP[ƒW‚Å‚ ‚èA‚Ü‚½‚ÍŽ©“®“I‚Ɉ—‚³‚ꂽƒCƒ“ƒtƒ‰ƒXƒgƒ‰ƒNƒ`ƒƒ[ƒpƒbƒP[ƒW‚Ì‹ó‚̃vƒŒ[ƒXƒzƒ‹ƒ_‚Å‚·B" - IDS_SELPKG_INSTALL "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" - IDS_SELPKG_DOWNLOAD "ƒ_ƒEƒ“ƒ[ƒh‚·‚éƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B " -END \ No newline at end of file +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +#pragma code_page(932) + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +// Throughout, we use the font "MS Shell Dlg". This seems to be necessary to +// work around some not-fully-understood issues with PropertySheets. Hopefully, +// using this font will cause things to 'just work'. Further information on +// this topic is at: +// http://sources.redhat.com/ml/cygwin-apps/2003-05/msg00177.html + +IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒ^ƒCƒv‚Ì‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ƒCƒ“ƒ^[ƒlƒbƒg‚©‚çƒCƒ“ƒXƒg[ƒ‹(&I)\niƒ_ƒEƒ“ƒ[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ÍÄ—˜—p‚Ì‚½‚ß‚É•Û‘¶‚³‚ê‚Ü‚·j", + IDC_SOURCE_NETINST, "Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE + | BS_TOP, + 71, 60, 200, 20 + + CONTROL "ƒCƒ“ƒXƒg[ƒ‹‚¹‚¸‚Ƀ_ƒEƒ“ƒ[ƒh(&D)", + IDC_SOURCE_DOWNLOAD, "Button", + BS_AUTORADIOBUTTON | WS_TABSTOP, + 71, 90, 200, 10 + + CONTROL "ƒ[ƒJƒ‹ƒfƒBƒŒƒNƒgƒŠ‚©‚çƒCƒ“ƒXƒg[ƒ‹(&L)",IDC_SOURCE_CWD,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP, + 71,120,200,10 + + ICON IDI_CYGWIN, IDC_HEADICON, 290, 0, 21, 20 + + CONTROL "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN, + 0, 28, 317, 1 + + LTEXT "ƒ_ƒEƒ“ƒ[ƒhƒ\[ƒX‚ð‘I‚Ô", IDC_STATIC_HEADER_TITLE, + 7, 0, 258, 8, NOT WS_GROUP + + LTEXT "ƒCƒ“ƒ^[ƒlƒbƒg‚©‚çƒCƒ“ƒXƒg[ƒ‹/ƒ_ƒEƒ“ƒ[ƒh‚·‚éA‚ ‚é‚¢‚̓[ƒJƒ‹ƒfƒBƒŒƒNƒgƒŠ‚©‚çƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", + IDC_STATIC, + 21, 9, 239, 16, NOT WS_GROUP +END + +IDD_VIRUS DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚éH" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚é(&D)",IDC_DISABLE_AV,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10 + CONTROL "ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚Ì‚Ý‚ðŽÀs‚·‚é(&L)",IDC_LEAVE_AV,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10 + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "ƒCƒ“ƒXƒg[ƒ‹’†ƒEƒCƒ‹ƒXƒXƒLƒƒƒ“‚𖳌ø‚É‚·‚é‚©‚ð‘I‘ð‚·‚é",IDC_STATIC_HEADER_TITLE,7,0, + 258,8,NOT WS_GROUP + LTEXT "ƒAƒ“ƒ`ƒEƒCƒ‹ƒXƒvƒƒOƒ‰ƒ€i“Á‚ÉMcAfeej‚ÍOSGeo4W‚̃Cƒ“ƒXƒg[ƒ‹’†AWindows NT/ 2000/ XP‚Ƀuƒ‹[ƒXƒNƒŠ[ƒ“‚ð”­¶‚³‚¹‚錴ˆö‚Æ‚È‚è‚Ü‚·B", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + LTEXT "–â‘肪ŒŸo‚³‚ê‚Ü‚µ‚½BOSGeo4WƒZƒbƒgƒAƒbƒv‚̓Cƒ“ƒXƒg[ƒ‹’†‚±‚ê‚𖳌ø‚É‚Å‚«‚Ü‚·BƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚½‚ç—LŒø‚É‚È‚è‚Ü‚·B", + IDC_STATIC,21,32,239,24,NOT WS_GROUP +END + +IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE, + 7,0,258,8,NOT WS_GROUP + LTEXT "ƒ_ƒEƒ“ƒ[ƒh‚·‚éƒCƒ“ƒXƒg[ƒ‹ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢BƒfƒBƒŒƒNƒgƒŠ‚ª‚È‚¢ê‡‚Í쬂µ‚Ä‚­‚¾‚³‚¢B",IDC_STATIC, + 21,9,248,16,NOT WS_GROUP + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + + GROUPBOX "ƒ[ƒJƒ‹ƒpƒbƒP[ƒWƒfƒBƒŒƒNƒgƒŠ",IDC_LOCALDIR_GRP,5,72,305,35 + EDITTEXT IDC_LOCAL_DIR,13,85,245,14,ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "ƒuƒ‰ƒEƒY...(&r)",IDC_LOCAL_DIR_BROWSE,260,85,44,14 +END + +IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚Ì‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ƒ‹[ƒgƒCƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE, + 7,0,258,8,NOT WS_GROUP + LTEXT "OSGeo4W‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹ƒpƒ‰ƒ[ƒ^‚à‘I‚ñ‚Å‚­‚¾‚³‚¢B", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + + GROUPBOX "ƒ‹[ƒgƒfƒBƒŒƒNƒgƒŠ",IDC_ROOTDIR_GRP,5,35,305,35 + EDITTEXT IDC_ROOT_DIR,13,47,245,14,ES_AUTOHSCROLL | WS_TABSTOP + PUSHBUTTON "ƒuƒ‰ƒEƒY...(&r)",IDC_ROOT_BROWSE,260,47,44,14,WS_TABSTOP + + GROUPBOX "ƒCƒ“ƒXƒg[ƒ‹",IDC_INSTALLFOR_GRP,5,76,150,101 + CONTROL "‚·‚ׂẴ†[ƒU[i„§j(&A)",IDC_ROOT_SYSTEM,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,13,89,130,8 + CONTROL "‚±‚̃†[ƒU[‚Ì‚Ý(&M)",IDC_ROOT_USER,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,13,130,130,8 + LTEXT "OSGeo4W‚̓VƒXƒeƒ€‚Ì‚·‚ׂẴ†[ƒU[‚ª—˜—p‚Å‚«‚Ü‚·B", + IDC_ALLUSERS_TEXT,25,101,125,28 + LTEXT "OSGeo4W‚Í‚±‚̃†[ƒU[‚µ‚©—˜—p‚Å‚«‚Ü‚¹‚ñBŠÇ—ŽÒ‚ÌŒ ŒÀ‚ª‚È‚¢A‚ ‚é‚¢‚Í“Á’è‚̃j[ƒY‚ª‚ ‚é‚Æ‚«‚Ì‚Ý‘I‘ð‚Å‚«‚Ü‚·B", + IDC_JUSTME_TEXT,25,140,125,32 +END + +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 +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒ_ƒEƒ“ƒ[ƒhƒTƒCƒg‚ð‘I‚Ô" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | + WS_TABSTOP + LTEXT "—˜—p‚Å‚«‚éƒ_ƒEƒ“ƒ[ƒhƒTƒCƒgF",IDC_STATIC,66,34,183,8,NOT + WS_GROUP + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "‚±‚̃ŠƒXƒg‚©‚çƒTƒCƒg‚ð‘I‚ÔA‚ ‚é‚¢‚Í“ÆŽ©‚̃TƒCƒg‚ðƒŠƒXƒg‚ɉÁ‚¦‚Ä‚­‚¾‚³‚¢B", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + LTEXT "ƒ_ƒEƒ“ƒ[ƒhƒTƒCƒg‚ð‘I‚Ô",IDC_STATIC_HEADER_TITLE,7,0,258, + 8,NOT WS_GROUP + EDITTEXT IDC_EDIT_USER_URL,65,160,185,14,ES_AUTOHSCROLL | + WS_GROUP + LTEXT "ƒ†[ƒU[URLF",IDC_SITE_USERURL,15,162,45,8,NOT WS_GROUP + PUSHBUTTON "’ljÁ",IDC_BUTTON_ADD_URL,255,160,50,14 +END + +IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|Ú‘±ƒ^ƒCƒv‚Ì‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "’¼ÚÚ‘±‚·‚é(&D)",IDC_NET_DIRECT,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,173,10 + CONTROL "IEÝ’è‚ð—˜—p‚·‚é(&I)",IDC_NET_IE5,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,169,10 + CONTROL "HTTP/FTPƒvƒƒLƒV‚ð—˜—p‚·‚é(&P):",IDC_NET_PROXY,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,188,10 + EDITTEXT IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | + WS_DISABLED | WS_GROUP + EDITTEXT IDC_PROXY_PORT,120,125,30,12,ES_AUTOHSCROLL | + WS_DISABLED + GROUPBOX "",IDC_STATIC,60,95,185,50 + RTEXT "ƒvƒƒLƒVƒzƒXƒg(&H)",IDC_STATIC,65,105,50,12,SS_CENTERIMAGE | + NOT WS_GROUP + RTEXT "ƒ|[ƒg(&t)",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT + WS_GROUP + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "ƒCƒ“ƒ^[ƒlƒbƒg‚ÉÚ‘±‚·‚é•û–@‚ðŽw’肵‚Ü‚·B‰º‹L‚©‚ç“K“–‚ÈÝ’è‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + LTEXT "ƒCƒ“ƒ^[ƒlƒbƒgÚ‘±‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢", + IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP +END + +IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ƒCƒ“ƒXƒg[ƒ‹...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS + LTEXT "iƒpƒbƒP[ƒWj",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS + LTEXT "iƒtƒ@ƒCƒ‹j",IDC_INS_FILE,45,85,205,8,SS_ENDELLIPSIS + CONTROL "Progress1",IDC_INS_DISKFULL,"msctls_progress32", + PBS_SMOOTH | WS_BORDER,95,130,155,10 + CONTROL "Progress1",IDC_INS_IPROGRESS,"msctls_progress32", + PBS_SMOOTH | WS_BORDER,95,115,155,10 + CONTROL "Progress1",IDC_INS_PPROGRESS,"msctls_progress32", + PBS_SMOOTH | WS_BORDER,95,100,155,10 + LTEXT "ƒpƒbƒP[ƒW:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP + LTEXT "‘S‘Ì:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP + LTEXT "ƒfƒBƒXƒN:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "‚±‚̃y[ƒW‚̓_ƒEƒ“ƒ[ƒhA‚ ‚é‚¢‚̓Cƒ“ƒXƒg[ƒ‹‚Ìis󋵂ð•\Ž¦‚µ‚Ä‚¢‚Ü‚·B", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + LTEXT "isó‹µ",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT + WS_GROUP +END + +IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "—v‹‚³‚ꂽƒvƒƒLƒV‚Ì”FØ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 + LTEXT "ƒvƒƒLƒVƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL + LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "—v‹‚³‚ꂽƒvƒƒLƒV‚Ì”FØ",IDC_STATIC,65,10,145,10 + DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 +END + +IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "—v‹‚³‚ꂽƒT[ƒo[‚Ì”FØ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 + LTEXT "ƒvƒƒLƒVƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL + LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "—v‹‚³‚ꂽƒT[ƒo[‚Ì”FØ",IDC_STATIC,65,10,145,10 + DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 +END + +IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "OSGeo4W‚̃lƒbƒgƒŠƒŠ[ƒX‚³‚ê‚Ä‚¢‚éƒZƒbƒgƒAƒbƒv\r\nƒvƒƒOƒ‰ƒ€", + IDC_STATIC_WELCOME_TITLE,35,1,225,34 + LTEXT "‚±‚̃ZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ÍŒã‚É‘±‚­ƒAƒbƒvƒf[ƒg‚Æ“¯‚¶‚悤‚ÉAOSGeo4WŠÂ‹«‚̉Šú‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽg—p‚³‚ê‚Ü‚·B•Û‘¶êŠ‚ð–Y‚ê‚È‚¢‚悤‚É‚µ‚Ä‚­‚¾‚³‚¢B\r\n\r\n" + "‚±‚̃y[ƒWˆÈ~‚ÍAƒCƒ“ƒXƒg[ƒ‹‚̃KƒCƒh‚ð‚µ‚Ü‚·BOSGeo4W‚Í‘½–Ú“I‚̃pƒbƒP[ƒW‚©‚ç\¬‚³‚ê‚Ä‚¢‚Ü‚·B‰ŠúÝ’è‚Å‚ÍAƒpƒbƒP[ƒW‚ÌŠî–{Ý’è‚̂݃Cƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚·B•K—v‚ɉž‚¶‚ÄA’ljÁAíœAƒpƒbƒP[ƒW‚̃AƒbƒvƒOƒŒ[ƒh‚Ì‚½‚ßA‚¢‚Â‚Å‚à‚±‚̃vƒƒOƒ‰ƒ€‚ðŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B", + IDC_SPLASH_TEXT,35,35,265,90 + CONTROL "ƒGƒNƒXƒvƒŒƒX ƒfƒXƒNƒgƒbƒvƒCƒ“ƒXƒg[ƒ‹",IDC_EXPRESS_D,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,104,173,10 + CONTROL "ƒGƒNƒXƒvƒŒƒX Web-GISƒCƒ“ƒXƒg[ƒ‹",IDC_EXPRESS_I,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,124,173,10 + CONTROL "ƒAƒhƒoƒ“ƒXƒCƒ“ƒXƒg[ƒ‹",IDC_ADVANCED,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,69,10 + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 +END + +IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒCƒ“ƒXƒg[ƒ‹ƒXƒe[ƒ^ƒX‚ƃAƒCƒRƒ“‚Ìì¬" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ƒfƒXƒNƒgƒbƒv‚ɃAƒCƒRƒ“‚ð쬂·‚é(&D)",IDC_ROOT_DESKTOP,"Button", + BS_AUTOCHECKBOX,108,78,140,8 + CONTROL "ƒXƒ^[ƒgƒƒjƒ…[‚ɒljÁ(&S)",IDC_ROOT_MENU,"Button", + BS_AUTOCHECKBOX,108,93,100,8 + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "OSGeo4WŠÂ‹«‚ÉŠÈ’P‚ɃAƒNƒZƒX‚Å‚«‚éƒAƒCƒRƒ“‚ð쬂µ‚Ä‚­‚¾‚³‚¢B", + IDC_STATIC_HEADER,21,9,239,16,NOT WS_GROUP + LTEXT "ƒAƒCƒRƒ“‚Ìì¬",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT + WS_GROUP + CONTROL "",IDC_DESKTOP_SEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN, + 0,155,317,1 + LTEXT "ƒCƒ“ƒXƒg[ƒ‹ƒXƒe[ƒ^ƒX",IDC_STATUS_HEADER,7,160,258,8,NOT WS_GROUP + LTEXT "OSGeo4W‚ͳí‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚µ‚½B",IDC_STATUS, + 21,169,239,16,NOT WS_GROUP +END + +IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "—v‹‚³‚ꂽFTP‚Ì”FØ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CYGWIN,IDC_HEADICON,5,5,21,20 + LTEXT "ƒ†[ƒU[ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL + LTEXT "ƒpƒXƒ[ƒh(&P)",IDC_STATIC,10,43,50,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_PASSWD,65,43,145,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "—v‹‚³‚ꂽFTP‚Ì”FØ",IDC_STATIC,65,10,145,10 + DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,165,75,45,15 +END + +IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|ƒpƒbƒP[ƒW‚Ì‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "•ÏX‚È‚µ(&K)",IDC_CHOOSE_KEEP,"Button",BS_AUTORADIOBUTTON | + WS_GROUP | WS_TABSTOP,40,30,45,14 + CONTROL "‘O‰ñ(&P)",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON , + 90,30,37,14 + CONTROL "Œ»Ý(&C)",IDC_CHOOSE_CURR,"Button",BS_AUTORADIOBUTTON , + 130,30,35,14 + CONTROL "ŠJ”­”Å(&x)",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON , + 174,30,40,14 + PUSHBUTTON "•\Ž¦(&V)",IDC_CHOOSE_VIEW,219,30,36,14,WS_GROUP + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT + WS_VISIBLE,7,45,303,122 + CONTROL "”pŽ~‚³‚ꂽƒpƒbƒP[ƒW‚ð‰B‚·(&H)",IDC_CHOOSE_HIDE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,167,160,14 + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + LTEXT "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒpƒbƒP[ƒW‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢B", + IDC_CHOOSE_INST_TEXT,21,9,239,16,NOT WS_GROUP + LTEXT "ƒpƒbƒP[ƒW‚Ì‘I‘ð",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT + WS_GROUP + LTEXT "",IDC_CHOOSE_VIEWCAPTION,270,33,50,10 +END + +IDD_PREREQ DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|‰ðŒˆ‚·‚éˆË‘¶«" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN, + 0,28,317,1 + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + LTEXT "ŒxIˆË‘¶ŠÖŒW‚Ì•s®‡",IDC_STATIC_HEADER_TITLE + ,7,0,258,8,NOT WS_GROUP + LTEXT "‰º‹L‚̃pƒbƒP[ƒW‚ð—v‹‚µ‚Ä‚¢‚Ü‚·‚ªA‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ", + IDC_STATIC,21,9,239,16,NOT WS_GROUP + CONTROL "ˆË‘¶ŠÖŒW‚ɑΉž‚·‚éƒpƒbƒP[ƒW‚ðƒCƒ“ƒXƒg[ƒ‹i„§j(&I)" + ,IDC_PREREQ_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 7,167,225,14 + EDITTEXT IDC_PREREQ_EDIT,7,41,303,124,WS_VSCROLL | WS_HSCROLL | + ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | + ES_AUTOVSCROLL + +END + +IDD_DROPPED DIALOG DISCARDABLE 0, 0, 317, 142 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4WƒZƒbƒgƒAƒbƒv|‰B‚µƒ~ƒ‰[ƒTƒCƒg‚ðŽg—p‚·‚éH" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Œx:",IDC_STATIC,7,8,40,8 + LTEXT "‘I‘ð‚µ‚½ƒ~ƒ‰[ƒTƒCƒg‚ÍŒöŽ®‚ÌOSGeo4Wƒ~ƒ‰[ƒTƒCƒg‚̃ŠƒXƒg‚É‚ ‚è‚Ü‚¹‚ñB" + "—LŒøŠúŒÀ‚ªØ‚ê‚Ä‚¢‚é‚©A•´Ž¸‚µ‚Ä‚¢‚Ü‚·B.\n" + "‚±‚ê‚ÍŽŸ‚̃~ƒ‰[ƒTƒCƒg‚ɉe‹¿‚ð‹y‚Ú‚µ‚Ü‚·:", + IDC_STATIC,47,8,263,32 + EDITTEXT IDC_DROP_MIRRORS,7,40,303,40,WS_VSCROLL | WS_HSCROLL | + ES_LEFT | ES_MULTILINE | ES_READONLY | ES_AUTOHSCROLL | + ES_AUTOVSCROLL + LTEXT "ƒCƒ“ƒXƒg[ƒ‹‚É–â‘肪‚ ‚é‚ÆŽv‚í‚ꂽ‚çAŒöŽ®‚̃~ƒ‰[ƒTƒCƒg‚Ì‚Ý‚ðŽg—p‚µ‚Ä‚Ý‚Ä‚­‚¾‚³‚¢B\n\n" + "‚±‚̃~ƒ‰[ƒTƒCƒg‚ÌŽg—p‚𑱂¯‚Ü‚·‚©H", + IDC_STATIC,7,88,303,24 + CONTROL "‚±‚̃~ƒ‰[ƒTƒCƒg‚ÌŒx‚ð•\Ž¦‚µ‚È‚¢(&D)", + IDC_DROP_NOWARN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 7,120,213,15 + PUSHBUTTON "‚Í‚¢(&Y)",IDYES,220,120,45,15 + DEFPUSHBUTTON "‚¢‚¢‚¦(&N)",IDNO,265,120,45,15 + +END + +IDD_EXP_PACKAGES DIALOG DISCARDABLE 0, 0, 317, 179 +STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "OSGeo4W|ƒZƒbƒgƒAƒbƒv|ƒGƒNƒXƒvƒŒƒXƒpƒbƒP[ƒW‚Ì‘I‘ð" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "MapServer",IDC_PKG_MAPSERVER,"Button", + BS_AUTOCHECKBOX,108,48,100,8 + CONTROL "Quantum GIS",IDC_PKG_QGIS,"Button", + BS_AUTOCHECKBOX,108,63,100,8 + CONTROL "GDAL",IDC_PKG_GDAL,"Button", + BS_AUTOCHECKBOX,108,78,100,8 + CONTROL "Apache",IDC_PKG_APACHE,"Button", + BS_AUTOCHECKBOX,108,93,45,8 + CONTROL "uDig",IDC_PKG_UDIG,"Button", + BS_AUTOCHECKBOX,108,108,100,8 + CONTROL "OpenEV",IDC_PKG_OPENEV,"Button", + BS_AUTOCHECKBOX,108,123,100,8 + CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", + BS_AUTOCHECKBOX,108,138,100,8 + LTEXT "ƒ|[ƒg”Ô†:",IDC_APACHE_PORT_LABEL,154,90,40,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_APACHE_PORT,210,90,25,12,ES_AUTOHSCROLL + ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 + + LTEXT "ƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT + WS_GROUP +END + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ROOT_SLASH "ŒxF‚ ‚È‚½‚̃n[ƒhƒhƒ‰ƒCƒu‚̃‹[ƒg‚ðOSGeo4W‚̃‹[ƒg‚Æ‚µ‚ÄŽg—p‚µ‚È‚¢‚±‚Æ‚ð‚¨‚·‚·‚ß‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H" + IDS_ROOT_SPACE "ƒfƒBƒŒƒNƒgƒŠ–¼‚ɃXƒy[ƒXŠÜ‚ñ‚¾ƒ‹[ƒgƒpƒX‚ð‘I‘ð‚·‚é‚ׂ«‚Å‚Í‚ ‚è‚Ü‚¹‚ñB‘±s‚µ‚Ü‚·‚©H" + IDS_MIRROR_LST "http://download.osgeo.org/osgeo4w/mirrors.lst" + IDS_ERR_OPEN_WRITE "‘‚«ž‚Ý—p‚Ì %s ‚ªŠJ‚¯‚Ü‚¹‚ñB: %s" + IDS_SETUPINI_MISSING "%s ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñB <%s> ‚©‚ç" + IDS_OLD_SETUPINI "‚±‚Ìsetup.ini‚Í‘O‚ɃCƒ“ƒXƒg[ƒ‹‚µ‚½OSGeo4W‚æ‚èŒÃ‚¢ƒo[ƒWƒ‡ƒ“‚Å‚·B‘±s‚µ‚Ü‚·‚©H" + IDS_NOTHING_INSTALLED "ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚é‚̂ɉ½‚à•K—v‚ ‚è‚Ü‚¹‚ñB" + IDS_INSTALL_COMPLETE "ƒCƒ“ƒXƒg[ƒ‹Š®—¹" + IDS_REBOOT_REQUIRED "Žg—p’†‚̃tƒ@ƒCƒ‹‚Í’u‚«Š·‚¦‚ç‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ð—LŒø‚É‚·‚é‚É‚Í¡‚·‚®‚ÉÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·BÄ‹N“®‚·‚é‚Ü‚ÅOSGeo4W‚ͳŠm‚É‹@”\‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñB" + IDS_ERR_OPEN_READ "“Ç‚ÝŽæ‚è—p‚Ì %s ‚ªŠJ‚¯‚Ü‚¹‚ñB: %s" + IDS_ROOT_ABSOLUTE "‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚ÍC:\\OSGeo4W‚̂悤‚ÉAƒhƒ‰ƒCƒu–¼‚ƃXƒ‰ƒbƒVƒ…‚©‚ç‚Ȃ銮‘S‚È‚à‚Ì‚Å‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñB" + IDS_DOWNLOAD_COMPLETE "ƒ_ƒEƒ“ƒ[ƒhŠ®—¹" + IDS_NOLOGFILE "‘‚«ž‚Ý—p‚̃ƒOƒtƒ@ƒCƒ‹ %s ‚ªŠJ‚¯‚Ü‚¹‚ñB" + IDS_UNINSTALL_COMPLETE "ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹Š®—¹" + IDS_WININET "Internet Explorer 5 DLLs‚ªŒ©‚‚©‚è‚Ü‚¹‚ñA‚ ‚é‚¢‚̓[ƒh‚Å‚«‚Ü‚¹‚ñB" + IDS_ERR_CHDIR "ƒfƒBƒŒƒNƒgƒŠ‚ð %s ‚É•ÏX‚Å‚«‚Ü‚¹‚ñB : %s [%.8x]" + 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." + IDS_DOWNLOAD_INCOMPLETE "ƒ_ƒEƒ“ƒ[ƒh‚ÉŽ¸”s‚µ‚Ü‚µ‚½BÄŽŽs‚µ‚Ü‚·‚©H" + IDS_INSTALL_ERROR "ƒCƒ“ƒXƒg[ƒ‹ƒGƒ‰[ (%s)A‘¼‚̃pƒbƒP[ƒW‚Å‘±s‚µ‚Ü‚·‚©H" + IDS_INSTALL_INCOMPLETE "ƒCƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½BÚ×‚Í %s ‚ðŒ©‚Ä‚­‚¾‚³‚¢B" + IDS_CORRUPT_PACKAGE "ƒpƒbƒP[ƒWƒtƒ@ƒCƒ‹ %s ‚Í”j‘¹‚µ‚½ƒ[ƒJƒ‹ƒRƒs[‚Å‚·B휂µ‚ăŠƒgƒ‰ƒC‚µ‚Ä‚­‚¾‚³‚¢B" + IDS_SKIP_PACKAGE "%s\n‚±‚̃pƒbƒP[ƒW‚ðƒXƒLƒbƒv‚µ‚Ü‚·‚©H" + IDS_WINDOW_INIT_BADMSG "d‘å‚ȃGƒ‰[FƒEƒBƒ“ƒhƒE‰Šú‰»Žž‚ÉŽŸ‚Ì—\‘zŠO‚̃ƒbƒZ[ƒW “u ‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½B" + IDS_UNCAUGHT_EXCEPTION "d‘å‚ȃGƒ‰[F•ß‘¨‚³‚ê‚È‚©‚Á‚½—áŠO\nƒXƒŒƒbƒhF %s\nƒ^ƒCƒvF %s\nƒƒbƒZ[ƒWF %s" + IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO "d‘å‚ȃGƒ‰[F•ß‘¨‚³‚ê‚È‚©‚Á‚½—áŠO\nƒXƒŒƒbƒhF %s\nƒ^ƒCƒvF %s\nƒƒbƒZ[ƒWF %s\nƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒGƒ‰[”Ô†F %d" + IDS_TRUSTKEEP_TOOLTIP "‘S‚ẴpƒbƒP[ƒW‚ðŒ»ÝƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚Éݒ肵‚Ü‚·B " + "‚±‚ê‚͂ǂ̃pƒbƒP[ƒW‚É‚à•ÏX‚ðs‚í‚È‚¢‚悤ƒZƒbƒgƒAƒbƒv‚ÉŽwŽ¦‚µ‚Ä‚¢‚é‚Ì‚Æ“¯‚¶‚Å‚·B" + IDS_TRUSTPREV_TOOLTIP "Œ»Ý‚̈À’肵‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“ˆÈ‘O‚ɈÀ’肵‚Ä‚¢‚é‚Æ‚³‚ê‚Ä‚¢‚½ƒo[ƒWƒ‡ƒ“‚ðˆÓ–¡‚·‚é 'ˆÈ‘O‚Ì' ‚Æ‹L‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B." + IDS_TRUSTCURR_TOOLTIP "Œ»ÝÅ‚àˆÀ’肵‚Ä‚¢‚é‚Æ‚³‚ê‚éƒo[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢Bi„§j" + IDS_TRUSTEXP_TOOLTIP "ƒo[ƒWƒ‡ƒ“‚ªˆÛŽŽÒ‚É‚æ‚Á‚ÄŠJ”­”Å‚Ü‚½‚ÍŽŽ—p”Å‚Æ‚³‚ê‚Ä‚¢‚éꇂł ‚Á‚Ä‚àÅV‚̃o[ƒWƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" + IDS_VIEWBUTTON_TOOLTIP "ƒpƒbƒP[ƒWƒrƒ…[‚ðƒTƒCƒNƒ‹‚µ‚Ü‚·B‚±‚ê‚͈ȉº‚̃`ƒ…[ƒU[‚É‚¨‚¢‚Ä•\Ž¦‚³‚ê‚éƒpƒbƒP[ƒW‚ðŒˆ’è‚µ‚Ü‚·B\r\n" + "\r\n" + "ƒJƒeƒSƒŠ[FƒpƒbƒP[ƒWƒJƒeƒSƒŠ[‚É‚æ‚Á‚Ä•ª—Þ‚µ‚Ü‚·B'{'@‚ðƒNƒŠƒbƒN‚µ‚ÄŠg’£‚µ‚Ä‚­‚¾‚³‚¢B\r\n" + "\r\n" + "‘S‚ÄF@‘S‚ẴpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B\r\n" + "\r\n" + "ˆê•”F@ƒCƒ“ƒXƒg[ƒ‹AíœA‚Ü‚½‚̓AƒbƒvƒOƒŒ[ƒh‚³‚ê‚éƒpƒbƒP[ƒW‚Ì‚Ý•\Ž¦‚µ‚Ü‚·B\r\n" + "‚±‚ê‚ÍgŽŸ‚Öh‚ðƒNƒŠƒbƒN‚µ‚½‚Æ‚«‚ɃZƒbƒgƒAƒbƒv‚ªs‚¤‘S‚Ä‚Ì•ÏX‚ðŽ¦‚µ‚Ü‚·B\r\n" + "\r\n" + "ÅV”ÅF@Šù‚ÉÝ’è‚·‚éƒo[ƒWƒ‡ƒ“‚Å‚ ‚邽‚ß‘€ì‚ð•K—v‚Æ‚µ‚È‚¢ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚éƒpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B\r\n" + "\r\n" + "ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚È‚¢F@Œ»ÝƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¨‚炸ƒCƒ“ƒXƒg[ƒ‹‚É‘I‘ð‚³‚ê‚Ä‚¢‚È‚¢ƒpƒbƒP[ƒW‚ð•\Ž¦‚µ‚Ü‚·B" + IDS_HIDEOBS_TOOLTIP " ‘I‘ð‚³‚ê‚é‚ÆAƒZƒbƒgƒAƒbƒv‚Í '_' ‚ÅŽn‚Ü‚é–¼‘O‚̃JƒeƒSƒŠ[‚É‚ ‚éƒpƒbƒP[ƒW‚ɉB‚ê‚Ü‚·B" + "’Ê킱‚̂悤‚ȃpƒbƒP[ƒW‚Ííœ‚à‚µ‚­‚Í–¼‘O‚ª•ÏX‚³‚ꂽƒpƒbƒP[ƒW‚Å‚ ‚èA‚Ü‚½‚ÍŽ©“®“I‚Ɉ—‚³‚ꂽƒCƒ“ƒtƒ‰ƒXƒgƒ‰ƒNƒ`ƒƒ[ƒpƒbƒP[ƒW‚Ì‹ó‚̃vƒŒ[ƒXƒzƒ‹ƒ_‚Å‚·B" + IDS_SELPKG_INSTALL "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" + IDS_SELPKG_DOWNLOAD "ƒ_ƒEƒ“ƒ[ƒh‚·‚éƒpƒbƒP[ƒW‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B " + IDS_LIST_CURRENT "ÅV" + IDS_LIST_NEW "V‹K" + IDS_LIST_BIN "ŽÀsŒ`Ž®?" + IDS_LIST_SRC "ƒ\[ƒX?" + IDS_LIST_CATEGORIES "ƒJƒeƒSƒŠ" + IDS_LIST_SIZE "ƒTƒCƒY" + IDS_LIST_PACKAGE "ƒpƒbƒP[ƒW" + IDS_CAPTION_FULL "‘S‚Ä" + IDS_CAPTION_PARTIAL "ˆê•”" + IDS_CAPTION_UPTODATE "ƒAƒbƒvƒf[ƒg" + IDS_CAPTION_NOTINSTALLED "–¢ƒCƒ“ƒXƒg[ƒ‹" + IDS_CAPTION_CATEGORY "ƒJƒeƒSƒŠ" +END + Index: PickCategoryLine.cc =================================================================== --- PickCategoryLine.cc (revision 1161) +++ PickCategoryLine.cc (working copy) @@ -76,7 +76,7 @@ int max_y = y + (row + bucket.size ()) * theView.row_height; // paint all contained rows, columnwise - for (int i = 0; theView.headers[i].text; i++) + for (int i = 0; strlen(theView.headers[i].text); i++) { RECT r; r.left = x + theView.headers[i].x; Index: script.cc =================================================================== --- script.cc (revision 1161) +++ script.cc (working copy) @@ -32,6 +32,7 @@ #include "io_stream.h" #include "script.h" #include "mkdir.h" +#include "state.h" static std::string sh; static const char *cmd = 0; @@ -64,6 +65,11 @@ old_path).c_str()); SetEnvironmentVariable ("OSGEO4W_ROOT", get_root_dir ().c_str()); + char portnum[10]; + sprintf(portnum,"%d",(apache_port_number!=0) ? apache_port_number:80); + printf("%s\n",portnum); + SetEnvironmentVariable ("APACHE_PORT", portnum); + std::string startmenu; get_startmenu(startmenu); SetEnvironmentVariable ("OSGEO4W_STARTMENU", startmenu.c_str()); Index: PickView.cc =================================================================== --- PickView.cc (revision 1161) +++ PickView.cc (working copy) @@ -36,7 +36,7 @@ {"Categories", 0, 0, true}, {"Size", 0, 0, true}, {"Package", 0, 0, true}, - {0, 0, 0, false} + {"", 0, 0, false} }; static PickView::Header cat_headers[] = { @@ -47,9 +47,12 @@ {"Src?", 0, 0, false}, {"Size", 0, 0, true}, {"Package", 0, 0, true}, - {0, 0, 0, false} + {"", 0, 0, false} }; + + + // PickView:: views const PickView::views PickView::views::Unknown (0); const PickView::views PickView::views::PackageFull (1); @@ -84,9 +87,12 @@ return index; } + void PickView::set_headers () { + + if (view_mode == views::Unknown) return; if (view_mode == views::PackageFull || @@ -118,16 +124,56 @@ } else return; + while (int n = SendMessage (listheader, HDM_GETITEMCOUNT, 0, 0)) { SendMessage (listheader, HDM_DELETEITEM, n - 1, 0); } + int i; for (i = 0; i <= last_col; i++) - DoInsertItem (listheader, i, headers[i].width, (char *) headers[i].text); + { + DoInsertItem (listheader, i, headers[i].width, (char *) headers[i].text); + } } +#define ARRAYSIZE(a) (sizeof (a) / sizeof ((a)[0])) void +PickView::set_hederslabel() +{ + +//* + //current + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_CURRENT, pkg_headers[0].text, ARRAYSIZE ( pkg_headers[0].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_CURRENT, cat_headers[1].text, ARRAYSIZE ( pkg_headers[1].text ) ); + + //New + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_NEW, pkg_headers[1].text, ARRAYSIZE ( pkg_headers[1].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_NEW, cat_headers[2].text, ARRAYSIZE ( pkg_headers[2].text ) ); + + //Bin? + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_BIN, pkg_headers[2].text, ARRAYSIZE ( pkg_headers[2].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_BIN, cat_headers[3].text, ARRAYSIZE ( pkg_headers[3].text ) ); + + //Src? + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_SRC, pkg_headers[3].text, ARRAYSIZE ( pkg_headers[3].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_SRC, cat_headers[4].text, ARRAYSIZE ( pkg_headers[4].text ) ); + + //Categories + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_CATEGORIES, pkg_headers[4].text, ARRAYSIZE ( pkg_headers[4].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_CATEGORIES, cat_headers[0].text, ARRAYSIZE ( pkg_headers[0].text ) ); + + //Size + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_SIZE, pkg_headers[5].text, ARRAYSIZE ( pkg_headers[5].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_SIZE, cat_headers[5].text, ARRAYSIZE ( pkg_headers[5].text ) ); + + //Package + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_PACKAGE, pkg_headers[6].text, ARRAYSIZE ( pkg_headers[6].text ) ); + LoadString ( GetModuleHandle ( NULL ), IDS_LIST_PACKAGE, cat_headers[6].text, ARRAYSIZE ( pkg_headers[6].text ) ); +//*/ +} + +void PickView::note_width (PickView::Header *hdrs, HDC dc, const std::string& string, int addend, int column) { @@ -153,6 +199,8 @@ packagedb db; contents.empty (); + + if (view_mode == PickView::views::Category) { contents.ShowLabel (true); @@ -166,11 +214,13 @@ else { contents.ShowLabel (false); + // iterate through every package for (vector ::iterator i = db.packages.begin (); i != db.packages.end (); ++i) { packagemeta & pkg = **i; + if ( // "Full" : everything (view_mode == PickView::views::PackageFull) @@ -214,6 +264,35 @@ InvalidateRect (GetHWND(), &r, TRUE); } + +char * +PickView::mode_caption (char *src, size_t sz ) +{ + switch (view_mode.captionvalue ()) + { + case 1: + LoadString ( GetModuleHandle ( NULL ), IDS_CAPTION_FULL, src, sz ); + return src; + case 2: + LoadString ( GetModuleHandle ( NULL ), IDS_CAPTION_PARTIAL, src, sz ); + return src; + case 3: + LoadString ( GetModuleHandle ( NULL ), IDS_CAPTION_UPTODATE, src, sz ); + return src; + case 4: + LoadString ( GetModuleHandle ( NULL ), IDS_CAPTION_NOTINSTALLED, src,sz ); + return src; + case 5: + LoadString ( GetModuleHandle ( NULL ), IDS_CAPTION_CATEGORY, src, sz ); + return src; + default: + strcpy(src,""); + return src; + } + +} + + const char * PickView::mode_caption () { @@ -240,6 +319,13 @@ } } +int +PickView::views::captionvalue () +{ + return _value; +} + + /* meant to be called on packagemeta::categories */ bool isObsolete (set &categories) @@ -412,7 +498,7 @@ { int i; - for (i = 0; headers[i].text; i++) + for (i = 0; strlen(headers[i].text); i++) { headers[i].width = 0; headers[i].x = 0; @@ -424,6 +510,8 @@ // conversion by the unwise String(int) constructor. note_width (headers, dc, "0", HMARGIN + 11, bintick_col); note_width (headers, dc, "0", HMARGIN + 11, srctick_col); + + // accomodate the width of each category name packagedb db; @@ -485,6 +573,7 @@ note_width (headers, dc, compound_cat, HMARGIN, cat_col); } } + // ensure that the new_col is wide enough for all the labels const char *captions[] = { "Uninstall", "Skip", "Reinstall", "Retrieve", @@ -508,6 +597,7 @@ void PickView::init(views _mode) { + HDC dc = GetDC (GetHWND()); sysfont = GetStockObject (DEFAULT_GUI_FONT); SelectObject (dc, sysfont); @@ -574,6 +664,8 @@ ReleaseDC (GetHWND (), dc); view_mode = _mode; + + set_hederslabel(); refresh (); } Index: res_en.rc =================================================================== --- res_en.rc (revision 1161) +++ res_en.rc (working copy) @@ -244,8 +244,10 @@ "default. You can always run this program at any time in " "the future to add, remove, or upgrade packages as " "necessary.",IDC_SPLASH_TEXT,35,25,265,90 - CONTROL "Express Install",IDC_EXPRESS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,124,73,10 + CONTROL "Express Desktop Install",IDC_EXPRESS_D,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,104,173,10 + CONTROL "Express Web-GIS Install",IDC_EXPRESS_I,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,60,124,173,10 CONTROL "Advanced Install",IDC_ADVANCED,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,144,69,10 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 @@ -382,7 +384,7 @@ CONTROL "GDAL",IDC_PKG_GDAL,"Button", BS_AUTOCHECKBOX,108,78,100,8 CONTROL "Apache",IDC_PKG_APACHE,"Button", - BS_AUTOCHECKBOX,108,93,100,8 + BS_AUTOCHECKBOX,108,93,45,8 CONTROL "uDig",IDC_PKG_UDIG,"Button", BS_AUTOCHECKBOX,108,108,100,8 CONTROL "OpenEV",IDC_PKG_OPENEV,"Button", @@ -390,7 +392,9 @@ CONTROL "GRASS GIS",IDC_PKG_GRASS,"Button", BS_AUTOCHECKBOX,108,138,100,8 ICON IDI_CYGWIN,IDC_HEADICON,290,0,21,20 - + LTEXT "Port number:",IDC_APACHE_PORT_LABEL,154,90,50,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_APACHE_PORT,210,90,25,12,ES_AUTOHSCROLL LTEXT "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP END @@ -459,4 +463,16 @@ "infrastructure packages that are handled automatically." IDS_SELPKG_INSTALL "Select packages to install " IDS_SELPKG_DOWNLOAD "Select packages to download " + IDS_LIST_CURRENT "Current" + IDS_LIST_NEW "New" + IDS_LIST_BIN "Bin?" + IDS_LIST_SRC "Src?" + IDS_LIST_CATEGORIES "Categories" + IDS_LIST_SIZE "Size" + IDS_LIST_PACKAGE "Package" + IDS_CAPTION_FULL "Full" + IDS_CAPTION_PARTIAL "Partial" + IDS_CAPTION_UPTODATE "Up To Date" + IDS_CAPTION_NOTINSTALLED "Not Installed" + IDS_CAPTION_CATEGORY "Category" END