[popfile-commit] windows/test pfidiag.nsi,1.10,1.11

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

Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6834

Modified Files:
	pfidiag.nsi 
Log Message:
When displaying the 'simple' report, scroll to the part which shows
the LFN and SFN formats of POPFile's program and user data folders.

Index: pfidiag.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pfidiag.nsi	2 Mar 2005 20:02:33 -0000	1.10
--- pfidiag.nsi	21 Jul 2005 19:18:44 -0000	1.11
***************
*** 78,82 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.52"
  
    !define C_OUTFILE   "pfidiag.exe"
--- 78,82 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION   "0.0.53"
  
    !define C_OUTFILE   "pfidiag.exe"
***************
*** 915,918 ****
--- 915,924 ----
    DetailPrint "------------------------------------------------------------"
  
+   StrCmp ${L_DIAG_MODE} "simple" 0 quiet_exit
+ 
+   ; For 'simple' reports, scroll to the LFN and SFN versions of the installation locations
+ 
+   Call ScrollToShowPaths
+ 
  quiet_exit:
    SetDetailsPrint textonly
***************
*** 1059,1062 ****
--- 1065,1137 ----
  FunctionEnd
  
+ 
+ #--------------------------------------------------------------------------
+ # Function used to manipulate the contents of the details view
+ #--------------------------------------------------------------------------
+ 
+   ;------------------------------------------------------------------------
+   ; Constants used when accessing the details view
+   ;------------------------------------------------------------------------
+ 
+   !define C_LVM_GETITEMCOUNT        0x1004
+   !define C_LVM_ENSUREVISIBLE       0x1013
+ 
+ #--------------------------------------------------------------------------
+ # Installer Function: ScrollToShowPaths
+ #
+ # Scrolls the details view up to make it show the locations of the
+ # program files and the 'User Data' files in LFN and SFN formats.
+ #
+ # Inputs:
+ #         none
+ #
+ # Outputs:
+ #         none
+ #
+ # Usage:
+ #         Call ScrollToShowPaths
+ #
+ #--------------------------------------------------------------------------
+ 
+ Function ScrollToShowPaths
+ 
+   !define L_TEMP      $R9
+   !define L_TOPROW    $R8   ; item index of the line we want to be at the top of the window
+ 
+   Push ${L_TEMP}
+   Push ${L_TOPROW}
+ 
+   ; Even the 'simple' report is too long to fit in the details view window so we
+   ; automatically scroll the view to make it display the LFN and SFN versions of
+   ; the POPFile program and 'User Data' folder locations (on the assumption that
+   ; this is the information most users will want to find first).
+ 
+   StrCpy ${L_TOPROW} 9    ; index of the blank line immediately before "Current UserName"
+ 
+   ; Check how many 'details' lines there are
+ 
+   FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT
+   GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8          ; This is the Control ID of the details view
+   SendMessage ${L_TEMP} ${C_LVM_GETITEMCOUNT} 0 0 ${L_TEMP}
+ 
+   ; No point in trying to display a non-existent line
+ 
+   IntCmp ${L_TEMP} ${L_TOPROW} exit exit
+ 
+   ; Scroll up (in effect) to show Current UserName, Program folder & User Data folder entries
+ 
+   FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT
+   GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8           ; This is the Control ID of the details view
+   SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0
+ 
+ exit:
+   Pop ${L_TOPROW}
+   Pop ${L_TEMP}
+ 
+   !undef L_TEMP
+   !undef L_TOPROW
+ 
+ FunctionEnd
+ 
  #--------------------------------------------------------------------------
  # End of 'pfidiag.nsi'