Skip to content
Snippets Groups Projects
Unverified Commit ea0f55bc authored by kali's avatar kali Committed by Kali Kaneko
Browse files

[pkg] customize windows installer

I kind of liked the "classic" style more (looks cleaner), but it looks
like we only can customize the logo etc with the "modern" look and feel
in windows.

I think the way to go would be to add a QStyleSheet to the installer
(and adding logo etc there), but I think that is going to take some
reading. this is not too bad for now, at least we can put logos to
differentiate riseup/calyx etc.
parent 5d8fc3c0
No related branches found
No related tags found
No related merge requests found
...@@ -142,6 +142,9 @@ installer: check_qtifw checksign ...@@ -142,6 +142,9 @@ installer: check_qtifw checksign
@cp -r ${TEMPLATES}/qtinstaller/packages ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/packages ${INSTALLER}
@cp -r ${TEMPLATES}/qtinstaller/installer.pro ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/installer.pro ${INSTALLER}
@cp -r ${TEMPLATES}/qtinstaller/config ${INSTALLER} @cp -r ${TEMPLATES}/qtinstaller/config ${INSTALLER}
@cp ${VENDOR_PATH}/assets/icon.ico ${INSTALLER}/config/installer-icon.ico
@cp ${VENDOR_PATH}/assets/icon.icns ${INSTALLER}/config/installer-icon.icns
@cp ${VENDOR_PATH}/assets/installer-logo.png ${INSTALLER}/config/installer-logo.png
ifeq (${PLATFORM}, darwin) ifeq (${PLATFORM}, darwin)
@mkdir -p ${INST_DATA}/helper @mkdir -p ${INST_DATA}/helper
@VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/gen-qtinstaller osx ${INSTALLER} @VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/gen-qtinstaller osx ${INSTALLER}
......
...@@ -21,16 +21,20 @@ OS_CONFIG = { ...@@ -21,16 +21,20 @@ OS_CONFIG = {
<RunProgramArguments> <RunProgramArguments>
<Argument>@TargetDir@</Argument> <Argument>@TargetDir@</Argument>
</RunProgramArguments> </RunProgramArguments>
<WizardStyle>mac</WizardStyle> <WizardStyle>mac</WizardStyle>
<!-- end osx --> <!-- end osx -->
""", """,
'windows': """ 'windows': """
<!-- windows -->
<TargetDir>@ApplicationsDir@/$APPNAME</TargetDir> <TargetDir>@ApplicationsDir@/$APPNAME</TargetDir>
<StartMenuDir>$APPNAME</StartMenuDir> <StartMenuDir>$APPNAME</StartMenuDir>
<RunProgram>@TargetDir@/$BINNAME.exe</RunProgram> <RunProgram>@TargetDir@/$BINNAME.exe</RunProgram>
<RunProgramArguments> <RunProgramArguments>
</RunProgramArguments> </RunProgramArguments>
<WizardStyle>Modern</WizardStyle>
<!-- end windows --> <!-- end windows -->
""" """
} }
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<Title>$APPNAME Installer ($VERSION)</Title> <Title>$APPNAME Installer ($VERSION)</Title>
<Publisher>LEAP Encryption Access Project</Publisher> <Publisher>LEAP Encryption Access Project</Publisher>
<AllowNonAsciiCharacters>false</AllowNonAsciiCharacters> <AllowNonAsciiCharacters>false</AllowNonAsciiCharacters>
<Logo>installer-logo.png</Logo>
<InstallerApplicationIcon>installer-icon</InstallerApplicationIcon>
<!-- <!--
<RemoteRepositories> <RemoteRepositories>
......
...@@ -5,7 +5,7 @@ CONFIG -= debug_and_release ...@@ -5,7 +5,7 @@ CONFIG -= debug_and_release
INPUT = $$PWD/config/config.xml $$PWD/packages INPUT = $$PWD/config/config.xml $$PWD/packages
inst.input = INPUT inst.input = INPUT
inst.output = $$INSTALLER inst.output = $$INSTALLER
inst.commands = binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} inst.commands = binarycreator --ignore-translations -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}
inst.CONFIG += target_predeps no_link combine inst.CONFIG += target_predeps no_link combine
QMAKE_EXTRA_COMPILERS += inst QMAKE_EXTRA_COMPILERS += inst
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment