[popfile-commit] windows installer.nsi,1.23,1.24 ioB.ini,1.1,1.2

[<jgr...@us...>]

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

Modified Files:
	installer.nsi ioB.ini 
Log Message:
Merge patch that improves the look of the installer and makes configuration of OE work on Win9x as well

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** installer.nsi	19 Feb 2003 16:20:34 -0000	1.23
--- installer.nsi	25 Feb 2003 01:48:51 -0000	1.24
***************
*** 1,466 ****
! ;
! ; Copyright (c) 2001-2003 John Graham-Cumming
! ;
! 
! !define MUI_PRODUCT "POPFile" 
! !define MUI_VERSION "0.18.1"
! 
! !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
! 
! ;--------------------------------
[...970 lines suppressed...]
!   DeleteRegKey HKLM SOFTWARE\POPFile
! 
!   ; if $INSTDIR was removed, skip these next ones
!   IfFileExists $INSTDIR 0 Removed 
!     MessageBox MB_YESNO|MB_ICONQUESTION \
!       "Do you want to remove all files in your POPFile directory? (If you have anything \
! you created that you want to keep, click No)" IDNO Removed
!     Delete $INSTDIR\*.* ; this would be skipped if the user hits no
!     RMDir /r $INSTDIR
!     IfFileExists $INSTDIR 0 Removed 
!       MessageBox MB_OK|MB_ICONEXCLAMATION \
!                  "Note: $INSTDIR could not be removed."
! Removed:
! 
!   !insertmacro MUI_UNFINISHHEADER
! 
! SectionEnd
! 
! ;eof
! 

Index: ioB.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioB.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ioB.ini	19 Feb 2003 16:20:34 -0000	1.1
--- ioB.ini	25 Feb 2003 01:48:51 -0000	1.2
***************
*** 1,75 ****
! [Settings]
! NumFields=9
! NextButtonText=Next >
! 
! [Field 1]
! Type=label
! Text=POPFile has detected an Outlook Express email account and can automatically configure\nit to work with POPFile
! Left=0
! Right=500
! Top=0
! Bottom=20
! 
! [Field 2]
! Type=checkbox
! Text=Reconfigure this account to work with POPFile
! Left=0
! Right=300
! Top=20
! Bottom=40
! 
! [Field 3]
! Type=label
! Text=Email address:
! Left=16
! Right=300
! Top=48
! Bottom=64
! 
! [Field 4]
! Type=label
! Text=POP3 server:
! Left=16
! Right=300
! Top=64
! Bottom=80
! 
! [Field 5]
! Type=label
! Text=POP3 username:
! Left=16
! Right=300
! Top=80
! Bottom=96
! 
! [Field 6]
! Type=label
! Text=If you uninstall POPFile the original settings will be restored
! Left=0
! Right=500
! Top=112
! Bottom=132
! 
! [Field 7]
! Type=label
! Text=
! Left=96
! Right=300
! Top=48
! Bottom=64
  
! [Field 8]
! Type=label
  Text=
! Left=96
! Right=300
! Top=64
! Bottom=80
  
- [Field 9]
- Type=label
- Text=
- Left=96
- Right=300
- Top=80
- Bottom=96
--- 1,84 ----
! [Settings]

! NumFields=10

! NextButtonText=Next >

! 

! [Field 1]

! Type=label

! Text=POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile

! Left=0

! Right=-1

! Top=0

! Bottom=20

! 

! [Field 2]

! Type=checkbox

! Text=Reconfigure this account to work with POPFile

! Left=0

! Right=-1

! Top=20

! Bottom=40

! 

! [Field 3]

! Type=label

! Text=Email address:

! Left=16

! Right=300

! Top=59

! Bottom=75

! 

! [Field 4]

! Type=label

! Text=POP3 server:

! Left=16

! Right=300

! Top=75

! Bottom=91

! 

! [Field 5]

! Type=label

! Text=POP3 username:

! Left=16

! Right=300

! Top=91

! Bottom=107

! 

! [Field 6]

! Type=label

! Text=If you uninstall POPFile the original settings will be restored (NOT YET IMPLEMENTED)

! Left=0

! Right=-1

! Top=118

! Bottom=137

! 

! [Field 7]

! Type=label

! Text=

! Left=96

! Right=300

! Top=59

! Bottom=75

! 

! [Field 8]

! Type=label

! Text=

! Left=96

! Right=300

! Top=75

! Bottom=91

! 

! [Field 9]

! Type=label

! Text=

! Left=96

! Right=300

! Top=91

! Bottom=107

  
! [Field 10]
! Type=GroupBox
  Text=
! Left=11
! Right=-20
! Top=44
! Bottom=110