Skip to content

Commit

Permalink
a few changes
Browse files Browse the repository at this point in the history
  • Loading branch information
JacksiroKe committed Oct 15, 2021
1 parent 3013dba commit 7c84bff
Show file tree
Hide file tree
Showing 15 changed files with 1,024 additions and 1,806 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ src/release/
src/ui_*.h
build/
build-*
build_*
snap/parts
snap/prime
snap/snap
Expand Down
23 changes: 17 additions & 6 deletions publish/vsongbook_x32.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
!define APP_NAME "vSongBook"
!define COMP_NAME "AppSmata Solutions"
!define WEB_SITE "http://Appsmata.com/vSongBook"
!define VERSION "3.0.1.5"
!define VERSION "3.0.2.0"
!define COPYRIGHT "© AppSmata Solutions 2016 - 2021"
!define DESCRIPTION "${APP_NAME}"
!define INSTALLER_NAME "\outputs\${APP_NAME}_${VERSION}_x32.exe"
!define INSTALLER_NAME "outputs\${APP_NAME}_${VERSION}_x32.exe"
!define MAIN_APP_EXE "vSongBook.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKCU"
Expand Down Expand Up @@ -41,6 +41,7 @@ InstallDir "$LOCALAPPDATA\AppSmata\vSongBook"
!include "MUI.nsh"

!define MUI_ICON "appicon.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"

!define MUI_ABORTWARNING
!define MUI_UNABORTWARNING
Expand Down Expand Up @@ -88,11 +89,12 @@ SetOutPath "$INSTDIR"
File "x32\Qt5Core.dll"
File "x32\Qt5Gui.dll"
File "x32\Qt5Network.dll"
File "x32\Qt5Sql.dll"
File "x32\Qt5Widgets.dll"
File "x32\vSongBook.exe"
File "vc_redist.x86.exe"
File "x32\vc_redist.x86.exe"
SetOutPath "$INSTDIR\data"
File "x32\data\vSongBookApp.db"
File "data\vSongBookApp.db"
SetOutPath "$INSTDIR\platforms"
File "x32\platforms\qwindows.dll"
SetOutPath "$INSTDIR\res\icons"
Expand All @@ -108,7 +110,7 @@ SetOutPath "$INSTDIR\styles"
File "x32\styles\qwindowsvistastyle.dll"

DetailPrint "Installing Visual C++ 2015 Redistributable (x32)"
File "vc_redist.x86.exe"
File "x32\vc_redist.x86.exe"
ExecWait "$INSTDIR\vc_redist.x86.exe /q"
DetailPrint "Cleaning up"
Delete "$INSTDIR\vc_redist.x86.exe"
Expand Down Expand Up @@ -159,7 +161,16 @@ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}"
!endif
SectionEnd

######################################################################

Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "${APP_NAME} was successfully removed from your computer."
FunctionEnd

Function un.onInit
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove ${APP_NAME} and all of its components?" IDYES +2
Abort
FunctionEnd

Section Uninstall
${INSTALL_TYPE}
Expand Down
124 changes: 124 additions & 0 deletions publish/vsongbook_x32x.nsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
; Script generated by the HM NIS Edit Script Wizard.

; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "vSongBook"
!define PRODUCT_VERSION "3.0.2.0"
!define PRODUCT_PUBLISHER "Appsmata Solutions"
!define PRODUCT_WEB_SITE "https://www.appsmata.com"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\vSongBook.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"

; MUI 1.67 compatible ------
!include "MUI.nsh"

; MUI Settings
!define MUI_ABORTWARNING
!define MUI_ICON "appicon.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"

; Welcome page
!insertmacro MUI_PAGE_WELCOME
; License page
!insertmacro MUI_PAGE_LICENSE "c:\path\to\licence\YourSoftwareLicence.txt"
; Instfiles page
!insertmacro MUI_PAGE_INSTFILES
; Finish page
!define MUI_FINISHPAGE_RUN "$INSTDIR\vSongBook.exe"
!insertmacro MUI_PAGE_FINISH

; Uninstaller pages
!insertmacro MUI_UNPAGE_INSTFILES

; Language files
!insertmacro MUI_LANGUAGE "English"

; MUI end ------

Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "vSongBook_3.0.2.0.exe"
InstallDir "$PROGRAMFILES\vSongBook"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show

Section "MainSection" SEC01
SetOutPath "$INSTDIR"
SetOverwrite try
File "x32\platforms\qwindows.dll"
File "x32\styles\qwindowsvistastyle.dll"
File "x32\sqldrivers\qsqlite.dll"
File "x32\sqldrivers\qsqlodbc.dll"
File "x32\sqldrivers\qsqlpsql.dll"
File "x32\res\icons\appicon.ico"
File "x32\res\images\appicon.png"
File "x32\res\images\splash.png"
File "x32\Qt5Core.dll"
File "x32\Qt5Gui.dll"
File "x32\Qt5Network.dll"
File "x32\Qt5Sql.dll"
File "x32\Qt5Widgets.dll"
File "x32\vSongBook.exe"
CreateDirectory "$SMPROGRAMS\vSongBook"
CreateShortCut "$SMPROGRAMS\vSongBook\vSongBook.lnk" "$INSTDIR\vSongBook.exe"
CreateShortCut "$DESKTOP\vSongBook.lnk" "$INSTDIR\vSongBook.exe"
SectionEnd

Section -AdditionalIcons
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
CreateShortCut "$SMPROGRAMS\vSongBook\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\vSongBook\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd

Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\vSongBook.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\vSongBook.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd


Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
FunctionEnd

Function un.onInit
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
Abort
FunctionEnd

Section Uninstall
Delete "$INSTDIR\${PRODUCT_NAME}.url"
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\vSongBook.exe"
Delete "$INSTDIR\Qt5Widgets.dll"
Delete "$INSTDIR\Qt5Sql.dll"
Delete "$INSTDIR\Qt5Network.dll"
Delete "$INSTDIR\Qt5Gui.dll"
Delete "$INSTDIR\Qt5Core.dll"
Delete "$INSTDIR\splash.png"
Delete "$INSTDIR\appicon.png"
Delete "$INSTDIR\appicon.ico"
Delete "$INSTDIR\qsqlpsql.dll"
Delete "$INSTDIR\qsqlodbc.dll"
Delete "$INSTDIR\qsqlite.dll"
Delete "$INSTDIR\qwindowsvistastyle.dll"
Delete "$INSTDIR\qwindows.dll"

Delete "$SMPROGRAMS\vSongBook\Uninstall.lnk"
Delete "$SMPROGRAMS\vSongBook\Website.lnk"
Delete "$DESKTOP\vSongBook.lnk"
Delete "$SMPROGRAMS\vSongBook\vSongBook.lnk"

RMDir "$SMPROGRAMS\vSongBook"
RMDir "$INSTDIR"

DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
23 changes: 17 additions & 6 deletions publish/vsongbook_x64.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
!define APP_NAME "vSongBook"
!define COMP_NAME "AppSmata Solutions"
!define WEB_SITE "http://Appsmata.com/vSongBook"
!define VERSION "3.0.1.5"
!define VERSION "3.0.2.0"
!define COPYRIGHT "© AppSmata Solutions 2016 - 2021"
!define DESCRIPTION "${APP_NAME}"
!define INSTALLER_NAME "\outputs\${APP_NAME}_${VERSION}_x64.exe"
!define INSTALLER_NAME "outputs\${APP_NAME}_${VERSION}_x64.exe"
!define MAIN_APP_EXE "vSongBook.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKCU"
Expand Down Expand Up @@ -41,6 +41,7 @@ InstallDir "$LOCALAPPDATA\AppSmata\vSongBook"
!include "MUI.nsh"

!define MUI_ICON "appicon.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"

!define MUI_ABORTWARNING
!define MUI_UNABORTWARNING
Expand Down Expand Up @@ -88,11 +89,12 @@ SetOutPath "$INSTDIR"
File "x64\Qt5Core.dll"
File "x64\Qt5Gui.dll"
File "x64\Qt5Network.dll"
File "x64\Qt5Sql.dll"
File "x64\Qt5Widgets.dll"
File "x64\vSongBook.exe"
File "vc_redist.x64.exe"
File "x64\vc_redist.x64.exe"
SetOutPath "$INSTDIR\data"
File "x64\data\vSongBookApp.db"
File "data\vSongBookApp.db"
SetOutPath "$INSTDIR\platforms"
File "x64\platforms\qwindows.dll"
SetOutPath "$INSTDIR\res\icons"
Expand All @@ -108,7 +110,7 @@ SetOutPath "$INSTDIR\styles"
File "x64\styles\qwindowsvistastyle.dll"

DetailPrint "Installing Visual C++ 2015 Redistributable (x64)"
File "vc_redist.x64.exe"
File "x64\vc_redist.x64.exe"
ExecWait "$INSTDIR\vc_redist.x64.exe /q"
DetailPrint "Cleaning up"
Delete "$INSTDIR\vc_redist.x64.exe"
Expand Down Expand Up @@ -159,7 +161,16 @@ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}"
!endif
SectionEnd

######################################################################

Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "${APP_NAME} was successfully removed from your computer."
FunctionEnd

Function un.onInit
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove ${APP_NAME} and all of its components?" IDYES +2
Abort
FunctionEnd

Section Uninstall
${INSTALL_TYPE}
Expand Down
5 changes: 5 additions & 0 deletions src/res/styles/styles.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/">
<file>theme.qss</file>
</qresource>
</RCC>
Loading

0 comments on commit 7c84bff

Please sign in to comment.