Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv30059
Modified Files:
installer.nsi ioA.ini ioB.ini
Log Message:
Merge patch that adds checking of the port values to the installer
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** installer.nsi 15 Apr 2003 21:31:18 -0000 1.35
--- installer.nsi 22 Apr 2003 21:45:24 -0000 1.36
***************
*** 1,9 ****
! ;
! ; Copyright (c) 2001-2003 John Graham-Cumming
! ;
! ; Modified to work with NSIS v2.0b1
! !define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.18.1"
! !include "MUI.nsh"
#----------------------------------------------------------------------------------------
--- 1,20 ----
[...1111 lines suppressed...]
MessageBox MB_OK|MB_ICONEXCLAMATION \
"Note: $INSTDIR could not be removed."
--- 1101,1105 ----
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."
***************
*** 636,639 ****
SectionEnd
! ;eof
!
--- 1110,1114 ----
SectionEnd
! #--------------------------------------------------------------------------
! # End of 'installer.nsi'
! #--------------------------------------------------------------------------
Index: ioA.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioA.ini,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ioA.ini 19 Feb 2003 21:45:53 -0000 1.8
--- ioA.ini 22 Apr 2003 21:45:27 -0000 1.9
***************
*** 1,3 ****
! ; This "ioA.ini" file has been tested using NSIS v2.0b1 and Windows 98SE
[Settings]
--- 1,12 ----
! #-------------------------------------------------------------------
! #
! # ioA.ini --- This file is used by "installer.nsi", the NSIS script
! # used to create the Windows installer for POPFile.
! # This file defines the layout of the custom page
! # used to choose the port and startup options.
! #
! # Copyright (c) 2001-2003 John Graham-Cumming
! #
! #-------------------------------------------------------------------
[Settings]
***************
*** 6,10 ****
[Field 1]
Type=label
! Text=Choose the default port number for POP3 connections (110 recommended).
Left=0
Right=-1
--- 15,19 ----
[Field 1]
Type=label
! Text=Choose the default port number for POP3 connections (110 recommended)
Left=0
Right=-1
***************
*** 22,26 ****
[Field 3]
Type=label
! Text=Choose the default port number for user interface connections (8080 recommended)
Left=0
Right=-1
--- 31,35 ----
[Field 3]
Type=label
! Text=Choose the default port number for 'User Interface' connections (8080 recommended)
Left=0
Right=-1
***************
*** 59,60 ****
--- 68,73 ----
Top=115
Bottom=125
+
+ #--------------------
+ # End of ioA.ini
+ #--------------------
Index: ioB.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioB.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ioB.ini 27 Feb 2003 00:05:18 -0000 1.4
--- ioB.ini 22 Apr 2003 21:45:28 -0000 1.5
***************
*** 1,77 ****
! [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
! 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]
--- 1,90 ----
! #-------------------------------------------------------------------
! #
! # ioB.ini --- This file is used by "installer.nsi", the NSIS script
! # used to create the Windows installer for POPFile.
! # This file defines the layout of the custom page
! # used to configure Outlook Express accounts.
! #
! # Copyright (c) 2001-2003 John Graham-Cumming
! #
! #-------------------------------------------------------------------
!
! [Settings]
! NumFields=10
! NextButtonText=Next >
! BackEnabled=0
! CancelEnabled=0
!
! [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
! 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]
***************
*** 83,84 ****
--- 96,100 ----
Bottom=110
+ #--------------------
+ # End of ioB.ini
+ #--------------------
|
