diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc index a9ca4251..ba18d09e 100644 --- a/Contrib/UIs/UI Holder/resource.rc +++ b/Contrib/UIs/UI Holder/resource.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" - ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -26,100 +25,92 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON 103,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END -IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 - ICON 103,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,122,265,8 + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, + 0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34 END -IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - ICON 103,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, - 27,108,8 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,111,8 - LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | NOT WS_VISIBLE + ICON IDI_ICON2,IDC_ULICON,0,0,21,20 + LTEXT "",IDC_TEXT2,0,40,108,65 + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,111,8 + LTEXT "",IDC_INTROTEXT,25,0,241,25 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 END -IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | - WS_SYSMENU +IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 +STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP + PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, - 267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | - WS_GROUP,7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, + 7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP END -IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - 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_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, + 24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 - ICON 103,IDC_ULICON,0,0,20,20 + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP END -IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON 103,IDC_ULICON,0,1,20,20 + ICON IDI_ICON2,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,34 END -IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE +IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX + CTEXT "",IDC_STR,7,7,148,8 END - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -143,7 +134,4 @@ END #endif // APSTUDIO_INVOKED -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - +#endif \ No newline at end of file diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe index 4c99f3b3..3c5d0626 100755 Binary files a/Contrib/UIs/default.exe and b/Contrib/UIs/default.exe differ diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index e2351a64..9296c8e5 100644 Binary files a/Contrib/UIs/modern.exe and b/Contrib/UIs/modern.exe differ diff --git a/Contrib/UIs/modern_headerbmp.exe b/Contrib/UIs/modern_headerbmp.exe index 35390283..19a77e52 100644 Binary files a/Contrib/UIs/modern_headerbmp.exe and b/Contrib/UIs/modern_headerbmp.exe differ diff --git a/Contrib/UIs/modern_headerbmpr.exe b/Contrib/UIs/modern_headerbmpr.exe index 58566ab8..4a8570e7 100644 Binary files a/Contrib/UIs/modern_headerbmpr.exe and b/Contrib/UIs/modern_headerbmpr.exe differ diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe index e0c0bae4..d9d99ab9 100644 Binary files a/Contrib/UIs/modern_nodesc.exe and b/Contrib/UIs/modern_nodesc.exe differ diff --git a/Contrib/UIs/modern_smalldesc.exe b/Contrib/UIs/modern_smalldesc.exe index f69f18ba..9b20bce9 100644 Binary files a/Contrib/UIs/modern_smalldesc.exe and b/Contrib/UIs/modern_smalldesc.exe differ diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe index d96c337a..c2eb8ee4 100644 Binary files a/Contrib/UIs/sdbarker_tiny.exe and b/Contrib/UIs/sdbarker_tiny.exe differ diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc index c718e800..e4807741 100644 --- a/Source/exehead/resource.rc +++ b/Source/exehead/resource.rc @@ -36,7 +36,7 @@ STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END @@ -54,15 +54,13 @@ BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,122,265,8 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, + 0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34 END #endif @@ -75,15 +73,13 @@ IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, - 27,108,8 - LTEXT "",IDC_SPACEREQUIRED,0,111,111,18,SS_NOPREFIX | NOT - WS_GROUP - LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | NOT WS_VISIBLE + ICON IDI_ICON2,IDC_ULICON,0,0,21,20 + LTEXT "",IDC_TEXT2,0,40,108,65 + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFT,0,111,111,18 + LTEXT "",IDC_INTROTEXT,25,0,241,25 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 @@ -99,14 +95,13 @@ IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP + PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, - 267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | - WS_GROUP,7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, + 7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP END #endif @@ -119,10 +114,9 @@ IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - 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_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, + 24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 @@ -143,7 +137,7 @@ BEGIN ICON IDI_ICON2,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,34 END #endif @@ -156,7 +150,7 @@ IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX + CTEXT "",IDC_STR,7,7,148,8 END #endif