rtoss - Diff between revs 141 and 147

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 141 Rev 147
Line 217... Line 217...
217 DEFPUSHBUTTON "&Go!",IDOK,87,12,25,14 217 DEFPUSHBUTTON "&Go!",IDOK,87,12,25,14
218 EDITTEXT IDC_LINEBOX,14,13,40,12,ES_AUTOHSCROLL | ES_NUMBER 218 EDITTEXT IDC_LINEBOX,14,13,40,12,ES_AUTOHSCROLL | ES_NUMBER
219 LTEXT "s–Ú‚Ö",IDC_STATIC,61,15,22,8 219 LTEXT "s–Ú‚Ö",IDC_STATIC,61,15,22,8
220 END 220 END
221 221
-   222 #if !defined(TARGET_VER) || (defined(TARGET_VER) && TARGET_VER>350)
222 IDD_CONFIG DIALOGEX 0, 0, 287, 236 223 IDD_CONFIG DIALOGEX 0, 0, 287, 236
-   224 #else
-   225 IDD_CONFIG DIALOG 0, 0, 287, 236
-   226 #endif
223 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 227 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
224 CAPTION "ƒGƒfƒBƒ^Ý’è" 228 CAPTION "ƒGƒfƒBƒ^Ý’è"
225 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN" 229 FONT 9, "‚l‚r ‚oƒSƒVƒbƒN"
226 BEGIN 230 BEGIN
227 GROUPBOX "‹¤’ʐݒè",IDC_STATIC,7,11,273,102 231 GROUPBOX "‹¤’ʐݒè",IDC_STATIC,7,11,273,102
228 LTEXT "[Œ³‚É–ß‚·]ãŒÀ(&U):",IDC_STATIC,24,24,56,8 -  
-   232 RTEXT "[Œ³‚É–ß‚·]ãŒÀ(&U):",IDC_STATIC,24,24,56,8
229 CONTROL "–³ŒÀ",IDC_UNDOLIM1,"Button",BS_AUTORADIOBUTTON | 233 CONTROL "–³ŒÀ",IDC_UNDOLIM1,"Button",BS_AUTORADIOBUTTON |
230 WS_GROUP | WS_TABSTOP,86,23,33,10 234 WS_GROUP | WS_TABSTOP,86,23,33,10
231 CONTROL "",IDC_UNDOLIM2,"Button",BS_AUTORADIOBUTTON,122,23,11,8 235 CONTROL "",IDC_UNDOLIM2,"Button",BS_AUTORADIOBUTTON,122,23,11,8
232 EDITTEXT IDC_UNDO_CT,134,21,24,12,ES_AUTOHSCROLL | ES_NUMBER 236 EDITTEXT IDC_UNDO_CT,134,21,24,12,ES_AUTOHSCROLL | ES_NUMBER
233 LTEXT "‰ñ",IDC_STATIC,162,24,8,8 237 LTEXT "‰ñ",IDC_STATIC,162,24,8,8
234 LTEXT "‰¡ˆÊ’u‚Ì•\Ž¦(&L):",IDC_STATIC,29,37,51,8 -  
-   238 RTEXT "‰¡ˆÊ’u‚Ì•\Ž¦(&L):",IDC_STATIC,29,37,51,8
235 CONTROL "•¶Žš”",IDC_COUNTBYLETTER,"Button",BS_AUTORADIOBUTTON | 239 CONTROL "•¶Žš”",IDC_COUNTBYLETTER,"Button",BS_AUTORADIOBUTTON |
236 WS_GROUP | WS_TABSTOP,86,36,33,10 240 WS_GROUP | WS_TABSTOP,86,36,33,10
237 CONTROL "•\Ž¦ˆÊ’u",IDC_COUNTBYLETTER2,"Button", 241 CONTROL "•\Ž¦ˆÊ’u",IDC_COUNTBYLETTER2,"Button",
238 BS_AUTORADIOBUTTON | WS_TABSTOP,122,35,38,10 -  
239 LTEXT "ƒtƒ@ƒCƒ‹—š—ðŒ”(&H):",IDC_STATIC,19,50,62,8 -  
-   242 BS_AUTORADIOBUTTON | WS_TABSTOP,122,36,42,10
-   243 RTEXT "̧²Ù—š—ðŒ”(&H):",IDC_STATIC,19,50,62,8
240 EDITTEXT IDC_LATEST_NUM,86,48,32,12,ES_AUTOHSCROLL | ES_NUMBER 244 EDITTEXT IDC_LATEST_NUM,86,48,32,12,ES_AUTOHSCROLL | ES_NUMBER
241 LTEXT "ƒtƒ@ƒCƒ‹EƒtƒBƒ‹ƒ^(&F):",IDC_STATIC,21,66,60,8 -  
-   245 RTEXT "̧²Ù¥Ì¨ÙÀ(&F):",IDC_STATIC,21,65,60,8
242 EDITTEXT IDC_TXTFILT,86,63,182,12,ES_AUTOHSCROLL 246 EDITTEXT IDC_TXTFILT,86,63,182,12,ES_AUTOHSCROLL
243 LTEXT "ŠO•”Grep(&G):",IDC_STATIC,42,81,39,8 -  
-   247 RTEXT "ŠO•”Grep(&G):",IDC_STATIC,21,80,60,8
244 EDITTEXT IDC_EXTGREP,86,78,182,12,ES_AUTOHSCROLL 248 EDITTEXT IDC_EXTGREP,86,78,182,12,ES_AUTOHSCROLL
245 LTEXT "V‹Kƒtƒ@ƒCƒ‹‚̃‚[ƒh(&N):",IDC_STATIC,9,95,73,8 -  
-   249 RTEXT "V‹Ķ²Ù‚ÌÓ°ÄÞ(&N):",IDC_STATIC,9,94,73,8
246 COMBOBOX IDC_NEWCS,86,92,76,162,CBS_DROPDOWNLIST | WS_VSCROLL | 250 COMBOBOX IDC_NEWCS,86,92,76,162,CBS_DROPDOWNLIST | WS_VSCROLL |
247 WS_TABSTOP 251 WS_TABSTOP
248 COMBOBOX IDC_NEWLB,164,92,39,162,CBS_DROPDOWNLIST | WS_VSCROLL | 252 COMBOBOX IDC_NEWLB,164,92,39,162,CBS_DROPDOWNLIST | WS_VSCROLL |
249 WS_TABSTOP 253 WS_TABSTOP
250 COMBOBOX IDC_NEWDT,204,92,65,164,CBS_DROPDOWNLIST | WS_VSCROLL | 254 COMBOBOX IDC_NEWDT,204,92,65,164,CBS_DROPDOWNLIST | WS_VSCROLL |
251 WS_TABSTOP 255 WS_TABSTOP
252 CONTROL "“¯‚¶ƒEƒCƒ“ƒhƒE‚ÅŠJ‚­(&R)",IDC_OPENSAME,"Button", -  
253 BS_AUTOCHECKBOX | WS_TABSTOP,181,25,83,10 -  
254 CONTROL "ƒEƒCƒ“ƒhƒEƒTƒCƒY‚ð‹L‰¯(&S)",IDC_REMSIZE,"Button", -  
255 BS_AUTOCHECKBOX | WS_TABSTOP,181,35,92,10 -  
256 CONTROL "ƒEƒCƒ“ƒhƒEˆÊ’u‚ð‹L‰¯(&P)",IDC_REMPLACE,"Button", -  
257 BS_AUTOCHECKBOX | WS_TABSTOP,181,45,86,10 -  
258 GROUPBOX "•¶‘ƒ^ƒCƒv•ÊÝ’è",IDC_STATIC,7,118,274,92 -  
-   256 CONTROL "“¯‚¶³²ÝÄÞ³‚ÅŠJ‚­(&R)",IDC_OPENSAME,"Button",
-   257 BS_AUTOCHECKBOX | WS_TABSTOP,181,25,90,10
-   258 CONTROL "³²ÝÄÞ³»²½Þ‚ð‹L‰¯(&S)",IDC_REMSIZE,"Button",
-   259 BS_AUTOCHECKBOX | WS_TABSTOP,181,35,96,10
-   260 CONTROL "³²ÝÄÞ³ˆÊ’u‚ð‹L‰¯(&P)",IDC_REMPLACE,"Button",
-   261 BS_AUTOCHECKBOX | WS_TABSTOP,181,45,94,10
-   262 GROUPBOX "•¶‘À²Ìߕʐݒè",IDC_STATIC,7,118,274,92
259 LISTBOX IDC_DOCTYPELIST,15,133,88,53,LBS_NOINTEGRALHEIGHT | 263 LISTBOX IDC_DOCTYPELIST,15,133,88,53,LBS_NOINTEGRALHEIGHT |
260 WS_VSCROLL | WS_TABSTOP 264 WS_VSCROLL | WS_TABSTOP
261 PUSHBUTTON "’ljÁ",IDC_NEWDOCTYPE,17,191,29,14 265 PUSHBUTTON "’ljÁ",IDC_NEWDOCTYPE,17,191,29,14
262 PUSHBUTTON "íœ",IDC_DELDOCTYPE,48,191,29,14 266 PUSHBUTTON "íœ",IDC_DELDOCTYPE,48,191,29,14
263 LTEXT "ƒpƒ^[ƒ“:",IDC_STATIC,114,138,27,8 -  
-   267 RTEXT "ÊßÀ°Ý:",IDC_STATIC,114,138,27,8
264 EDITTEXT IDC_DT_PAT,146,135,127,12,ES_AUTOHSCROLL 268 EDITTEXT IDC_DT_PAT,146,135,127,12,ES_AUTOHSCROLL
265 LTEXT "ƒL[ƒ[ƒh:",IDC_STATIC,108,155,34,8 -  
-   269 RTEXT "·°Ü°ÄÞ:",IDC_STATIC,108,155,34,8
266 COMBOBOX IDC_PAT_KWD,146,152,75,172,CBS_DROPDOWNLIST | CBS_SORT | 270 COMBOBOX IDC_PAT_KWD,146,152,75,172,CBS_DROPDOWNLIST | CBS_SORT |
267 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 271 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
268 PUSHBUTTON "•ÒW",IDC_EDITKWD,231,152,19,14 272 PUSHBUTTON "•ÒW",IDC_EDITKWD,231,152,19,14
269 LTEXT "ƒŒƒCƒAƒEƒg:",IDC_STATIC,111,172,31,8 -  
-   273 RTEXT "Ú²±³Ä:",IDC_STATIC,111,172,31,8
270 COMBOBOX IDC_PAT_LAY,146,169,75,172,CBS_DROPDOWNLIST | CBS_SORT | 274 COMBOBOX IDC_PAT_LAY,146,169,75,172,CBS_DROPDOWNLIST | CBS_SORT |
271 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 275 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
272 PUSHBUTTON "•ÒW",IDC_EDITLAY,231,169,19,14 276 PUSHBUTTON "•ÒW",IDC_EDITLAY,231,169,19,14
273 DEFPUSHBUTTON "OK",IDOK,175,214,50,14 277 DEFPUSHBUTTON "OK",IDOK,175,214,50,14
274 PUSHBUTTON "·¬Ý¾Ù",IDCANCEL,230,214,50,14 278 PUSHBUTTON "·¬Ý¾Ù",IDCANCEL,230,214,50,14
Line 554... Line 558...
554 EDITTEXT IDC_EXT,46,24,69,12,ES_AUTOHSCROLL 558 EDITTEXT IDC_EXT,46,24,69,12,ES_AUTOHSCROLL
555 DEFPUSHBUTTON "OK",IDOK,33,43,34,14 559 DEFPUSHBUTTON "OK",IDOK,33,43,34,14
556 PUSHBUTTON "Cancel",IDCANCEL,71,43,33,14 560 PUSHBUTTON "Cancel",IDCANCEL,71,43,33,14
557 END 561 END
558 562
559 #if !defined(TARGET_VER) || (defined(TARGET_VER) && TARGET_VER>310) -  
-   563 #if !defined(TARGET_VER) || (defined(TARGET_VER) && TARGET_VER>350)
560 IDD_CONFIG DIALOGEX 0, 0, 287, 236 564 IDD_CONFIG DIALOGEX 0, 0, 287, 236
561 #else 565 #else
562 IDD_CONFIG DIALOG 0, 0, 287, 236 566 IDD_CONFIG DIALOG 0, 0, 287, 236
563 #endif 567 #endif
564 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 568 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
565 CAPTION "Config" 569 CAPTION "Config"
566 FONT 9, "MS Sans Serif" 570 FONT 9, "MS Sans Serif"
567 BEGIN 571 BEGIN
568 GROUPBOX "Common",IDC_STATIC,7,7,273,106 572 GROUPBOX "Common",IDC_STATIC,7,7,273,106
569 LTEXT "&Undo:",IDC_STATIC,62,21,25,8 -  
-   573 RTEXT "&Undo:",IDC_STATIC,62,21,25,8
570 CONTROL "Infinite",IDC_UNDOLIM1,"Button",BS_AUTORADIOBUTTON | 574 CONTROL "Infinite",IDC_UNDOLIM1,"Button",BS_AUTORADIOBUTTON |
571 WS_GROUP | WS_TABSTOP,88,20,33,10 575 WS_GROUP | WS_TABSTOP,88,20,33,10
572 CONTROL "",IDC_UNDOLIM2,"Button",BS_AUTORADIOBUTTON,124,20,11,8 576 CONTROL "",IDC_UNDOLIM2,"Button",BS_AUTORADIOBUTTON,124,20,11,8
573 EDITTEXT IDC_UNDO_CT,135,18,24,12,ES_AUTOHSCROLL | ES_NUMBER 577 EDITTEXT IDC_UNDO_CT,135,18,24,12,ES_AUTOHSCROLL | ES_NUMBER
574 LTEXT "times",IDC_STATIC,163,21,17,8 578 LTEXT "times",IDC_STATIC,163,21,17,8
575 LTEXT "&Column by:",IDC_STATIC,46,33,40,8 -  
-   579 RTEXT "&Column by:",IDC_STATIC,46,33,40,8
576 CONTROL "Letters",IDC_COUNTBYLETTER,"Button",BS_AUTORADIOBUTTON | 580 CONTROL "Letters",IDC_COUNTBYLETTER,"Button",BS_AUTORADIOBUTTON |
577 WS_GROUP | WS_TABSTOP,88,32,33,10 -  
-   581 WS_GROUP | WS_TABSTOP,88,33,33,10
578 CONTROL "Positions",IDC_COUNTBYLETTER2,"Button", 582 CONTROL "Positions",IDC_COUNTBYLETTER2,"Button",
579 BS_AUTORADIOBUTTON | WS_TABSTOP,124,32,49,10 -  
580 LTEXT "M&RU File Num:",IDC_STATIC,34,45,52,8 -  
-   583 BS_AUTORADIOBUTTON | WS_TABSTOP,124,33,49,10
-   584 RTEXT "M&RU File Num:",IDC_STATIC,34,45,52,8
581 EDITTEXT IDC_LATEST_NUM,88,43,32,12,ES_AUTOHSCROLL | ES_NUMBER 585 EDITTEXT IDC_LATEST_NUM,88,43,32,12,ES_AUTOHSCROLL | ES_NUMBER
582 LTEXT "TextFile &Filter:",IDC_STATIC,36,63,44,8 -  
-   586 RTEXT "TextFile &Filter:",IDC_STATIC,36,61,51,8
583 EDITTEXT IDC_TXTFILT,88,59,176,12,ES_AUTOHSCROLL 587 EDITTEXT IDC_TXTFILT,88,59,176,12,ES_AUTOHSCROLL
584 LTEXT "Extrenal &Grep Program:",IDC_STATIC,12,77,77,8 -  
-   588 RTEXT "Extrenal &Grep Program:",IDC_STATIC,10,77,76,8
585 EDITTEXT IDC_EXTGREP,88,75,176,12,ES_AUTOHSCROLL 589 EDITTEXT IDC_EXTGREP,88,75,176,12,ES_AUTOHSCROLL
586 LTEXT "&New File Mode:",IDC_STATIC,34,93,53,8 -  
-   590 RTEXT "&New File Mode:",IDC_STATIC,34,92,53,8
587 COMBOBOX IDC_NEWCS,88,90,76,167,CBS_DROPDOWNLIST | WS_VSCROLL | 591 COMBOBOX IDC_NEWCS,88,90,76,167,CBS_DROPDOWNLIST | WS_VSCROLL |
588 WS_TABSTOP 592 WS_TABSTOP
589 COMBOBOX IDC_NEWLB,166,90,39,166,CBS_DROPDOWNLIST | WS_VSCROLL | 593 COMBOBOX IDC_NEWLB,166,90,39,166,CBS_DROPDOWNLIST | WS_VSCROLL |
590 WS_TABSTOP 594 WS_TABSTOP
591 COMBOBOX IDC_NEWDT,206,90,65,165,CBS_DROPDOWNLIST | WS_VSCROLL | 595 COMBOBOX IDC_NEWDT,206,90,65,165,CBS_DROPDOWNLIST | WS_VSCROLL |
592 WS_TABSTOP 596 WS_TABSTOP
593 CONTROL "Open in Same &Window",IDC_OPENSAME,"Button", 597 CONTROL "Open in Same &Window",IDC_OPENSAME,"Button",
594 BS_AUTOCHECKBOX | WS_TABSTOP,186,17,90,10 -  
-   598 BS_AUTOCHECKBOX | WS_TABSTOP,186,19,90,10
595 CONTROL "Remember Window &Size",IDC_REMSIZE,"Button", 599 CONTROL "Remember Window &Size",IDC_REMSIZE,"Button",
596 BS_AUTOCHECKBOX | WS_TABSTOP,186,27,92,10 -  
-   600 BS_AUTOCHECKBOX | WS_TABSTOP,186,31,92,10
597 CONTROL "Remember Window &Pos",IDC_REMPLACE,"Button", 601 CONTROL "Remember Window &Pos",IDC_REMPLACE,"Button",
598 BS_AUTOCHECKBOX | WS_TABSTOP,186,38,90,10 -  
-   602 BS_AUTOCHECKBOX | WS_TABSTOP,186,43,90,10
599 GROUPBOX "Document Types",IDC_STATIC,6,118,274,92 603 GROUPBOX "Document Types",IDC_STATIC,6,118,274,92
600 LISTBOX IDC_DOCTYPELIST,14,133,89,53,LBS_NOINTEGRALHEIGHT | 604 LISTBOX IDC_DOCTYPELIST,14,133,89,53,LBS_NOINTEGRALHEIGHT |
601 WS_VSCROLL | WS_TABSTOP 605 WS_VSCROLL | WS_TABSTOP
602 PUSHBUTTON "Add",IDC_NEWDOCTYPE,17,191,29,14 606 PUSHBUTTON "Add",IDC_NEWDOCTYPE,17,191,29,14
603 PUSHBUTTON "Del",IDC_DELDOCTYPE,50,191,29,14 607 PUSHBUTTON "Del",IDC_DELDOCTYPE,50,191,29,14
604 LTEXT "Pattern:",IDC_STATIC,117,138,23,8 -  
-   608 RTEXT "Pattern:",IDC_STATIC,117,138,27,8
605 EDITTEXT IDC_DT_PAT,149,135,123,12,ES_AUTOHSCROLL 609 EDITTEXT IDC_DT_PAT,149,135,123,12,ES_AUTOHSCROLL
606 LTEXT "Keyword:",IDC_STATIC,114,155,27,8 -  
-   610 RTEXT "Keyword:",IDC_STATIC,114,155,31,8
607 COMBOBOX IDC_PAT_KWD,149,152,72,172,CBS_DROPDOWNLIST | CBS_SORT | 611 COMBOBOX IDC_PAT_KWD,149,152,72,172,CBS_DROPDOWNLIST | CBS_SORT |
608 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 612 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
609 PUSHBUTTON "edit",IDC_EDITKWD,229,151,19,14 613 PUSHBUTTON "edit",IDC_EDITKWD,229,151,19,14
610 LTEXT "Layout: ",IDC_STATIC,118,172,24,8 -  
-   614 RTEXT "Layout:",IDC_STATIC,118,172,28,8
611 COMBOBOX IDC_PAT_LAY,149,169,72,172,CBS_DROPDOWNLIST | CBS_SORT | 615 COMBOBOX IDC_PAT_LAY,149,169,72,172,CBS_DROPDOWNLIST | CBS_SORT |
612 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 616 CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
613 PUSHBUTTON "edit",IDC_EDITLAY,229,169,19,14 617 PUSHBUTTON "edit",IDC_EDITLAY,229,169,19,14
614 DEFPUSHBUTTON "OK",IDOK,175,215,50,14 618 DEFPUSHBUTTON "OK",IDOK,175,215,50,14
615 PUSHBUTTON "Cancel",IDCANCEL,230,215,50,14 619 PUSHBUTTON "Cancel",IDCANCEL,230,215,50,14