[popfile-commit] windows installer.nsi,1.62,1.63 ioC.ini,1.1,1.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	installer.nsi ioC.ini 
Log Message:
A more elegant way to handle the display of the POPFile User Interface.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** installer.nsi	14 Jun 2003 12:18:29 -0000	1.62
--- installer.nsi	14 Jun 2003 17:22:47 -0000	1.63
***************
*** 82,85 ****
--- 82,98 ----

    ;-----------------------------------------
+   ; General Settings - Finish Page Settings
+   ;-----------------------------------------
+ 
+   ; Offer to display the POPFile User Interface (The 'CheckRunStatus' function ensures this
+   ; option is only offered if the installer has started POPFile running)
+ 
+   !define MUI_FINISHPAGE_SHOWREADME "http://127.0.0.1:${GUI}/"
+ 
+   ; Allow user to check the log file (by clicking "Show Details" button on the "Install" page)
+ 
+ #  !define MUI_FINISHPAGE_NOAUTOCLOSE
+ 
+   ;-----------------------------------------
    ; General Settings - Other Settings
    ;-----------------------------------------
***************
*** 115,118 ****
--- 128,136 ----
    !define MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE CheckExistingConfig

+   ; Use a "pre" function for the 'Finish' page to ensure installer only offers to display
+   ; POPFile User Interface if user has chosen to start POPFile from the installer.
+ 
+   !define MUI_CUSTOMFUNCTION_FINISH_PRE CheckRunStatus
+ 
  #--------------------------------------------------------------------------
  # User Registers (Global)
***************
*** 139,142 ****
--- 157,163 ----
        It is recommended that you close all other applications before starting Setup.\r\n\r\n"

+   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME \
+       "Display the POPFile User Interface"
+ 
    !insertmacro MUI_LANGUAGE "English"

***************
*** 1075,1083 ****
  # Installer Function: StartPOPFilePage (generates a custom page)
  #
! # This function offers to start the newly installed POPFile and also offers to display the
! # POPFile User Interface.
  #
! # A "leave" function (CheckLaunchOptions) is used to validate and act upon the selections
! # made by the user.
  #--------------------------------------------------------------------------

--- 1096,1102 ----
  # Installer Function: StartPOPFilePage (generates a custom page)
  #
! # This function offers to start the newly installed POPFile.
  #
! # A "leave" function (CheckLaunchOptions) is used to act upon the selections made by the user.
  #--------------------------------------------------------------------------

***************
*** 1095,1101 ****
  # (the "leave" function for the custom page created by "StartPOPFilePage")
  #
! # This function is used to validate the start POPFile options selected by the user.
! # If the selections are not valid, user is asked to make an alternative selection,
! # otherwise this function will perform the selected actions.
  #--------------------------------------------------------------------------

--- 1114,1120 ----
  # (the "leave" function for the custom page created by "StartPOPFilePage")
  #
! # This function is used to action the "start POPFile" options selected by the user.
! # The user is allowed to return to this page and change their selections, so the
! # previous state is stored in the INI file used for this custom page.
  #--------------------------------------------------------------------------

***************
*** 1103,1139 ****

    !define L_RESULT      $R9
!   !define L_SHOWUI      $R8
!   !define L_TEMP        $R7

    Push ${L_RESULT}
-   Push ${L_SHOWUI}
    Push ${L_TEMP}

!   ; Field 2 = 'Do not run POPFile' radio button, field 5 = 'Display UI' checkbox

    !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 2" "State"
!   !insertmacro MUI_INSTALLOPTIONS_READ ${L_SHOWUI} "ioC.ini" "Field 5" "State"

!   StrCmp ${L_SHOWUI} "0" selection_ok
!   StrCmp ${L_TEMP} "0" selection_ok

!   MessageBox MB_OK "Sorry, the POPFile User Interface only works when POPFile is running !\
!       $\r$\n$\r$\n\
!       If you wish to display the User Interface, you must also select one of the 'Run POPFile'\
!       options."

!   ; Stay with the custom page created by "StartPOPFilePage"

!   Pop ${L_TEMP}
!   Pop ${L_SHOWUI}
!   Pop ${L_RESULT}
!   Abort

! selection_ok:

!   ; If user does not want to start POPFIle now, there is nothing left to do here

-   StrCmp ${L_TEMP} "1" exit_without_banner
-   
    Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile now." "Please be patient..."

--- 1122,1159 ----

    !define L_RESULT      $R9
!   !define L_TEMP        $R8

    Push ${L_RESULT}
    Push ${L_TEMP}

!   ; Field 2 = 'Do not run POPFile' radio button

    !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 2" "State"
!   StrCmp ${L_TEMP} "0" run_popfile

!   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Run Status" "LastAction"
!   StrCmp ${L_TEMP} "" exit_without_banner
!   StrCmp ${L_TEMP} "no" exit_without_banner
!   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "no"

!   ; User has changed their mind: Shutdown the newly installed version of POPFile

!   NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
!   Pop ${L_RESULT}    ; Get the return value (and ignore it)
!   goto exit_without_banner

! run_popfile:

!   ; Field 4 = 'Run POPFile in background' radio button

!   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 4" "State"
!   StrCmp ${L_TEMP} "1" run_in_background
! 
!   ; Run POPFile in a DOS box
! 
!   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Run Status" "LastAction"
!   StrCmp ${L_TEMP} "DOS-box" exit_without_banner
!   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "DOS-box"

    Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile now." "Please be patient..."

***************
*** 1144,1156 ****
    Pop ${L_RESULT}    ; Get the return value (and ignore it)

-   ; Field 4 = 'Run POPFile in background' radio button
- 
-   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Field 4" "State"
-   StrCmp ${L_TEMP} "1" run_in_background
- 
-   ; Run POPFile in a DOS box
- 
    ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
!   goto display_ui

  run_in_background:
--- 1164,1169 ----
    Pop ${L_RESULT}    ; Get the return value (and ignore it)

    ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
!   goto wait_for_popfile

  run_in_background:
***************
*** 1158,1165 ****
    ; Run POPFile without a DOS box

    ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"

! display_ui:
!   StrCmp ${L_SHOWUI} "0" exit_now

    ; Wait until POPFile is ready to display the UI (may take a second or so)
--- 1171,1189 ----
    ; Run POPFile without a DOS box

+   !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Run Status" "LastAction"
+   StrCmp ${L_TEMP} "background" exit_without_banner
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "background"
+ 
+   Banner::show /NOUNLOAD /set 76 "Preparing to start POPFile now." "Please be patient..."
+ 
+   ; Before starting the newly installed POPFile, ensure that no other version of POPFile
+   ; is running on the same UI port as the newly installed version.
+ 
+   NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
+   Pop ${L_RESULT}    ; Get the return value (and ignore it)
+ 
    ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"

! wait_for_popfile:

    ; Wait until POPFile is ready to display the UI (may take a second or so)
***************
*** 1170,1194 ****
    NSISdl::download_quiet http://127.0.0.1:${GUI} "$PLUGINSDIR\ui.htm"
    Pop ${L_RESULT}                        ; Did POPFile return an HTML page?
!   StrCmp ${L_RESULT} "success" launch_browser
    Sleep 250   ; milliseconds
    IntOp ${L_TEMP} ${L_TEMP} - 1
!   IntCmp ${L_TEMP} 0 launch_browser launch_browser check_if_ready
! 
! launch_browser:
!   ExecShell "open" "http://127.0.0.1:${GUI}/"

! exit_now:
    Banner::destroy
-   
- exit_without_banner:

!   ; Allow next page in the installation sequence to be shown

    Pop ${L_TEMP}
-   Pop ${L_SHOWUI}
    Pop ${L_RESULT}

    !undef L_RESULT
!   !undef L_SHOWUI
    !undef L_TEMP

--- 1194,1247 ----
    NSISdl::download_quiet http://127.0.0.1:${GUI} "$PLUGINSDIR\ui.htm"
    Pop ${L_RESULT}                        ; Did POPFile return an HTML page?
!   StrCmp ${L_RESULT} "success" remove_banner
    Sleep 250   ; milliseconds
    IntOp ${L_TEMP} ${L_TEMP} - 1
!   IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready

! remove_banner:
    Banner::destroy

! exit_without_banner:

    Pop ${L_TEMP}
    Pop ${L_RESULT}

    !undef L_RESULT
!   !undef L_TEMP
! 
! FunctionEnd
! 
! #--------------------------------------------------------------------------
! # Installer Function: CheckRunStatus
! # (the "pre" function for the 'Finish' page)
! #
! # The 'Finish' page contains a single CheckBox to control whether or not the installer
! # starts the POPFile User Interface. The User Interface only works when POPFile is running,
! # so we must ensure this CheckBox can only be ticked if the installer has started POPFile.
! #--------------------------------------------------------------------------
! 
! Function CheckRunStatus
! 
!   !define L_TEMP        $R9
! 
!   Push ${L_TEMP}
! 
!   ; Field 4 is the 'ReadMe' CheckBox on the 'Finish' page (assuming there is no 'Run' CheckBox)
! 
!   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" ""
! 
!   ; Get the status of the 'Do not run POPFile' radio button on the previous page of installer
! 
!   !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"
! 
! selection_ok:
!   Pop ${L_TEMP}
! 
    !undef L_TEMP

***************
*** 1386,1390 ****

    FunctionEnd
! !macroend  

  #--------------------------------------------------------------------------
--- 1439,1443 ----

    FunctionEnd
! !macroend

  #--------------------------------------------------------------------------
***************
*** 1468,1472 ****
    !define L_REG_VALUE   $R7
    !define L_TEMP        $R8
!   
    IfFileExists $INSTDIR\popfile.pl skip_confirmation
      MessageBox MB_YESNO "It does not appear that POPFile is installed in the \
--- 1521,1525 ----
    !define L_REG_VALUE   $R7
    !define L_TEMP        $R8
! 
    IfFileExists $INSTDIR\popfile.pl skip_confirmation
      MessageBox MB_YESNO "It does not appear that POPFile is installed in the \

Index: ioC.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioC.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ioC.ini	12 Jun 2003 15:02:32 -0000	1.1
--- ioC.ini	14 Jun 2003 17:22:47 -0000	1.2
***************
*** 11,15 ****

  [Settings]
! NumFields=7
  BackEnabled=0
  CancelEnabled=0
--- 11,15 ----

  [Settings]
! NumFields=6
  BackEnabled=0
  CancelEnabled=0
***************
*** 21,25 ****
  Right=-10
  Top=0
! Bottom=75

  [Field 2]
--- 21,25 ----
  Right=-10
  Top=0
! Bottom=60

  [Field 2]
***************
*** 50,77 ****

  [Field 5]
- Type=CheckBox
- Text=Display the POPFile User Interface (only if POPFile is running)
- Left=30
- Right=-30
- Top=57
- Bottom=67
- Flags=Group
- State=1
- 
- [Field 6]
  Type=GroupBox
  Text=
  Left=10
  Right=-10
! Top=80
! Bottom=140

! [Field 7]
  Type=Label
! Text=Once POPFile has been started, you can display the POPFile User Interface by\r\n\r\n(a) double-clicking the POPFile icon in the system tray,   or\r\n\r\n(b) using Start --> Programs --> POPFile --> POPFile User Interface.
  Left=15
  Right=-15
! Top=90
! Bottom=135

  #--------------------
--- 50,67 ----

  [Field 5]
  Type=GroupBox
  Text=
  Left=10
  Right=-10
! Top=75
! Bottom=135

! [Field 6]
  Type=Label
! Text=Once POPFile has been started, you can display the POPFile User Interface by\r\n\r\n(a) double-clicking the POPFile icon in the system tray,   OR\r\n\r\n(b) using Start --> Programs --> POPFile --> POPFile User Interface.
  Left=15
  Right=-15
! Top=85
! Bottom=130

  #--------------------