[popfile-commit] windows installer.nsi,1.123,1.124

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17621

Modified Files:
	installer.nsi 
Log Message:
When flat file corpus conversion is required, do not offer to start the POPFile UI.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** installer.nsi	4 Oct 2003 00:42:37 -0000	1.123
--- installer.nsi	4 Oct 2003 11:03:48 -0000	1.124
***************
*** 115,119 ****
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0 (INVISIBLE KAKASI)"
  
    !define C_README        "v0.20.0.change"
--- 115,119 ----
  
    !define MUI_PRODUCT   "POPFile"
!   !define MUI_VERSION   "0.20.0 (CORPUS BACKUP)"
  
    !define C_README        "v0.20.0.change"
***************
*** 2291,2297 ****
    Push ${L_TEMP}
  
!   IfRebootFlag 0 not_Win9x
  
!   ; We are running on a Win9x system and must reboot before using POPFile
    ; (replace previous page with a simple "Please wait" one, in case the page appears
    ; again while the system is rebooting)
--- 2291,2297 ----
    Push ${L_TEMP}
  
!   IfRebootFlag 0 no_reboot_reqd
  
!   ; We have installed Kakasi on a Win9x system and must reboot before using POPFile
    ; (replace previous page with a simple "Please wait" one, in case the page appears
    ; again while the system is rebooting)
***************
*** 2301,2305 ****
    Goto selection_ok
  
! not_Win9x:
    ; Enable the 'Run' CheckBox on the 'Finish' page (it may have been disabled on our last visit)
  
--- 2301,2306 ----
    Goto selection_ok
  
! no_reboot_reqd:
! 
    ; Enable the 'Run' CheckBox on the 'Finish' page (it may have been disabled on our last visit)
  
***************
*** 2307,2316 ****
  
    ; Get the status of the 'Do not run POPFile' radio button on the 'Start POPFile' page
  
    !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 2" "State"
!   StrCmp ${L_TEMP} "0" selection_ok
  
!   ; User has not started POPFile so we cannot offer to display the POPFile User Interface
  
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "0"
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" "DISABLED"
--- 2308,2324 ----
  
    ; Get the status of the 'Do not run POPFile' radio button on the 'Start POPFile' page
+   ; If user has not started POPFile, we cannot offer to display the POPFile User Interface
  
    !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 2" "State"
!   StrCmp ${L_TEMP} "1" disable_UI_option
  
!   ; Get 'Flags' for the 'Run POPFile in background' radio button on the 'Start POPFile' page
!   ; If flat file corpus conversion is required, we cannot offer to display the POPFile UI
!   ; (conversion may take several minutes, during which time the UI will be unresponsive)
!   
!   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 4" "Flags"
!   StrCmp ${L_TEMP} "DISABLED" 0 selection_ok
  
+ disable_UI_option:
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "0"
    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" "DISABLED"