Browse Source

Added some logging for a few actions.

adaptive-webui-19844
sledgehammer999 12 years ago
parent
commit
cfa1e8441b
  1. 6
      src/windows/installer-translations/english.nsi
  2. 4
      src/windows/installer.nsi
  3. 1
      src/windows/uninstaller.nsi

6
src/windows/installer-translations/english.nsi

@ -12,8 +12,12 @@ LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent" LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule" ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule" LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing." ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing." LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
;------------------------------------ ;------------------------------------
@ -31,6 +35,8 @@ LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
LangString remove_conf ${LANG_ENGLISH} "Remove configuration files" LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule" ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule" LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data" ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data" LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling." ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."

4
src/windows/installer.nsi

@ -6,7 +6,8 @@ Section "-hidden"
StrCmp $1 "" done StrCmp $1 "" done
uninst: uninst:
;Run the uninstaller of the previous install. ;Run the uninstaller of the previous install.
DetailPrint $(inst_unist)
ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR' ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR'
Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\uninst.exe"
@ -119,6 +120,7 @@ SectionEnd
Section $(inst_firewall) Section $(inst_firewall)
DetailPrint $(inst_firewallinfo)
nsisFirewall::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent" nsisFirewall::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent"
SectionEnd SectionEnd

1
src/windows/uninstaller.nsi

@ -64,6 +64,7 @@ SectionEnd
Section "un.$(remove_firewall)" ; Section "un.$(remove_firewall)" ;
DetailPrint $(remove_firewallinfo)
nsisFirewall::RemoveAuthorizedApplication "$INSTDIR\qbittorrent.exe" nsisFirewall::RemoveAuthorizedApplication "$INSTDIR\qbittorrent.exe"
SectionEnd SectionEnd

Loading…
Cancel
Save