From 08e48606519a92be8bd5a71fddbf9948ba6cdd3e Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Fri, 2 Oct 2015 16:48:26 +0200 Subject: [PATCH] Improve windows installer --- INSTALL.w32 | 3 ++- img/bigcert.bmp | Bin 0 -> 27642 bytes misc/xca.nsi | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 img/bigcert.bmp diff --git a/INSTALL.w32 b/INSTALL.w32 index 90a4156a..92a5bbcf 100644 --- a/INSTALL.w32 +++ b/INSTALL.w32 @@ -7,8 +7,9 @@ This is for debian hosts, cross-compiling a windows binary. Needed packages: mingw cross compiler makensis cross tool + wine (to run moc.exe and uic.exe) -# apt-get install mingw32 mingw32-binutils mingw32-runtime nsis +# apt-get install mingw32 mingw32-binutils mingw32-runtime nsis wine create a new, empty directory say xca-w32 $ cd xca-w32 diff --git a/img/bigcert.bmp b/img/bigcert.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fc03e4846bf0d0d3d46b04f03cdce79a3645fc5d GIT binary patch literal 27642 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 L{5=9SKLY;`L42;{ literal 0 HcmV?d00001 diff --git a/misc/xca.nsi b/misc/xca.nsi index aa16e55d..71b1d7dd 100755 --- a/misc/xca.nsi +++ b/misc/xca.nsi @@ -22,6 +22,11 @@ SetCompressor /SOLID lzma !define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_FINISHPAGE_RUN "$INSTDIR\xca.exe" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "${TOPDIR}/img\bigcert.bmp" +!define MUI_HEADERIMAGE_RIGHT +!define MUI_ICON "${TOPDIR}/img\key.ico" + ;----------------------------------- ; Pagelist @@ -290,7 +295,7 @@ SectionEnd LangString DESC_SecShortcut ${LANG_ENGLISH} "Shortcuts on the desktop and the menu." LangString DESC_SecShortcut ${LANG_GERMAN} "Programmgruppe auf dem Desktop und im Menu." LangString DESC_SecShortcut ${LANG_FRENCH} "Raccourcis sur le bureau et dans le menu." - LangString DESC_SecShortcut ${LANG_CROATIAN} "Prečac na radnoj površini i izborniku." + LangString DESC_SecShortcut ${LANG_CROATIAN} "Precac na radnoj površini i izborniku." LangString DESC_SecFiles ${LANG_ENGLISH} "File association for *.xdb *.xca *.pem and 'open with' for *.crt *.crl *.pfx *.p7b *.cer" LangString DESC_SecFiles ${LANG_GERMAN} "Registrierung der Dateiendung *.xdb *.xca *.pem und 'Öffnen mit' für *.crt *.crl *.pfx *.p7b *.cer" @@ -300,7 +305,7 @@ SectionEnd LangString DESC_SecTrans ${LANG_ENGLISH} "Translations for german, russian, spanish, french and croatian." LangString DESC_SecTrans ${LANG_GERMAN} "Übersetzungen in deutsch, russisch, spanisch kroatisch und französisch." LangString DESC_SecTrans ${LANG_FRENCH} "Traductions pour l'allemand, le russe, l'espagnol, le français et le croate." - LangString DESC_SecTrans ${LANG_CROATIAN} "Prijevodi na njemački, ruski, španjolski, francuski i hrvatski jezik." + LangString DESC_SecTrans ${LANG_CROATIAN} "Prijevodi na njemacki, ruski, španjolski, francuski i hrvatski jezik." ;Assign language strings to sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN