anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-13 20:09:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't change folder when cancel button is pressed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24564 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2008-04-30 16:06:10 +00:00
parent 62288ff923
commit ae0ec2fe71
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
development/Win32/packaging/installer/gui/external.nsh
View File

@ -13,7 +13,8 @@ Var ExternalPage.Info
Var ExternalPage.Setup
Var ExternalPage.Existing
Var ExternalPage.Folder
Var ExternalPage.Folder_Text
Var ExternalPage.Folder.Text
Var ExternalPage.Folder.Return
Var ExternalPage.FolderBrowse
Var ExternalPage.FolderInfo
Var ExternalPage.NoInstall
@ -159,16 +160,16 @@ Var ComponentSize
# Update location of component
${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder_Text
${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text
# Verify whether the path exists
${IfNot} ${FileExists} "$ExternalPage.Folder_Text\${BIN_${COMPONENT}}"
${IfNot} ${FileExists} "$ExternalPage.Folder.Text\${BIN_${COMPONENT}}"
MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_EXTERNAL_${COMPONENT}_NOTFOUND)
Abort # Return to allow the user to correct the location
${EndIf}
StrCpy $Path${COMPONENT} $ExternalPage.Folder_Text
StrCpy $Path${COMPONENT} $ExternalPage.Folder.Text
${EndIf}
@ -198,12 +199,17 @@ Function ExternalFolderBrowseClick
# Browse button clicked
# Get current folder to set as default
${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder_Text
${NSD_GetText} $ExternalPage.Folder $ExternalPage.Folder.Text
# Browse for new folder
nsDialogs::SelectFolderDialog /NOUNLOAD "" $ExternalPage.Folder_Text
Pop $ExternalPage.Folder_Text
${NSD_SetText} $ExternalPage.Folder $ExternalPage.Folder_Text
nsDialogs::SelectFolderDialog /NOUNLOAD "" $ExternalPage.Folder.Text
Pop $ExternalPage.Folder.Return
${If} $ExternalPage.Folder.Return != error
StrCpy $ExternalPage.Folder.Text $ExternalPage.Folder.Return
${EndIf}
${NSD_SetText} $ExternalPage.Folder $ExternalPage.Folder.Text
FunctionEnd