dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated Zip2Exe's GUI

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@969 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-09-10 03:44:53 +00:00
parent 693ad1b96f
commit a2b932dbe8
5 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Contrib/zip2exe/icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 766 B

Before After
Before After

4
Contrib/zip2exe/main.cpp
View file

@ -1,6 +1,6 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <commctrl.h>
// portions Copyright © 1999-2001 Miguel Garrido (mgarrido01@hotmail.com) // portions Copyright © 1999-2001 Miguel Garrido (mgarrido01@hotmail.com)
extern "C" extern "C"
@ -29,7 +29,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,
{ {
g_hInstance=hInstance; g_hInstance=hInstance;
InitCommonControls();
return DialogBox(hInstance,MAKEINTRESOURCE(IDD_DIALOG1),GetDesktopWindow(),DlgProc); return DialogBox(hInstance,MAKEINTRESOURCE(IDD_DIALOG1),GetDesktopWindow(),DlgProc);
} }
char tempzip_path[1024]; char tempzip_path[1024];

33
Contrib/zip2exe/res.rc
View file

@ -28,28 +28,28 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 361, 234 IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 361, 234
STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Nullsoft ZIP2EXE v0.16" CAPTION "Nullsoft ZIP2EXE v0.17"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
PUSHBUTTON "Open &ZIP",IDC_BROWSE,13,17,49,14 PUSHBUTTON "Open &ZIP",IDC_BROWSE,13,17,49,14
EDITTEXT IDC_ZIPFILE,66,18,284,12,ES_AUTOHSCROLL | ES_READONLY | EDITTEXT IDC_ZIPFILE,66,18,284,12,ES_AUTOHSCROLL | ES_READONLY |
NOT WS_TABSTOP NOT WS_TABSTOP
LISTBOX IDC_ZIPINFO_FILES,13,45,335,56,LBS_NOINTEGRALHEIGHT | LISTBOX IDC_ZIPINFO_FILES,13,43,335,62,LBS_NOINTEGRALHEIGHT |
LBS_NOSEL | WS_VSCROLL LBS_NOSEL | WS_VSCROLL
EDITTEXT IDC_INSTNAME,81,113,267,12,ES_AUTOHSCROLL EDITTEXT IDC_INSTNAME,81,124,267,12,ES_AUTOHSCROLL
EDITTEXT IDC_DESCTEXT,81,129,267,12,ES_AUTOHSCROLL EDITTEXT IDC_DESCTEXT,81,139,267,12,ES_AUTOHSCROLL
COMBOBOX IDC_INSTPATH,81,144,268,126,CBS_DROPDOWN | WS_VSCROLL | COMBOBOX IDC_INSTPATH,81,154,268,126,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP WS_TABSTOP
EDITTEXT IDC_OUTFILE,13,169,292,12,ES_AUTOHSCROLL EDITTEXT IDC_OUTFILE,81,169,224,12,ES_AUTOHSCROLL
PUSHBUTTON "Browse",IDC_BROWSE2,307,168,41,14 PUSHBUTTON "Browse",IDC_BROWSE2,309,169,41,14
DEFPUSHBUTTON "Convert",IDOK,304,213,50,14,WS_DISABLED DEFPUSHBUTTON "Convert",IDOK,304,213,50,14,WS_DISABLED
GROUPBOX "Source ZIP file",IDC_SZIPFRAME,7,7,347,180 GROUPBOX "Source ZIP File",IDC_SZIPFRAME,7,7,347,102
LTEXT "",IDC_ZIPINFO_SUMMARY,13,33,245,8 LTEXT "",IDC_ZIPINFO_SUMMARY,13,33,245,8
GROUPBOX "Output",IDC_OFRAME,7,102,347,85 GROUPBOX "Output",IDC_OFRAME,7,110,347,77
LTEXT "Default extract path:",IDC_DEPST,13,145,66,8 LTEXT "Default extract path:",IDC_DEPST,13,156,66,8
LTEXT "Description text:",IDC_DTEXTST,13,131,66,8 LTEXT "Description text:",IDC_DTEXTST,13,142,66,8
LTEXT "Output EXE file:",IDC_OEFST,14,157,51,8 LTEXT "Output EXE file:",IDC_OEFST,13,171,51,8
LTEXT "Installer name",IDC_INAMEST,13,116,66,8 LTEXT "Installer name",IDC_INAMEST,13,126,66,8
PUSHBUTTON "Test",IDC_TEST,251,213,50,14,NOT WS_VISIBLE PUSHBUTTON "Test",IDC_TEST,251,213,50,14,NOT WS_VISIBLE
PUSHBUTTON "< Back",IDC_BACK,7,213,50,14,NOT WS_VISIBLE PUSHBUTTON "< Back",IDC_BACK,7,213,50,14,NOT WS_VISIBLE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,210,347,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,210,347,1
@ -115,6 +115,13 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_ICON1 ICON DISCARDABLE "icon.ico" IDI_ICON1 ICON DISCARDABLE "icon.ico"
/////////////////////////////////////////////////////////////////////////////
//
// 24
//
1 24 MOVEABLE PURE "zip2exe.xml"
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

9
Contrib/zip2exe/zip2exe.dsp
View file

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 /nologo /subsystem:windows /machine:I386 /out:"../../Bin/zip2exe.exe" /opt:nowin98 # ADD LINK32 comctl32.lib 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 /out:"../../Bin/zip2exe.exe" /opt:nowin98
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "zip2exe - Win32 Debug" !ELSEIF "$(CFG)" == "zip2exe - Win32 Debug"
@ -68,6 +68,7 @@ LINK32=link.exe
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug" # PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
@ -80,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 /debug /machine:I386 /pdbtype:sept # 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 /debug /machine:I386 /pdbtype:sept
# 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 comctl32.lib 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 /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF
@ -156,5 +157,9 @@ SOURCE=.\icon.ico
SOURCE=.\res.rc SOURCE=.\res.rc
# End Source File # End Source File
# End Group # End Group
# Begin Source File
SOURCE=.\zip2exe.xml
# End Source File
# End Target # End Target
# End Project # End Project

10
Contrib/zip2exe/zip2exe.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.Zip2Exe" type="win32"/>
<description>Zip2Exe</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
</dependentAssembly>
</dependency>
</assembly>