[popfile-commit] windows ioB.ini,NONE,1.1 Makefile,1.7,1.8 installer.nsi,1.22,1.23

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Makefile installer.nsi 
Added Files:
	ioB.ini 
Log Message:
Modified installer to remove non-English language manuals since they are large; added new automatic configuration of Outlook Express identities; updated Makefile; using latest NSIS package

--- NEW FILE: ioB.ini ---
[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

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/windows/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	3 Feb 2003 00:48:58 -0000	1.7
--- Makefile	19 Feb 2003 16:20:33 -0000	1.8
***************
*** 6,10 ****

  setup.exe: ../engine/*.pl ../engine/Classifier/*.pm ../engine/skins/*.css ../engine/skins/*.gif
! setup.exe: installer.nsi ioA.ini
  	@../NSIS/makensis.exe /V4 $<

--- 6,10 ----

  setup.exe: ../engine/*.pl ../engine/Classifier/*.pm ../engine/skins/*.css ../engine/skins/*.gif
! setup.exe: installer.nsi ioA.ini ioB.ini
  	@../NSIS/makensis.exe /V4 $<

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** installer.nsi	6 Feb 2003 22:24:09 -0000	1.22
--- installer.nsi	19 Feb 2003 16:20:34 -0000	1.23
***************
*** 4,8 ****

  !define MUI_PRODUCT "POPFile" 
! !define MUI_VERSION "0.18.0"

  !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
--- 4,8 ----

  !define MUI_PRODUCT "POPFile" 
! !define MUI_VERSION "0.18.1"

  !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
***************
*** 25,28 ****
--- 25,30 ----
    !define LNE     $4
    !define CMPRE   $5
+   !define OEID    $6
+   !define ID      $7

    ;Language
***************
*** 42,45 ****
--- 44,48 ----
    !insertmacro MUI_PAGECOMMAND_DIRECTORY
    Page custom SetOptionsPage  "Options"
+   Page custom SetOutlookExpressPage  "Configure Outlook Express"
    !insertmacro MUI_PAGECOMMAND_INSTFILES

***************
*** 49,53 ****
      LangString DESC_SecPerl    ${LANG_ENGLISH} "Installs minimal Perl needed by POPFile."
      LangString DESC_SecSkins   ${LANG_ENGLISH} "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
!     LangString DESC_SecLangs   ${LANG_ENGLISH} "Installs non-English language translations of the POPFile UI and manual."

    ;Folder-selection page
--- 52,56 ----
      LangString DESC_SecPerl    ${LANG_ENGLISH} "Installs minimal Perl needed by POPFile."
      LangString DESC_SecSkins   ${LANG_ENGLISH} "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
!     LangString DESC_SecLangs   ${LANG_ENGLISH} "Installs non-English language versions of the POPFile UI."

    ;Folder-selection page
***************
*** 58,63 ****
--- 61,68 ----
    ;Only useful for BZIP2 compression
    ;Use ReserveFile for your own Install Options ini files too!
+ 
    !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
    ReserveFile "ioA.ini"
+   ReserveFile "ioB.ini"

  Function .onInit
***************
*** 98,103 ****
  skip_gui_set:

!   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
!   
  FunctionEnd

--- 103,110 ----
  skip_gui_set:

!   InitPluginsDir
!   File /oname=$PLUGINSDIR\ioA.ini ioA.ini
!   File /oname=$PLUGINSDIR\ioB.ini ioB.ini
! 
  FunctionEnd

***************
*** 274,287 ****
    File "..\engine\languages\*.msg"

-   SetOutPath $INSTDIR\manual\br
-   File "..\engine\manual\br\*.html"
-   SetOutPath $INSTDIR\manual\de
-   File "..\engine\manual\de\*.html"
-   File "..\engine\manual\de\*.gif"
-   SetOutPath $INSTDIR\manual\no
-   File "..\engine\manual\no\*.html"
-   SetOutPath $INSTDIR\manual\fr
-   File "..\engine\manual\fr\*.html"
- 
  SectionEnd

--- 281,284 ----
***************
*** 311,315 ****
    !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioA.ini" "Field 2" "State" ${POP3}
    !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioA.ini" "Field 4" "State" ${GUI}
!   !insertmacro MUI_INSTALLOPTIONS_DISPLAY  "ioA.ini"
  FunctionEnd

--- 308,371 ----
    !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioA.ini" "Field 2" "State" ${POP3}
    !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioA.ini" "Field 4" "State" ${GUI}
! 
!   Push $R0
!   InstallOptions::dialog $PLUGINSDIR\ioA.ini
!   Pop $R0
! FunctionEnd
! 
! ; This function is used to reconfigure Outlook Express accounts
! 
! Function SetOutlookExpressPage
! 
!   ; Run through all the identities that are in HKEY_CURRENT_USER\Identities and for
!   ; each one that has a Software\Microsoft\Internet Account Manager\Accounts\00000001 entry
!   ; display the reconfiguration option if the account has not yet been reconfigured
!   ; which we detect by pop3 server name != 127.0.0.1
!   
!   IntOp ${OEID} ${OEID} * 0		; Weird way of making sure that ${OEID} is 0
!   
!   ; Get the next identity from the registry
! 
! next_id:  
!   EnumRegKey ${ID} HKCU "Identities" ${OEID}
!   StrCmp ${ID} "" finished_oe
! 
!   ; Now extract the POP3 Server, if this does not exist then this ID is
!   ; not configured for mail so move on
!   
!   StrCpy $R5 "Identities\${ID}\Software\Microsoft\Internet Account Manager\Accounts\00000001"
!   ReadRegStr $R6 HKCU $R5 "POP3 Server"
!   StrCmp $R6 "" next_id_increment
!   StrCmp $R6 "127.0.0.1" next_id_increment
! 
!   !insertmacro MUI_HEADER_TEXT "Reconfigure Outlook Express" "POPFile can reconfigure Outlook Express for you"
!   !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioB.ini" "Field 2" "State" "0"
!   !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioB.ini" "Field 8" "Text" $R6
!   ReadRegStr $R6 HKCU $R5 "SMTP Email Address"
!   !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioB.ini" "Field 7" "Text" $R6
!   ReadRegStr $R6 HKCU $R5 "POP3 User Name"
!   !insertmacro MUI_INSTALLOPTIONS_WRITE    "ioB.ini" "Field 9" "Text" $R6
!   Push $R0
!   InstallOptions::dialog $PLUGINSDIR\ioB.ini
!   Pop $R0
!   
!   StrCmp $R0 "cancel" finished_oe
!   StrCmp $R0 "back" finished_oe
! 
!   !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ioB.ini" "Field 2" "State"
!   StrCmp $R5 "1" change_oe next_id_increment
! 
! change_oe:
!   StrCpy $R5 "Identities\${ID}\Software\Microsoft\Internet Account Manager\Accounts\00000001"
!   ReadRegStr $R6 HKCU $R5 "POP3 User Name"
!   ReadRegStr $R7 HKCU $R5 "POP3 Server"
!   WriteRegStr HKCU $R5 "POP3 User Name" "$R7:$R6" 
!   WriteRegStr HKCU $R5 "POP3 Server" "127.0.0.1"
! 
! next_id_increment:
!   IntOp ${OEID} ${OEID} + 1
!   goto next_id
! 
! finished_oe:
  FunctionEnd

***************
*** 354,367 ****
    RMDir $INSTDIR\skins
    Delete $INSTDIR\manual\en\*.html
-   Delete $INSTDIR\manual\br\*.html
-   Delete $INSTDIR\manual\no\*.html
-   Delete $INSTDIR\manual\fr\*.html
-   Delete $INSTDIR\manual\de\*.html
-   Delete $INSTDIR\manual\de\*.gif
    RMDir $INSTDIR\manual\en
-   RMDir $INSTDIR\manual\br
-   RMDir $INSTDIR\manual\no
-   RMDir $INSTDIR\manual\fr
-   RMDir $INSTDIR\manual\de
    Delete $INSTDIR\manual\*.gif
    RMDir $INSTDIR\manual
--- 410,414 ----