From 8e9acad170751789bf1ed985f86765a4e57afe77 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 9 Jul 2005 10:45:53 +0000 Subject: [PATCH] passed rc files through msvc to fix compatibility with mingw git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4166 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/UIs/modern.rc | 155 +++++++++++++++++-------------- Contrib/UIs/modern_headerbmp.rc | 39 ++++---- Contrib/UIs/modern_headerbmpr.rc | 39 ++++---- Contrib/UIs/modern_nodesc.rc | 19 ++-- Contrib/UIs/modern_smalldesc.rc | 23 ++--- Contrib/UIs/sdbarker_tiny.rc | 134 +++++++++++++------------- 6 files changed, 219 insertions(+), 190 deletions(-) diff --git a/Contrib/UIs/modern.rc b/Contrib/UIs/modern.rc index 92b3743b..fe329969 100644 --- a/Contrib/UIs/modern.rc +++ b/Contrib/UIs/modern.rc @@ -4,115 +4,128 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_LICENSE DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 15 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 93 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 113, 300, 26 + LTEXT "",1040,0,0,300,15,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,15,300,93 + LTEXT "",IDC_INTROTEXT,0,113,300,26,NOT WS_GROUP END IDD_DIR DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_BORDER | WS_TABSTOP, 10, 85, 215, 12 - CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 233, 83, 55, 15 - CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 125, 150, 8 - CONTROL "", IDC_CHECK1, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_TABSTOP | NOT WS_VISIBLE, 180, IDB_BITMAP1, 118, 10 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 115, 150, 8 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 60 - CONTROL "", IDC_SELDIRTEXT, BUTTON, BS_GROUPBOX | WS_CHILD, 0, 70, 300, 35 + EDITTEXT IDC_DIR,10,85,215,12,ES_AUTOHSCROLL + PUSHBUTTON "",IDC_BROWSE,233,83,55,15 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,125, + 150,8 + CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | + WS_TABSTOP,180,110,118,10 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,115, + 150,8 + LTEXT "",IDC_INTROTEXT,0,0,300,60,NOT WS_GROUP + GROUPBOX "",IDC_SELDIRTEXT,0,70,300,35 END IDD_SELCOM DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP | NOT WS_VISIBLE, 102, 25, 98, 107 - CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD, 0, 40, 95, 65 - CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 25, 95, 8 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD, 0, 115, 100, 18 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 20 - CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_BORDER | WS_TABSTOP, 102, 40, 98, 95 - CONTROL "", 1042, BUTTON, BS_GROUPBOX | WS_CHILD, 210, 36, 89, 99 - CONTROL "", 1043, STATIC, SS_LEFT | WS_CHILD, 215, 46, 78, 84 + COMBOBOX IDC_COMBO1,102,25,98,107,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_TEXT2,0,40,95,65,NOT WS_GROUP + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,25,95,8 + LTEXT "",IDC_SPACEREQUIRED,0,115,100,18,NOT WS_GROUP + LTEXT "",IDC_INTROTEXT,0,0,300,20,NOT WS_GROUP + CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | + WS_BORDER | WS_TABSTOP,102,40,98,95 + GROUPBOX "",1042,210,36,89,99 + LTEXT "",1043,215,46,78,84,NOT WS_GROUP END IDD_INST DIALOGEX 0, 0, 331, 222 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 - CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 216, 201, 50, 14 - CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 273, 201, 50, 14 - CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 15, 45, 300, 140 - CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 0, 331, 193 - CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 5, 193, 321, 1 - CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 35, 340, 1 - CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 193, 340, 1 - CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 0, 0, 332, 35 - CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 10, 5, 280, 10 - CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 15, 16, 275, 16 - CONTROL IDI_ICON2, 1039, STATIC, SS_ICON | WS_CHILD | WS_GROUP, 300, 8, 21, 20 + PUSHBUTTON "",3,166,201,50,14,WS_GROUP + PUSHBUTTON "",1,216,201,50,14 + PUSHBUTTON "",2,273,201,50,14 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,15,45,300,140 + CONTROL "",1044,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,0,0,331,193 + CONTROL "",IDC_LICENSEDISAGREE,"Static",SS_ETCHEDHORZ | WS_GROUP, + 5,193,321,1 + CONTROL "",1036,"Static",SS_ETCHEDHORZ | WS_GROUP,0,35,340,1 + CONTROL "",1045,"Static",SS_ETCHEDHORZ | NOT WS_VISIBLE | + WS_GROUP,0,193,340,1 + LTEXT "",1256,5,188,322,8 + LTEXT "",IDC_VERSTR,5,188,322,8,WS_DISABLED + LTEXT "",IDC_LICENSEAGREE,0,0,332,35 + LTEXT "",1037,10,5,280,10 + LTEXT "",1038,15,16,275,16 + ICON 103,1039,300,8,21,20,WS_GROUP END IDD_INSTFILES DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD, 1, 26, 60, 14 - CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_BORDER, 0, 10, 300, 11 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD, 0, 0, 300, 10 - CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | WS_BORDER | WS_TABSTOP | NOT WS_VISIBLE, 0, 25, 300, 110 + PUSHBUTTON "",IDC_SHOWDETAILS,1,26,60,14,NOT WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,0,10,300, + 11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,0,300,10 + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | + LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | + WS_TABSTOP,0,25,300,110 END IDD_UNINST DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD, 0, 42, 60, 8 - CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_BORDER | WS_TABSTOP, 65, 40, 234, 12 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 30 + LTEXT "",IDC_UNINSTFROM,0,42,60,8,NOT WS_GROUP + EDITTEXT IDC_EDIT1,65,40,234,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "",IDC_INTROTEXT,0,0,300,30,NOT WS_GROUP END IDD_LICENSE_FSRB DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 15 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 73 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 93, 300, 26 - CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_TABSTOP, 0, 120, 300, 9 - CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_TABSTOP, 0, 130, 300, 9 + LTEXT "",1040,0,0,300,15,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,15,300,73 + LTEXT "",IDC_INTROTEXT,0,93,300,26,NOT WS_GROUP + CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,0,120,300,9 + CONTROL "",IDC_LICENSEDISAGREE,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,0,130,300,9 END IDD_LICENSE_FSCB DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 15 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 83 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 103, 300, 26 - CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_TABSTOP, 0, 130, 300, 9 + LTEXT "",1040,0,0,300,15,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,15,300,83 + LTEXT "",IDC_INTROTEXT,0,103,300,26,NOT WS_GROUP + CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,0,130,300,9 END IDD_VERIFY DIALOGEX 0, 0, 167, 42 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD, 40, 25, 120, 10 - CONTROL IDI_ICON2, -1, STATIC, SS_ICON | WS_CHILD, 10, 10, 21, 20 - CONTROL "Please wait while Setup is loading...", 76, STATIC, SS_CENTER | WS_CHILD, 40, 10, 120, 10 + CTEXT "",IDC_STR,40,25,120,10,NOT WS_GROUP + ICON 103,-1,10,10,21,20 + CTEXT "Please wait while Setup is loading...",76,40,10,120,10, + NOT WS_GROUP END diff --git a/Contrib/UIs/modern_headerbmp.rc b/Contrib/UIs/modern_headerbmp.rc index abb511de..ccc8c62c 100644 --- a/Contrib/UIs/modern_headerbmp.rc +++ b/Contrib/UIs/modern_headerbmp.rc @@ -3,23 +3,26 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_INST DIALOGEX 0, 0, 331, 222 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 - CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 216, 201, 50, 14 - CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 273, 201, 50, 14 - CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 15, 45, 300, 140 - CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 0, 331, 193 - CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 5, 193, 321, 1 - CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 35, 340, 1 - CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 193, 340, 1 - CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 0, 0, 332, 35 - CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 105, 5, 215, 10 - CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 110, 16, 210, 16 - CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD, 0, 0, 100, 35 + PUSHBUTTON "",3,166,201,50,14,WS_GROUP + PUSHBUTTON "",1,216,201,50,14 + PUSHBUTTON "",2,273,201,50,14 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,15,45,300,140 + CONTROL "",1044,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,0,0,331,193 + CONTROL "",IDC_LICENSEDISAGREE,"Static",SS_ETCHEDHORZ | WS_GROUP, + 5,193,321,1 + CONTROL "",1036,"Static",SS_ETCHEDHORZ | WS_GROUP,0,35,340,1 + CONTROL "",1045,"Static",SS_ETCHEDHORZ | NOT WS_VISIBLE | + WS_GROUP,0,193,340,1 + LTEXT "",1256,5,188,322,8 + LTEXT "",IDC_VERSTR,5,188,322,8,WS_DISABLED + LTEXT "",IDC_LICENSEAGREE,0,0,332,35 + LTEXT "",1037,105,5,215,10 + LTEXT "",1038,110,16,210,16 + CONTROL "",1046,"Static",SS_BITMAP,0,0,100,35 END - diff --git a/Contrib/UIs/modern_headerbmpr.rc b/Contrib/UIs/modern_headerbmpr.rc index ebab6d34..ca7ec54e 100644 --- a/Contrib/UIs/modern_headerbmpr.rc +++ b/Contrib/UIs/modern_headerbmpr.rc @@ -3,23 +3,26 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_INST DIALOGEX 0, 0, 331, 222 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 - CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 216, 201, 50, 14 - CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 273, 201, 50, 14 - CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 15, 45, 300, 140 - CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 0, 331, 193 - CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 5, 193, 321, 1 - CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 35, 340, 1 - CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 0, 193, 340, 1 - CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 - CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 0, 0, 332, 35 - CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 10, 5, 215, 10 - CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 15, 16, 210, 16 - CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD, 231, 0, 100, 35 + PUSHBUTTON "",3,166,201,50,14,WS_GROUP + PUSHBUTTON "",1,216,201,50,14 + PUSHBUTTON "",2,273,201,50,14 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,15,45,300,140 + CONTROL "",1044,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,0,0,331,193 + CONTROL "",IDC_LICENSEDISAGREE,"Static",SS_ETCHEDHORZ | WS_GROUP, + 5,193,321,1 + CONTROL "",1036,"Static",SS_ETCHEDHORZ | WS_GROUP,0,35,340,1 + CONTROL "",1045,"Static",SS_ETCHEDHORZ | NOT WS_VISIBLE | + WS_GROUP,0,193,340,1 + LTEXT "",1256,5,188,322,8 + LTEXT "",IDC_VERSTR,5,188,322,8,WS_DISABLED + LTEXT "",IDC_LICENSEAGREE,0,0,332,35 + LTEXT "",1037,10,5,215,10 + LTEXT "",1038,15,16,210,16 + CONTROL "",1046,"Static",SS_BITMAP,231,0,100,35 END - diff --git a/Contrib/UIs/modern_nodesc.rc b/Contrib/UIs/modern_nodesc.rc index f07e3398..b61b5bf0 100644 --- a/Contrib/UIs/modern_nodesc.rc +++ b/Contrib/UIs/modern_nodesc.rc @@ -4,14 +4,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SELCOM DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP | NOT WS_VISIBLE, 102, 25, 195, 104 - CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD, 0, 40, 95, 65 - CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 25, 95, 8 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD, 0, 115, 100, 18 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 20 - CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_BORDER | WS_TABSTOP, 102, 40, 195, 95 + COMBOBOX IDC_COMBO1,102,25,195,104,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_TEXT2,0,40,95,65,NOT WS_GROUP + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,25,95,8 + LTEXT "",IDC_SPACEREQUIRED,0,115,100,18,NOT WS_GROUP + LTEXT "",IDC_INTROTEXT,0,0,300,20,NOT WS_GROUP + CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | + WS_BORDER | WS_TABSTOP,102,40,195,95 END - diff --git a/Contrib/UIs/modern_smalldesc.rc b/Contrib/UIs/modern_smalldesc.rc index fab314fe..9b09a525 100644 --- a/Contrib/UIs/modern_smalldesc.rc +++ b/Contrib/UIs/modern_smalldesc.rc @@ -4,16 +4,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_SELCOM DIALOGEX 0, 0, 300, 140 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP | NOT WS_VISIBLE, 102, 25, 195, 74 - CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD, 0, 40, 95, 65 - CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 25, 95, 8 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD, 0, 115, 100, 18 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 0, 0, 300, 20 - CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_BORDER | WS_TABSTOP, 102, 40, 195, 65 - CONTROL "", 1042, BUTTON, BS_GROUPBOX | WS_CHILD, 102, 105, 195, 35 - CONTROL "", 1043, STATIC, SS_LEFT | WS_CHILD, 108, 117, 183, 18 + COMBOBOX IDC_COMBO1,102,25,195,74,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_TEXT2,0,40,95,65,NOT WS_GROUP + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,25,95,8 + LTEXT "",IDC_SPACEREQUIRED,0,115,100,18,NOT WS_GROUP + LTEXT "",IDC_INTROTEXT,0,0,300,20,NOT WS_GROUP + CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | + WS_BORDER | WS_TABSTOP,102,40,195,65 + GROUPBOX "",1042,102,105,195,35 + LTEXT "",1043,108,117,183,18,NOT WS_GROUP END - diff --git a/Contrib/UIs/sdbarker_tiny.rc b/Contrib/UIs/sdbarker_tiny.rc index 09392464..34e6263e 100644 --- a/Contrib/UIs/sdbarker_tiny.rc +++ b/Contrib/UIs/sdbarker_tiny.rc @@ -4,106 +4,114 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_LICENSE DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 20, 20 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 23 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 47 + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,24,266,47 END IDD_DIR DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_BORDER | WS_TABSTOP, 8, 35, 187, 12 - CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 202, 34, 55, 14 - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 20, 20 - CONTROL "", IDC_SELDIRTEXT, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 22, 265, 8 - CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 1, 63, 265, 8 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 1, 54, 265, 8 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 18 + EDITTEXT IDC_DIR,8,35,187,12,ES_AUTOHSCROLL + PUSHBUTTON "",IDC_BROWSE,202,34,55,14 + ICON 103,IDC_ULICON,0,0,20,20 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP,0,22,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,1,63, + 265,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,1,54,265, + 8 + LTEXT "",IDC_INTROTEXT,25,0,241,18,NOT WS_GROUP END IDD_SELCOM DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP | NOT WS_VISIBLE, 114, 15, 152, 94 - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 21, 20 - CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD, 0, 33, 108, 29 - CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 20, 108, 8 - CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD, 0, 60, 111, 8 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 15 - CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_BORDER | WS_TABSTOP, 114, 28, 151, 42 + COMBOBOX IDC_COMBO1,114,15,152,94,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + ICON 103,IDC_ULICON,0,0,21,20 + LTEXT "",IDC_TEXT2,0,33,108,29,NOT WS_GROUP + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,20,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,60,111, + 8 + LTEXT "",IDC_INTROTEXT,25,0,241,15,NOT WS_GROUP + CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | + TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | + WS_BORDER | WS_TABSTOP,114,28,151,42 END IDD_INST DIALOGEX 0, 0, 280, 105 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP | NOT WS_VISIBLE, 171, 84, 50, 14 - CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 223, 84, 50, 14 - CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 7, 84, 50, 14 - CONTROL "", -1, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 7, 79, 265, 1 - CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP | NOT WS_VISIBLE, 7, 6, 266, 70 - CONTROL "", IDC_VERSTR, STATIC, SS_CENTER | WS_CHILD | WS_DISABLED | WS_GROUP, 59, 86, 108, 8 + PUSHBUTTON "",3,171,84,50,14,NOT WS_VISIBLE | WS_GROUP + PUSHBUTTON "",1,223,84,50,14 + PUSHBUTTON "",2,7,84,50,14 + CONTROL "",-1,"Static",SS_ETCHEDHORZ | WS_GROUP,7,79,265,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,7,6,266,70 + CTEXT "",IDC_VERSTR,59,86,108,8,WS_DISABLED END IDD_INSTFILES DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_BORDER, 24, 10, 241, 11 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD, 24, 0, 241, 8 - CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | WS_BORDER | WS_TABSTOP | NOT WS_VISIBLE, 0, 22, 265, 48 - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 20, 20 - CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD, 0, 28, 60, 14 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, + 11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,24,0,241,8 + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | + LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | + WS_TABSTOP,0,22,265,48 + ICON 103,IDC_ULICON,0,0,20,20 + PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP END IDD_UNINST DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 1, 20, 20 - CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD, 0, 47, 55, 8 - CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_BORDER | WS_TABSTOP, 56, 45, 209, 12 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 34 + ICON 103,IDC_ULICON,0,1,20,20 + LTEXT "",IDC_UNINSTFROM,0,47,55,8,NOT WS_GROUP + EDITTEXT IDC_EDIT1,56,45,209,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "",IDC_INTROTEXT,25,0,241,34,NOT WS_GROUP END IDD_LICENSE_FSRB DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 20, 20 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 23 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 27 - CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_TABSTOP, 0, 50, 266, 9 - CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_TABSTOP, 0, 60, 266, 9 + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,24,266,27 + CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,0,50,266,9 + CONTROL "",IDC_LICENSEDISAGREE,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,0,60,266,9 END IDD_LICENSE_FSCB DIALOGEX 0, 0, 266, 70 STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD, 0, 0, 20, 20 - CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD, 25, 0, 241, 23 - CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 37 - CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_TABSTOP, 0, 60, 266, 9 + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP + CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | + WS_TABSTOP | 0x804,0,24,266,37 + CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,0,60,266,9 END IDD_VERIFY DIALOGEX 0, 0, 162, 22 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD, 7, 7, 148, 8 + CTEXT "",IDC_STR,7,7,148,8,NOT WS_GROUP END -