Re-indent the whole file using Tabs for indentation.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3476 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
c8690d4486
commit
b42da26f78
39
geany.nsi
39
geany.nsi
@ -297,16 +297,16 @@ SectionEnd
|
||||
; Section descriptions ;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required program files. You cannot skip these files."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Available plugins like 'Version Diff', 'Class Builder' and 'Insert Special Characters'."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Various translations of Geany's interface."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required program files. You cannot skip these files."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Available plugins like 'Version Diff', 'Class Builder' and 'Insert Special Characters'."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Various translations of Geany's interface."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols."
|
||||
!ifdef INCLUDE_GTK
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need this files to run Geany. If you have already installed a GTK Runtime Environment (2.6 or higher), you can skip it."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need this files to run Geany. If you have already installed a GTK Runtime Environment (2.6 or higher), you can skip it."
|
||||
!endif
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'"
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;
|
||||
@ -315,7 +315,6 @@ SectionEnd
|
||||
|
||||
; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsis/setup.nsi)
|
||||
!macro IsUserAdmin Result UName
|
||||
|
||||
ClearErrors
|
||||
UserInfo::GetName
|
||||
IfErrors Win9x
|
||||
@ -330,9 +329,9 @@ SectionEnd
|
||||
${endif}
|
||||
Goto done
|
||||
|
||||
Win9x:
|
||||
Win9x:
|
||||
StrCpy ${Result} "yes"
|
||||
done:
|
||||
done:
|
||||
!macroend
|
||||
|
||||
Function .onInit
|
||||
@ -366,24 +365,24 @@ Function .onInit
|
||||
"Geany has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \
|
||||
/SD IDYES IDYES remove IDNO finish
|
||||
|
||||
remove:
|
||||
remove:
|
||||
; run the uninstaller
|
||||
ClearErrors
|
||||
; we read the installation path of the old installation from the Registry
|
||||
ReadRegStr $UNINSTDIR SHCTX "${PRODUCT_DIR_REGKEY}" "Path"
|
||||
IfSilent dosilent nonsilent
|
||||
dosilent:
|
||||
dosilent:
|
||||
ExecWait '$R0 /S _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file
|
||||
Goto finish
|
||||
nonsilent:
|
||||
nonsilent:
|
||||
ExecWait '$R0 _?=$UNINSTDIR' ;Do not copy the uninstaller to a temp file
|
||||
|
||||
finish:
|
||||
finish:
|
||||
FunctionEnd
|
||||
|
||||
Function un.onUninstSuccess
|
||||
HideWindow
|
||||
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
|
||||
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." \
|
||||
/SD IDOK
|
||||
FunctionEnd
|
||||
|
||||
Function un.onInit
|
||||
@ -396,13 +395,15 @@ Function un.onInit
|
||||
; check if the Geany has been installed with admin permisions
|
||||
ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher"
|
||||
${if} $0 != ""
|
||||
MessageBox MB_OK|MB_ICONSTOP "You need administrator privileges to uninstall Geany!" /SD IDOK
|
||||
MessageBox MB_OK|MB_ICONSTOP "You need administrator privileges to uninstall Geany!" \
|
||||
/SD IDOK
|
||||
Abort
|
||||
${endif}
|
||||
SetShellVarContext current
|
||||
${endif}
|
||||
|
||||
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
|
||||
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" \
|
||||
/SD IDYES IDYES +2
|
||||
Abort
|
||||
FunctionEnd
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user