added windows icon and NSIS files

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@45 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/nsis_readme.txt b/nsis_readme.txt
new file mode 100644 (file)
index 0000000..c361faa
--- /dev/null
+++ b/nsis_readme.txt
@@ -0,0 +1,7 @@
+WARNING
+===========
+
+
+This is pre-alpha software! You use it at your own risk!
+
+Contact the authors for details (eg. konrad at silmor dot de)
\ No newline at end of file

diff --git a/smoke.nsi b/smoke.nsi
new file mode 100644 (file)
index 0000000..45b4866
--- /dev/null
+++ b/smoke.nsi
@@ -0,0 +1,144 @@
+;automaticly generated file, don't change it!\r
+; original Script generated by the HM NIS Edit Script Wizard.\r
+; adapted and scriptified by Konrad Rosenbaum\r
+\r
+; HM NIS Edit Wizard helper defines\r
+!define SMOKEEXE "msmoke.exe"\r
+!define PRODUCT_NAME "MagicSmoke"\r
+!define PRODUCT_VERSION "0.1"\r
+!define PRODUCT_PUBLISHER "MagicSmoke Project"\r
+!define PRODUCT_WEB_SITE "http://silmor.de"\r
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${SMOKEEXE}"\r
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
+!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"\r
+!define QTDIR "C:\krosenba\qt"\r
+!define MINGWDIR "C:\MinGW"\r
+\r
+; MUI 1.67 compatible ------\r
+!include "MUI.nsh"\r
+\r
+; MUI Settings\r
+!define MUI_ABORTWARNING\r
+!define MUI_ICON "src\icon.ico"\r
+!define MUI_UNICON "src\icon.ico"\r
+\r
+; Welcome page\r
+!insertmacro MUI_PAGE_WELCOME\r
+; License page\r
+;!insertmacro MUI_PAGE_LICENSE "nsis_readme.txt"\r
+; Directory page\r
+!insertmacro MUI_PAGE_DIRECTORY\r
+; Start menu page\r
+var ICONS_GROUP\r
+!define MUI_STARTMENUPAGE_NODISABLE\r
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "MagicSmoke"\r
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"\r
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"\r
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"\r
+!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP\r
+; Instfiles page\r
+!insertmacro MUI_PAGE_INSTFILES\r
+; Finish page\r
+!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\${SMOKEEXE}"\r
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"\r
+!insertmacro MUI_PAGE_FINISH\r
+\r
+; Uninstaller pages\r
+!insertmacro MUI_UNPAGE_INSTFILES\r
+\r
+; Language files\r
+!insertmacro MUI_LANGUAGE "English"\r
+\r
+; MUI end ------\r
+\r
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"\r
+OutFile "magicsmoke-install.exe"\r
+InstallDir "$PROGRAMFILES\MagicSmoke"\r
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""\r
+ShowInstDetails show\r
+ShowUnInstDetails show\r
+\r
+Section "MainSection" SEC01\r
+  SetOutPath "$INSTDIR"\r
+  File /oname=README.txt "nsis_readme.txt"\r
+  SetOutPath "$INSTDIR\bin"\r
+  SetOverwrite on\r
+  File "src\${SMOKEEXE}"\r
+  File "src\smoke_de.qm"\r
+  File "src\smoke_de_SAX.qm"\r
+  File "${MINGWDIR}\bin\mingwm10.dll"\r
+  File "${QTDIR}\bin\QtCore4.dll"\r
+  File "${QTDIR}\bin\QtGui4.dll"\r
+  File "${QTDIR}\bin\QtNetwork4.dll"\r
+  File "${QTDIR}\bin\QtXml4.dll"\r
+  File "${QTDIR}\translations\qt_de.qm"\r
+  \r
+; Shortcuts\r
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\r
+  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"\r
+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\MagicSmoke.lnk" "$INSTDIR\bin\${SMOKEEXE}"\r
+  CreateShortCut "$DESKTOP\MagicSmoke.lnk" "$INSTDIR\bin\${SMOKEEXE}"\r
+  !insertmacro MUI_STARTMENU_WRITE_END\r
+  \r
+  SetOutPath "$INSTDIR"\r
+SectionEnd\r
+\r
+Section -AdditionalIcons\r
+  SetOutPath $INSTDIR\r
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\r
+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"\r
+  !insertmacro MUI_STARTMENU_WRITE_END\r
+SectionEnd\r
+\r
+Section -Post\r
+  WriteUninstaller "$INSTDIR\uninst.exe"\r
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\bin\${SMOKEEXE}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\${SMOKEEXE}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"\r
+SectionEnd\r
+\r
+\r
+Function un.onUninstSuccess\r
+  HideWindow\r
+  MessageBox MB_ICONINFORMATION|MB_OK "MagicSmoke was successfully removed from your computer."\r
+FunctionEnd\r
+\r
+Function un.onInit\r
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to remove MagicSmoke?" IDYES +2\r
+  Abort\r
+FunctionEnd\r
+\r
+Section Uninstall\r
+  !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP\r
+  Delete "$INSTDIR\uninst.exe"\r
+  Delete "$INSTDIR\bin\${SMOKEEXE}"\r
+\r
+  Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"\r
+  Delete "$DESKTOP\MagicSmoke.lnk"\r
+  Delete "$SMPROGRAMS\$ICONS_GROUP\MagicSmoke.lnk"\r
+\r
+  RMDir "$SMPROGRAMS\$ICONS_GROUP"\r
+  \r
+\r
+  Delete "$INSTDIR\bin\mingwm10.dll"\r
+  Delete "$INSTDIR\bin\QtCore4.dll"\r
+  Delete "$INSTDIR\bin\QtGui4.dll"\r
+  Delete "$INSTDIR\bin\QtNetwork4.dll"\r
+  Delete "$INSTDIR\bin\QtXml4.dll"\r
+  Delete "$INSTDIR\bin\qt_de.qm"\r
+  Delete "$INSTDIR\bin\smoke_de.qm"\r
+  Delete "$INSTDIR\bin\smoke_de_SAX.qm"\r
+  \r
+  Delete "$INSTDIR\README.txt\r
+\r
+  RMDir "$INSTDIR\bin"\r
+\r
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
+  SetAutoClose true\r
+SectionEnd\r

diff --git a/src/icon.ico b/src/icon.ico
new file mode 100644 (file)
index 0000000..773f47f
Binary files /dev/null and b/src/icon.ico differ

diff --git a/src/smoke.pro b/src/smoke.pro
index 7ef77ae..14c7f61 100644 (file)
--- a/src/smoke.pro
+++ b/src/smoke.pro
@@ -9,10 +9,17 @@ CONFIG += qt thread
 QT += xml network
 MSVERSION = "0.1 alpha"
 
-#win32-* {
-# #RC-File containing the icon:
-# RC_FILE += win.rc
-#}
+win32-* {
+ #RC-File containing the icon:
+ RC_FILE += win.rc
+}
+\r
+#compilation output:\r
+DESTDIR = ../src\r
+OBJECTS_DIR = .ctmp\r
+MOC_DIR = .ctmp\r
+RCC_DIR = .ctmp\r
+\r
 
 SOURCES = \
        main.cpp \

diff --git a/src/win.rc b/src/win.rc
new file mode 100644 (file)
index 0000000..1bc463a
--- /dev/null
+++ b/src/win.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico"