From 63276d86899cc84234a8e09a304e66021e5c89de Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 22 Jun 2005 15:55:41 +0000 Subject: [PATCH] build UIs from source git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4124 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/UIs/SConscript | 30 +++-- Contrib/UIs/UI Holder/ui.dsp | 83 ------------ Contrib/UIs/UI Holder/ui.dsw | 29 ----- Contrib/UIs/default.exe | Bin 6144 -> 0 bytes .../UIs/{UI Holder/resource.rc => default.rc} | 94 +------------- Contrib/UIs/modern.exe | Bin 6656 -> 0 bytes Contrib/UIs/modern.rc | 118 ++++++++++++++++++ Contrib/UIs/modern_headerbmp.exe | Bin 4608 -> 0 bytes Contrib/UIs/modern_headerbmp.rc | 25 ++++ Contrib/UIs/modern_headerbmpr.exe | Bin 4608 -> 0 bytes Contrib/UIs/modern_headerbmpr.rc | 25 ++++ Contrib/UIs/modern_nodesc.exe | Bin 4096 -> 0 bytes Contrib/UIs/modern_nodesc.rc | 17 +++ Contrib/UIs/modern_smalldesc.exe | Bin 4096 -> 0 bytes Contrib/UIs/modern_smalldesc.rc | 19 +++ Contrib/UIs/{UI Holder => }/resource.h | 25 ++-- Contrib/UIs/sdbarker_tiny.exe | Bin 6144 -> 0 bytes Contrib/UIs/sdbarker_tiny.rc | 109 ++++++++++++++++ Contrib/UIs/{UI Holder/ui.cpp => ui.c} | 6 +- SConstruct | 16 ++- 20 files changed, 362 insertions(+), 234 deletions(-) delete mode 100644 Contrib/UIs/UI Holder/ui.dsp delete mode 100644 Contrib/UIs/UI Holder/ui.dsw delete mode 100755 Contrib/UIs/default.exe rename Contrib/UIs/{UI Holder/resource.rc => default.rc} (69%) delete mode 100644 Contrib/UIs/modern.exe create mode 100644 Contrib/UIs/modern.rc delete mode 100644 Contrib/UIs/modern_headerbmp.exe create mode 100644 Contrib/UIs/modern_headerbmp.rc delete mode 100644 Contrib/UIs/modern_headerbmpr.exe create mode 100644 Contrib/UIs/modern_headerbmpr.rc delete mode 100644 Contrib/UIs/modern_nodesc.exe create mode 100644 Contrib/UIs/modern_nodesc.rc delete mode 100644 Contrib/UIs/modern_smalldesc.exe create mode 100644 Contrib/UIs/modern_smalldesc.rc rename Contrib/UIs/{UI Holder => }/resource.h (78%) delete mode 100644 Contrib/UIs/sdbarker_tiny.exe create mode 100644 Contrib/UIs/sdbarker_tiny.rc rename Contrib/UIs/{UI Holder/ui.cpp => ui.c} (97%) diff --git a/Contrib/UIs/SConscript b/Contrib/UIs/SConscript index 02c75534..d85df40a 100644 --- a/Contrib/UIs/SConscript +++ b/Contrib/UIs/SConscript @@ -1,13 +1,25 @@ +code = 'ui.c' + uis = Split(""" - default.exe - modern.exe - modern_headerbmp.exe - modern_headerbmpr.exe - modern_nodesc.exe - modern_smalldesc.exe - sdbarker_tiny.exe + default + modern + modern_headerbmp + modern_headerbmpr + modern_nodesc + modern_smalldesc + sdbarker_tiny """) -Import('defenv') +libs = Split(""" + kernel32 + comctl32 + user32 + gdi32 +""") -defenv.DistributeContribs('UIs', uis) +Import('BuildUtil env') + +code = env.Object(code) + +for ui in uis: + BuildUtil(ui, code, libs, entry = 'WinMain', res = ui + '.rc', install = 'Contrib/UIs') diff --git a/Contrib/UIs/UI Holder/ui.dsp b/Contrib/UIs/UI Holder/ui.dsp deleted file mode 100644 index 7918f006..00000000 --- a/Contrib/UIs/UI Holder/ui.dsp +++ /dev/null @@ -1,83 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ui" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=ui - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ui.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ui.mak" CFG="ui - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ui - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40d /d "NDEBUG" -# ADD RSC /l 0x40d /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /entry:"WinMain" /subsystem:windows /machine:I386 /nodefaultlib /out:"../default.exe" /opt:nowin98 -# SUBTRACT LINK32 /pdb:none -# Begin Target - -# Name "ui - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ui.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\resource.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/Contrib/UIs/UI Holder/ui.dsw b/Contrib/UIs/UI Holder/ui.dsw deleted file mode 100644 index 10f9172a..00000000 --- a/Contrib/UIs/UI Holder/ui.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ui"=.\ui.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe deleted file mode 100755 index 9d627995e2609ee15c86623c262ed918dfe8d1c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6144 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 ISw0!~Ul|Vb<^TWy diff --git a/Contrib/UIs/modern.rc b/Contrib/UIs/modern.rc new file mode 100644 index 00000000..07c1cb20 --- /dev/null +++ b/Contrib/UIs/modern.rc @@ -0,0 +1,118 @@ +#include "resource.h" + +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" +BEGIN + CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 93 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 113, 300, 26 +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" +BEGIN + CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 10, 85, 215, 12 + CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 233, 83, 55, 15 + CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 125, 150, 8 + CONTROL "", IDC_CHECK1, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_TABSTOP, 180, IDB_BITMAP1, 118, 10 + CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 115, 150, 8 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 60 + CONTROL "", IDC_SELDIRTEXT, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 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" +BEGIN + CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 102, 25, 98, 107 + CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 40, 95, 65 + CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 25, 95, 8 + CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 115, 100, 18 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 20 + CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 102, 40, 98, 95 + CONTROL "", 1042, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 210, 36, 89, 99 + CONTROL "", 1043, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 215, 46, 78, 84 +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" +BEGIN + CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 + CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 + CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 + CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 + CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 + CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 + CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 + CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 + CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 + CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 10, 5, 280, 10 + CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 15, 16, 275, 16 + CONTROL IDI_ICON2, 1039, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE | WS_GROUP, 300, 8, 21, 20 +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" +BEGIN + CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE, 1, 26, 60, 14 + CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_VISIBLE | WS_BORDER, 0, 10, 300, 11 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD | WS_VISIBLE, 0, 0, 300, 10 + CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | 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" +BEGIN + CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 42, 60, 8 + CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 65, 40, 234, 12 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 30 +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" +BEGIN + CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 73 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 93, 300, 26 + CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 120, 300, 9 + CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | 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" +BEGIN + CONTROL "", 1040, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 15 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 15, 300, 83 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 103, 300, 26 + CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | 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" +BEGIN + CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 40, 25, 120, 10 + CONTROL IDI_ICON2, -1, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 10, 10, 21, 20 + CONTROL "Please wait while Setup is loading...", 76, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 40, 10, 120, 10 +END + diff --git a/Contrib/UIs/modern_headerbmp.exe b/Contrib/UIs/modern_headerbmp.exe deleted file mode 100644 index edf2d75dbfe7e9d6375e3a5de474373040173428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKU1%It6h5=b)@^<_lGWnx#0G4kS!$C&AWfJiyL3Z0?V8=}7Jpi&JCn?;n;Ds% zwJlT#HWgu85K+XJVky)I!6zX_3T_l)D-=qRHcukrgMos5C@tv2^}BawlO-g55ov{- zaPGO^`OZ1_+&hz?q6Q*rgfd2S8J3G8#)l6}pxa*jwvE2odcEtil)T=RG0c+u zj$=WrLMEz5T0W4i2=E!ni>*rBvMV{3Y}wY90+FMUS2`ujrHrTLl;2ELpBLEtav zZ@}K%`S<)H?5Bax=BuzL*1oCNPJ{L~lhMO?6eA5s!mI#Drk$L_zmaFO1G||86LcZ{c876ryU>DLHw# z#9rYL_1a+TL=mS^=h&P+@)NipoZGFCRDOE4RZNUdKo$wf3SImV(@Ly6)H5IvJy?3S z`ryX)Aa{Nrrpd~k(|5v^cuTe?47PplPi!U8ex}I5d_0_RpGzd%ZN2xitQ=yI0o2Q~ zNFU7d7(#lhQ>WhxOYNUj&&7yIK^av~HZx(DcOc;O5O)QgX4c9l%boCDn8mF3{@|kf zM2barqt*q^Wep0WXDriqhJacBDLzJaAz*OvB2Q|c`x)(>i{DKdf8p0ow3GymGTkto z5Iz~85XqwFd#rpn%ldgTi|pX;Pz@!6!Z%8CiFMxJt!f^f_(#;gnrF^kgKvVVi<-m z47^n5dlGpvaJA0Y2VV&Ia-DCO_f&_0R^-3v`zwl{Fx`}6=k-#F9BIGqj@w$fs3%lQ zE9(1*h671k)sp5hM|DmDABayJj3;~dM73g(XfTl0Eo~gh>NJo30NBl$mS!K%;HeDH z$APqAANO4Nja%hYc8TbfKsxW}x|Oj7YjG4ApnyzmJY<3^J-( zc^&unLEOahFwtIlM9m}cV0tVqzpFbX)3$i9z>_82k;g1occ#?5F89b8+>NHi>+^T^ zxK_KjMET9(u{r^Xg6LpIy1faf1;%m|aiO^58 z-lxC;=@*~(J~hTEO)}IVor?IADTa~XE349wx<#c>|tkJ7vJP ztk0wVg5V?T@HkY|zd|EYi2higKV0Ma3+LMYcs}nxDQ%~w4R{k*{WdjG>ju1q56PR* Ywsm-1S5aTX9-mr==WB1u<9h=C0Aa@5VE_OC diff --git a/Contrib/UIs/modern_headerbmp.rc b/Contrib/UIs/modern_headerbmp.rc new file mode 100644 index 00000000..8b146390 --- /dev/null +++ b/Contrib/UIs/modern_headerbmp.rc @@ -0,0 +1,25 @@ +#include "resource.h" + +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" +BEGIN + CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 + CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 + CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 + CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 + CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 + CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 + CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 + CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 + CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 + CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 105, 5, 215, 10 + CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 110, 16, 210, 16 + CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 100, 35 +END + diff --git a/Contrib/UIs/modern_headerbmpr.exe b/Contrib/UIs/modern_headerbmpr.exe deleted file mode 100644 index 7c60ebaf9e112ecf601c5b3d66999a38bc3cee07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKU1$_n6h5=b+BJW>DcM%~JE?&xn8lg|gqScUySTxPZnK+R>5q2Y88fq8XUgns zRj?3hEQM7lrKR*mDgk{c^r;XjLN_g>S`b8v=BboYXahoh5QX;P_PcjxlSL9=O3^}2 zIQQJ|eCM2d?w!fb%=l{`Q4b&+(?MTvyw-h5N?q&D8fIC3 z$FZjz^{8A>Ez5T0!@BHLEZMZ=`2LK1)YkM^dwWZdU;4Ci<+u6n3v+cH417EHy}%de zuEXBg`uE%d?5Bax=4!ATUj9PZ3A14EoV7YkCx}u~Go5?BI8=}Mg~C#+w87hKi|75J z6E*^sIaa)Rzzg9Xel9}N7<~X5f+U`|Y<rn)N5h{wSpVnVPDqM-Yj7e;5ee>;@Nw{fr{3Q;ZQl$`=x zVy|$BdL6J0qKMOIaI8-s`3c+$&TLmmsysd2E+$47Ad7}%g=Rm*v>NXT_3o62?k_%D zyMKLikUPJN&}8-YsoRliqAk}O0UMtA6I)4!PnS5DOGJ|HbIGK;sqbEnRYEMf6ZLW| z+7GidhLFD6kyGzQr0^%TvvFclP)5}gtxVXZEeJR@#9cwBm9_K9QWt#Zr!nihH@M(F zk!I2DsCAxmIfEkT8O!vaCSW#jl8@1C2pC+LYJf_btn#Oq!5^4x2glYtg#EoXvV)? zhTTlFTSh-{vB?M9IFNkM!$H6U#h{3(4)GO`Rt$=6eG)lFCr%;5qDk<@AeKAydSC6} zRa}l-o<)hTTtYn-jbK_G=)%~?^6X~b*cnkMUo`Wx;%LxQbQee@ZGt&;@R8q!>kT}j z6TstdnlJsrOI`!9ZlY(PZBQ;}V9!BMLN7yaK!1hag%WZs*f*dl=vUkaxgrZAhGF<3 zz>5vOCy^%u*BX5N@P&XcHTZ^kPYoDoS^kT@zof)*(@i^eK`)odk@o2BxUE%6dQ!Et zlD?a0IFPbcEoB~dRObZn-o(VdM5=E`Oe>X$1_K%0(#DajPVwjufZe=lY4))!p33li z9LN~k=u4A9@muU*1xch3wbp6g~ffAPHCDA$ZCL{K7zrbWBF;U;q zR)2*Nr&2b?EX{Oy7klDke!%Gd@zLz^{+BP#`s9Ce0!PrP0iA*tp>IRE;8Q>dgN&+H zLC5{Q4>z$qOtecLQ40v%ml?~*@9Iw3v@ISi@MKwcNmwV+b?ncw%_4zw{ zLaX0fqWt>sSe<}GLG-i9eCI5idDO%nm3R0#IKh@ipmzWa!6f z?^9r}^s~=bq$_qGiAZI zt{bIzc+SlO2_>jB- a?O27!bxr?{`Wp85)G9n*dtDyi6Zi*(Lfnb~ diff --git a/Contrib/UIs/modern_headerbmpr.rc b/Contrib/UIs/modern_headerbmpr.rc new file mode 100644 index 00000000..4f6bf2a1 --- /dev/null +++ b/Contrib/UIs/modern_headerbmpr.rc @@ -0,0 +1,25 @@ +#include "resource.h" + +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" +BEGIN + CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 166, 201, 50, 14 + CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 216, 201, 50, 14 + CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 273, 201, 50, 14 + CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 15, 45, 300, 140 + CONTROL "", 1044, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 0, 0, 331, 193 + CONTROL "", IDC_LICENSEDISAGREE, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 193, 321, 1 + CONTROL "", 1036, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 35, 340, 1 + CONTROL "", 1045, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_GROUP, 0, 193, 340, 1 + CONTROL "", 1256, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_VERSTR, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 5, 188, 322, 8 + CONTROL "", IDC_LICENSEAGREE, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 0, 0, 332, 35 + CONTROL "", 1037, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 10, 5, 215, 10 + CONTROL "", 1038, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 15, 16, 210, 16 + CONTROL "", 1046, STATIC, SS_BITMAP | WS_CHILD | WS_VISIBLE, 231, 0, 100, 35 +END + diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe deleted file mode 100644 index d9d99ab987cfb6b37782df4d03b143cef32fd7b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeHKUuaWT82@hCxHzqi(xC3|?N*qA24`9jYRlCon6gx}CQZiv*jqEu zaL~5mQCo~gCH{0$1(O&kj)2Cwy~Z4zH@Kd4%DX&9rO#| z`M%%x?|kRvB=???7vH5eB5DTEp z$S7E4toeG#4`B=Mi=-^Z0Kg4G66Y<-0I~^`SBc83XhcU8R{kYYQTraH;+}ELgMSq_ z$^CK9i;I8`Qi)!TyJg+eu}2&SgNzCG1W1yG?&E$Kon*@nFvqWDutXYBGw#;h5=?Tf zFvz%dkjqGuyRpo$qTcr%xD}q+p^;MGINc!?vkOqfBC1Ab-+|gl_C&Vt!U4X0?a}7# zOHYT{_-&NN8rM%;k2X?k3)`dccFz2YrKCG&s|@B+(X{tiI_+&r+$xBAM8tNXUO~iq zAr^)al4wqxcq6KGzTZ5RB%y>=RGnHQq+Hm7fD;333cG7W2P+F*u$`HPmbleF?>&?i zu^p&&hJ6K-qUagZ^v)8n=sV71Y#Rdl=g)Fd=gbdi?^NnW*8Cm+cCw`m+$hrn!47Ft z0V=TqdcG;@HwvPUlSOO`nt!Qg7 z!(O*uGl%W6<#HGMlEXp3(1DSm{Nnl-znm52f3pJ<=+p#Hf-B(Hz)ZLbND`nS-7Xn8 z-}`Zh)j^`&>R!Es!2P-5ocg-q)-1>7V2Q_ShN}+Sp5adDB}3h==5ZP=o9pvCd#ctRn zO_BEqX#Q1WgmR>UO){v8k4j05d{$c2M%~&3ZKm^x`Hf%Q#B9sel3AiHG){ZyFX?}) zWtS3H75F#9AE7_*;71VrHQd!UkhrU#JMW@j?%>}@Z)PVj|9PH)U-)PW)$-(GMFthf P!g!PtwDTWbJviWRJfXm) diff --git a/Contrib/UIs/modern_nodesc.rc b/Contrib/UIs/modern_nodesc.rc new file mode 100644 index 00000000..c9881e12 --- /dev/null +++ b/Contrib/UIs/modern_nodesc.rc @@ -0,0 +1,17 @@ +#include "resource.h" + +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" +BEGIN + CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 102, 25, 195, 104 + CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 40, 95, 65 + CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 25, 95, 8 + CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 115, 100, 18 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 0, 300, 20 + CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 102, 40, 195, 95 +END + diff --git a/Contrib/UIs/modern_smalldesc.exe b/Contrib/UIs/modern_smalldesc.exe deleted file mode 100644 index 9b20bce96f812a33a2071fa10c5b4790d5a3465b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeHKUuauZ82@hCY?)ivtTwFk@2xAiK^N-MLZNH9TN9RQ+QlYK#6PQd$!+hA*}Zae z<5rkZT`NL15K+XJu~E(r7(04qeDfHzjN+Q+l_4xqD-M* z_|EtJzJKRCCnve*4nO}6H4srFm@%SxNKT3v?>$_Fd+Xz0Y^BdPU1*<|5*OOjx>1r} zwXI28Ju2r^)3hA|oKdRQb&-YbzLEw+8 z7a=e0{=K>g`M&RiY7KJ3lV^n-HF7%7xm$Ie!)`W&9g-gsT-t|#^1@NXwtO2CaW9T40h zY%)M0ltIroSowN}_3&gC+QrR*I#Pg^W>7Cxc`1;s^hbg91Oij+N~MRF)%OAEjriH6 z*ySX4ty>s_(e>mpU;4_f?ss&Igz7p!!D#)C=P$YkLku=h|~^$ zhp!`(Wg+4-7g3Lef>0|xtr#OL%Pwd2-k?I+f{~pQTZ5iL``|=U8^rkG`+f}98@Nw9 zfXCl7pZc*U+y=t!L=SCTL5@|jctJUv<3sM(7)05ClotwI7!>eX{8d`(m~A`w({ko7FW%D zQQJ>6;7eF)K4BcOReK8fnb_z^ED_lo&KHYBeZG`t=7*82PV(rtfSs&i=B;CCJe6U2 z*O$_*W3CDRajX8MRU&%Im&)0iW~QydqM@01j61vsH+)pfIkb)AXmN7L(T)<0(V(rV zjuti4qBWURap}SwA5v5+Ikq+BP1E2*ap&2x;dq_VBE`(Sn?z^GRSsCky#iyY*l2x4 zyS*6>*yWNwWabTi=-bjl3 zYSAf)_XwC>JWMH)!8&PF#7CwmMt)Z6)IjaZ1nr;&dYXRaS2s3WchzN*Xcvvse)?1R z->ln(#H$MYJKzt{A9wI02>ue@)mn(%)lbwZwbIXb@NcI#k`tJJ0rLm=g^#9CEloC7 xq)~ + +#ifndef IDC_STATIC +#define IDC_STATIC (-1) +#endif + #ifndef DS_SHELLFONT -#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS) +#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS) #endif #define IDC_BACK 3 @@ -41,16 +43,3 @@ #define IDC_BRANDIMAGE 1033 #define IDC_LICENSEAGREE 1034 #define IDC_LICENSEDISAGREE 1035 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 112 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1036 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif - - diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe deleted file mode 100644 index deb495f5b31cf91341137916cffe6a400fa40132..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6144 zcmeHLZ%k8H6hE&}dHj=V=w!;ahcaUpK_alR30k3@B^K={7B(HMwoh7C+U50iLZV5T zn3$l8VJ7p_rt`~^CHrJD_U8jLi(@7xY+2NAGy5co*<51O{eAo0`(EJ{si1R-%Q(%w z=bk_J+;h(T_io!>IZio5l#8NiL}S1V9K61FH3{+3r#@RsXY(&sj0v8L6&>M7LV81q z_bP#YDHw>w;;OV)mXu^nio_)6PM_2t56RWV#RZjy>GG~MUv@p;Hfk=rIqeyB1HZ7g zd$b3*Xyt*?mx15kvYq4hNHEO$%=XahBJv2i)RU8JO3SWNiBKpk(Sx+<+^?4bv$n)& zhu*g6DvZPO!NH5#ARq>y6StAZ2FYba9THK9wH+u0tnrXQg6(^ls#fIz74kynB=e8? zJRJnu0Ey_eY9$m<1IQ861B2^`z$S3O`)XZ{jxv4?3ezuQ#0)ry#;cWt5@akED;OLv z1vY_0mzX$<%||5zx2(f84ib_pQpLOxE(NLCMae;Dj-WZ>tQ4yn1fttlR*m1DTw`U- zb2i#Fa{bVC+lZ^kUuA=|WcX)96eff_FNFR_(1#=hZx~X0L&* z(@f?MlMOy&n7YFRTB|?6YWsR9Y&w62bt)PD9_}4;-SCEg!)eD|@<0qTl|W3uc?}@? z?0)!sQ%m0PYxS(NW?#qHVw!S*ni_^Z-^i zUhQ(Y4s>6RL9AzlU=Wpzu;@gemFtW&u@TU%&&s_ugy<7qhAj9ryBqR8D~9XYT|3_W z4W`52so9B*9ECm2ZbNgVz7%z>)~Q|U3^&*u)Y%v5Ji}81pX`kgqEi`A4~)RZBK!|C zfNL(Bmdv9e5(>F%xey^T|YmnudSF?}OwTh^SsA9+VRaS}Sam)wXyj8I|3E zSSTuQB|0Z~;(?GSvR4TxgP^y&+IP4-wHvEL(I`==#V5x?ZRi~6W!l}K)y_yP6yM*0 z+Zi0}^l*H?&LY}9BlpG=xH>Jqpd!n$j(AHnBFAu@?_oaZ>g{q+B@3gS(cV^7?kCzw zEs7jaWoIN1jrV#3_~^nIZqP4~d%}O#6ZjFT^3iD!{v(->&+1b|8F&+Q(zys7iMvhc%M_ybw^N3!rwX5oLBg+G>s zKLP%gtut?D7Q*pnqDqtg*%s^@6Me%8B{Pk8Yq^Oo+D7yh&xKx1g1%#-C)^m*M4xKK z=zFXafSv=I-?twx90e&=!i{rjDw zA+Jbl=yN<;f9F08nO#C#@Ls?N%yYDqrno$nAqQ*TxbYl@&SR7>i1Y`ykr_9W3$%sH z$;h2~5MBN(muqwMhpv&=SUJj}3Wq`^bdtL1S3dq>vwQ4+A)W*KJabP}fmQPa z{WV7ndX7pV7wONe@JwqaL?4veuZr0YmPKe8UgUXB9y;HFS8qrH3<65!0_pAU!XDApG48T1$DoL8%3$f5788oC4f z`n-BDp9zd|_q?X6eA3T8E)#ZDfsjuH zrn$+KH*$HQNj^L7e>Qgy>%Mz>!ExvCxb?Wqahv0s5GlpZ5~2@q>*%o1^9ucNp5)O9 KthXhm_4YSGXu1jj diff --git a/Contrib/UIs/sdbarker_tiny.rc b/Contrib/UIs/sdbarker_tiny.rc new file mode 100644 index 00000000..af7d6eb4 --- /dev/null +++ b/Contrib/UIs/sdbarker_tiny.rc @@ -0,0 +1,109 @@ +#include "resource.h" + +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" +BEGIN + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 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" +BEGIN + CONTROL "", IDC_DIR, EDIT, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 8, 35, 187, 12 + CONTROL "", IDC_BROWSE, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 202, 34, 55, 14 + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 + CONTROL "", IDC_SELDIRTEXT, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 22, 265, 8 + CONTROL "", IDC_SPACEAVAILABLE, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 1, 63, 265, 8 + CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 1, 54, 265, 8 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 18 +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" +BEGIN + CONTROL "", IDC_COMBO1, COMBOBOX, CBS_DROPDOWNLIST | WS_CHILD | WS_VSCROLL | WS_TABSTOP, 114, 15, 152, 94 + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 21, 20 + CONTROL "", IDC_TEXT2, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 33, 108, 29 + CONTROL "", IDC_TEXT1, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 20, 108, 8 + CONTROL "", IDC_SPACEREQUIRED, STATIC, SS_LEFTNOWORDWRAP | WS_CHILD | WS_VISIBLE, 0, 60, 111, 8 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 15 + CONTROL "", IDC_TREE1, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_CHILD | WS_VISIBLE | 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" +BEGIN + CONTROL "", 3, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_GROUP | WS_TABSTOP, 171, 84, 50, 14 + CONTROL "", 1, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 223, 84, 50, 14 + CONTROL "", 2, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 84, 50, 14 + CONTROL "", -1, STATIC, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE | WS_GROUP, 7, 79, 265, 1 + CONTROL "", IDC_CHILDRECT, STATIC, SS_BLACKRECT | WS_CHILD | WS_GROUP, 7, 6, 266, 70 + CONTROL "", IDC_VERSTR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP, 59, 86, 108, 8 +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" +BEGIN + CONTROL "", IDC_PROGRESS, "msctls_progress32", WS_CHILD | WS_VISIBLE | WS_BORDER, 24, 10, 241, 11 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_CHILD | WS_VISIBLE, 24, 0, 241, 8 + CONTROL "", IDC_LIST1, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | WS_CHILD | WS_BORDER | WS_TABSTOP, 0, 22, 265, 48 + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 + CONTROL "", IDC_SHOWDETAILS, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE, 0, 28, 60, 14 +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" +BEGIN + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 1, 20, 20 + CONTROL "", IDC_UNINSTFROM, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 0, 47, 55, 8 + CONTROL "", IDC_EDIT1, EDIT, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 56, 45, 209, 12 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 34 +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" +BEGIN + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 27 + CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 50, 266, 9 + CONTROL "", IDC_LICENSEDISAGREE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | 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" +BEGIN + CONTROL IDI_ICON2, IDC_ULICON, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 0, 20, 20 + CONTROL "", IDC_INTROTEXT, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE, 25, 0, 241, 23 + CONTROL "", IDC_EDIT1, "RichEdit20A", ES_LEFT | ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 0, 24, 266, 37 + CONTROL "", IDC_LICENSEAGREE, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | 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" +BEGIN + CONTROL "", IDC_STR, STATIC, SS_CENTER | WS_CHILD | WS_VISIBLE, 7, 7, 148, 8 +END + diff --git a/Contrib/UIs/UI Holder/ui.cpp b/Contrib/UIs/ui.c similarity index 97% rename from Contrib/UIs/UI Holder/ui.cpp rename to Contrib/UIs/ui.c index a7e4d916..91a7c7ba 100644 --- a/Contrib/UIs/UI Holder/ui.cpp +++ b/Contrib/UIs/ui.c @@ -18,7 +18,11 @@ char* windows[] = { BOOL CALLBACK GenericProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { static LOGBRUSH b = {BS_SOLID, RGB(255,0,0), 0}; - static HBRUSH red = CreateBrushIndirect(&b); + static HBRUSH red; + + if (!red) + red = CreateBrushIndirect(&b); + switch (uMsg) { case WM_CTLCOLORSTATIC: return (int)red; diff --git a/SConstruct b/SConstruct index 42af04e5..110e684d 100644 --- a/SConstruct +++ b/SConstruct @@ -33,19 +33,19 @@ plugins = [ ] utils = [ - 'Library/RegTool', 'Library/LibraryLocal', + 'Library/RegTool', 'MakeLangId', 'Makensisw', 'NSIS Menu', + 'UIs', 'zip2exe' ] misc = [ 'Graphics', 'Language files', - 'Modern UI', - 'UIs' + 'Modern UI' ] defenv = Environment() @@ -316,7 +316,8 @@ for plugin in plugins: def BuildUtil(target, source, libs, entry = None, res = None, resources = None, defines = None, flags = None, - install = None, examples = None, docs = None): + nodeflib = 0, install = None, install_as = None, + examples = None, docs = None): env = util_env.Copy() if defines: @@ -327,6 +328,9 @@ def BuildUtil(target, source, libs, entry = None, res = None, if entry: env.Append(LINKFLAGS = '${ENTRY_FLAG("%s")}' % entry) + if nodeflib: + env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') # no default libraries + env.Append(LINKFLAGS = '$MAP_FLAG') if res: @@ -345,6 +349,10 @@ def BuildUtil(target, source, libs, entry = None, res = None, ins = env.Distribute(install, util) defenv.Alias('install-utils', ins) + if install_as is not None: + ins = env.DistributeAs(install_as, util) + defenv.Alias('install-utils', ins) + if examples: env.DistributeExamples(target, examples) if docs: