[Anyedit-cvs]AnyEditv2 AnyEdit.nsi,1.4,1.5 ScintillaDefaults.cpp,1.11,1.12

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

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv13635

Modified Files:
	AnyEdit.nsi ScintillaDefaults.cpp 
Log Message:
Beta 2.0

Index: AnyEdit.nsi
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.nsi,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AnyEdit.nsi	18 Jan 2003 13:51:50 -0000	1.4
--- AnyEdit.nsi	22 Jul 2003 04:46:13 -0000	1.5
***************
*** 1,51 ****
! ;NSIS Modern Style UI
! 
! !define NAME "AnyEdit" ;Define your own software name here
! !define VERSION "v 2.0 Alpha 10.0" ;Define your own software version here
! 
! !verbose 3
! !include "${NSISDIR}\Examples\WinMessages.nsh"
! !include "${NSISDIR}\Examples\Modern UI\ModernUI.nsh"
! !verbose 4

! !define CURRENTPAGE $9

! !define TEMP1 $R0
! !define TEMP2 $R1

  ;--------------------------------

    ;General
!   Name "${NAME} ${VERSION}"
!   OutFile "AESetupa10.exe"
!   SetOverwrite on

!   ;User interface
!   !insertmacro MUI_INTERFACE "modern.exe" "setup.ico" "setup.ico" "checks2.bmp" "smooth"

!   ;License dialog
!   LicenseText "Scroll down to see the rest of the agreement."
!   LicenseData "License.txt"

!   ;Component-select dialog
!   ComponentText "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."

!   ;Folder-select dialog
!   InstallDir "$PROGRAMFILES\${NAME}"
!   DirText "Setup will install ${NAME} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder." " "

!   ;Install dialog
!   InstallColors /windows ;Default Windows colors for details list
!   InstProgressFlags smooth

!   ;Uninstaller
!   UninstallText "This will uninstall ${NAME} from your system."

!   ShowInstDetails show 

  ;--------------------------------
  ;Installer Sections

! Section "AnyEdit main files" secmain

  ###This must remain only for the alphas
--- 1,69 ----
! ;AnyEdit Installer
! ;M.Deepak - 22/07/2003

! !define MUI_PRODUCT "AnyEdit" ;Define your own software name here
! !define MUI_VERSION "v 2.0 Beta 2" ;Define your own software version here

! !include "MUI.nsh"
!  

  ;--------------------------------
+ ;Configuration

    ;General
!   OutFile "AESetupB20.exe"

!   ;Folder selection page
!   InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
!   
!   ;Remember install folder
!   InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""

! ;--------------------------------
! ;Modern UI Configuration

!   !define MUI_WELCOMEPAGE
!   !define MUI_LICENSEPAGE
!   !define MUI_COMPONENTSPAGE
!   !define MUI_DIRECTORYPAGE
!   !define MUI_FINISHPAGE
!   !define MUI_FINISHPAGE_RUN "$INSTDIR\AnyEdit.exe"
!   
!   !define MUI_ABORTWARNING  
!   !define MUI_UNINSTALLER
!   !define MUI_UNCONFIRMPAGE
! ;  !define MUI_UI_HEADERBITMAP_RIGHT ".\nortel_logo_small.bmp"

! ;Languages
!  
!   !insertmacro MUI_LANGUAGE "English"
!   
! ;--------------------------------
! ;Language Strings

!   ;Description
!   LangString DESC_SecMain ${LANG_ENGLISH} "Install AnyEdit"
!   LangString DESC_StartMenu ${LANG_ENGLISH} "Install Startup Menu shortcuts"
!   LangString DESC_SecDesktop ${LANG_ENGLISH} "Create desktop shortcut for launching AnyEdit"
!   LangString DESC_SecQuick ${LANG_ENGLISH} "Create Quick Launch shortcut for launching AnyEdit"

! ;--------------------------------
! ;Data

!   LicenseData ".\License.txt"
!   
! ;--------------------------------
! ;Reserve Files
! 
!   ;Things that need to be extracted on first (keep these lines before any File command!)
!   ;Only useful for BZIP2 compression
!   !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
! 
! BrandingText "NSIS"

  ;--------------------------------
  ;Installer Sections

! Section "!AnyEdit" SecMain

  ###This must remain only for the alphas
***************
*** 63,74 ****
  File 'AnyEdit.chm'
  File 'grep.exe'
- File 'ctags.exe'
  File 'Readme.txt'
- File 'InstallHelp.exe'
  File 'History.txt'
  File 'License.txt'
  File 'UserImages.bmp'

- #ExecShell "" "$INSTDIR\InstallHelp.exe" "" SW_SHOWMINIMIZED

  CreateDirectory '$INSTDIR\Favourites'
--- 81,89 ----
***************
*** 113,266 ****
  File '.\Templates\Project\Java Applet\Files\*'

! #### -------Initial Reg settings ----#########
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages" "1" "Java"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages" "2" "HTML"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages" "3" "Cpp"
! WriteRegDWORD HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages" "Count" 3
! 
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Cpp" "ACPFile" "java.acmp"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Cpp" "Extension" "cpp,cxx,cc,c"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Cpp" "SyntaxFile" "cpp.syn"
! 
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\HTML" "ACPFile" "html4.acmp"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\HTML" "Extension" "html,htm,php,asp"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\HTML" "SyntaxFile" "html4.syn"
! 
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Java" "ACPFile" "java.acmp"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Java" "Extension" "java,jav"
! WriteRegStr HKEY_CURRENT_USER "Software\DeepSoft\AnyEdit Editor\Preferences\Languages\Java" "SyntaxFile" "jav2.syn"
! 
! 
! Delete $INSTDIR\InstallHelp.exe

  SectionEnd

! section 'Start Menu Shortcut' secstshort
  SetOutPath $SMPROGRAMS\AnyEditPro
  CreateShortCut '$SMPROGRAMS\AnyEditPro\AnyEdit.lnk' '$INSTDIR\AnyEdit.exe'
! # End of script for Section All Important Files (Required)
  SectionEnd

! section 'Desktop Shortcut' secdtshort
  SetOutPath $INSTDIR
  CreateShortCut '$DESKTOP\AnyEdit Professional.lnk' '$INSTDIR\AnyEdit.exe' '/CD /PAUSE'
! sectionend

! section 'Quick Lauch Shortcut' secqlshort
  SetOutPath $INSTDIR
  CreateShortCut '$QUICKLAUNCH\AnyEdit Professional.lnk' '$INSTDIR\AnyEdit.exe' '/CD /PAUSE'
! sectionend
! 
! Section "Create Uninstaller" SecCreateUninst
! 
!   ;Add your stuff here

-   WriteUninstaller "$INSTDIR\Uninstall.exe"

  SectionEnd

  Section -post

  WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\AnyEditPro "" $INSTDIR
! WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro" "DisplayName" "${NAME} ${VERSION}"
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro" "UninstallString" "$INSTDIR\Uninstall.exe"
  SectionEnd

- 
- Section ""
- 
-   ;Invisible section to display the Finish header
-   !insertmacro MUI_FINISHHEADER SetPage
- 
- SectionEnd
- 
- 
- 
  ;--------------------------------
! ;Installer Functions
! 
! Function .onInitDialog
! 
!   !insertmacro MUI_INNERDIALOG_INIT
! 
!     !insertmacro MUI_INNERDIALOG_START 1
!       !insertmacro MUI_INNERDIALOG_TEXT 1033 1040 "If you accept all the terms of the agreement, choose I Agree to continue. If you choose Cancel, Setup will close. You must accept the agreement to install ${NAME}."
!     !insertmacro MUI_INNERDIALOG_STOP 1
! 
!     !insertmacro MUI_INNERDIALOG_START 2
!       !insertmacro MUI_INNERDIALOG_TEXT 1033 1042 "Description"
!       !insertmacro MUI_INNERDIALOG_TEXT 1033 1043 "Hover your mouse over a component to see it's description."
!     !insertmacro MUI_INNERDIALOG_STOP 2
! 
!     !insertmacro MUI_INNERDIALOG_START 3
!       !insertmacro MUI_INNERDIALOG_TEXT 1033 1041 "Destination Folder"
!       !insertmacro MUI_INNERDIALOG_STOP 3
! 
!   !insertmacro MUI_INNERDIALOG_END
! 
! FunctionEnd
! 
! Function .onNextPage
! 
!   !insertmacro MUI_NEXTPAGE SetPage
! 
! FunctionEnd
! 
! Function .onPrevPage
! 
!   !insertmacro MUI_PREVPAGE SetPage
! 
! FunctionEnd
! 
! Function SetPage
! 
!   !insertmacro MUI_PAGE_INIT
! 
!     !insertmacro MUI_PAGE_START 1
!        !insertmacro MUI_HEADER_TEXT 1033 "License Agreement" "Please review the license terms before installing ${NAME}."
!     !insertmacro MUI_PAGE_STOP 1
! 
!     !insertmacro MUI_PAGE_START 2
!       !insertmacro MUI_HEADER_TEXT 1033 "Choose Components" "Choose the components you want to install."
!     !insertmacro MUI_PAGE_STOP 2
! 
!     !insertmacro MUI_PAGE_START 3
!       !insertmacro MUI_HEADER_TEXT 1033 "Choose Install Location" "Choose the folder in which to install ${NAME}."
!     !insertmacro MUI_PAGE_STOP 3
! 
!     !insertmacro MUI_PAGE_START 4
!       !insertmacro MUI_HEADER_TEXT 1033 "Installing" "Please wait while ${NAME} is being installed."
!     !insertmacro MUI_PAGE_STOP 4
! 
!     !insertmacro MUI_PAGE_START 5
!       !insertmacro MUI_HEADER_TEXT 1033 "Finished" "Setup was completed successfully."
!     !insertmacro MUI_PAGE_STOP 5
! 
!   !insertmacro MUI_PAGE_END
! 
! FunctionEnd
! 
! Function .onMouseOverSection
! 
!   !insertmacro MUI_DESCRIPTION_INIT
! 
!     !insertmacro MUI_DESCRIPTION_TEXT 1033 ${secmain} "Copy all necessary AnyEdit binaries to the application folder."
!     !insertmacro MUI_DESCRIPTION_TEXT 1033 ${secstshort} "Create an shortcut start menu"
!     !insertmacro MUI_DESCRIPTION_TEXT 1033 ${secdtshort} "Create an shortcut on the desktop"
!     !insertmacro MUI_DESCRIPTION_TEXT 1033 ${secqlshort} "Create an shortcut in the quick launch folder"
!     !insertmacro MUI_DESCRIPTION_TEXT 1033 ${SecCreateUninst} "Create a uninstaller which can automatically delete ${NAME}."
! 
!  !insertmacro MUI_DESCRIPTION_END
! 
! FunctionEnd
! 
! Function .onUserAbort
! 
!   !insertmacro MUI_ABORTWARNING 1033 "Are you sure you want to quit ${NAME} Setup?"
!   !insertmacro MUI_ABORTWARNING_END

! FunctionEnd

  ;--------------------------------
--- 128,177 ----
  File '.\Templates\Project\Java Applet\Files\*'

! WriteUninstaller "$INSTDIR\Uninstall.exe"
! WriteRegStr HKCU "Software\${MUI_PRODUCT}" "" $INSTDIR   

  SectionEnd

! Section "Start menu shortcuts" SecStartMenu
! 
  SetOutPath $SMPROGRAMS\AnyEditPro
  CreateShortCut '$SMPROGRAMS\AnyEditPro\AnyEdit.lnk' '$INSTDIR\AnyEdit.exe'
! 
  SectionEnd

! Section "Desktop Shortcut" SecDesktop
  SetOutPath $INSTDIR
  CreateShortCut '$DESKTOP\AnyEdit Professional.lnk' '$INSTDIR\AnyEdit.exe' '/CD /PAUSE'
! SectionEnd

! Section "Quick Launch Shortcut" SecQuickLaunch
  SetOutPath $INSTDIR
  CreateShortCut '$QUICKLAUNCH\AnyEdit Professional.lnk' '$INSTDIR\AnyEdit.exe' '/CD /PAUSE'
! SectionEnd

+ Section -pre
+   SectionSetFlags SecMain 16
  SectionEnd

+ 
  Section -post

  WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\AnyEditPro "" $INSTDIR
! WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro" "DisplayName" "${MUI_PRODUCT} ${MUI_VERSION}"
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro" "UninstallString" "$INSTDIR\Uninstall.exe"
  SectionEnd

  ;--------------------------------
! ;Descriptions

! !insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN

+   !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_SecMain)
+   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_StartMenu)
+   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} $(DESC_SecDesktop)
+   !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunch} $(DESC_SecQuick)

+ !insertmacro MUI_FUNCTIONS_DESCRIPTION_END

  ;--------------------------------
***************
*** 269,275 ****
  Section "Uninstall"

!   ;Add your stuff here
! 
!   DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro"
  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\AnyEditPro"

--- 180,184 ----
  Section "Uninstall"

! DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\AnyEditPro"
  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\AnyEditPro"

***************
*** 284,321 ****
  RMDir /r $INSTDIR

! 
! !insertmacro MUI_FINISHHEADER un.SetPage

  SectionEnd

- ;--------------------------------
- ;Uninstaller Functions
- 
- 
- Function un.onNextPage
- 
-   !insertmacro MUI_NEXTPAGE un.SetPage
- 
- FunctionEnd
- 
- Function un.SetPage
- 
-   !insertmacro MUI_PAGE_INIT
- 
-     !insertmacro MUI_PAGE_START 1
-       !insertmacro MUI_HEADER_TEXT 1033 "Uninstall ${NAME}" "Remove ${NAME} from your system."
-     !insertmacro MUI_PAGE_STOP 1
- 
-     !insertmacro MUI_PAGE_START 2
-       !insertmacro MUI_HEADER_TEXT 1033 "Uninstalling" "Please wait while ${NAME} is being uninstalled."
-     !insertmacro MUI_PAGE_STOP 2
- 
-     !insertmacro MUI_PAGE_START 3
-       !insertmacro MUI_HEADER_TEXT 1033 "Finished" "${NAME} has been removed from your system."
-     !insertmacro MUI_PAGE_STOP 3
- 
-   !insertmacro MUI_PAGE_END
- 
- FunctionEnd
- 
- ;eof
--- 193,198 ----
  RMDir /r $INSTDIR

!   !insertmacro MUI_UNFINISHHEADER

  SectionEnd

Index: ScintillaDefaults.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaDefaults.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ScintillaDefaults.cpp	17 Jul 2003 11:32:15 -0000	1.11
--- ScintillaDefaults.cpp	22 Jul 2003 04:46:13 -0000	1.12
***************
*** 97,100 ****
--- 97,101 ----
  	AddLanguageToRegistry(6,"XML","xml.syn","xml,xsl,svg,xul,xsd,dtd,xslt");
  	AddLanguageToRegistry(7,"Perl","perl.syn","pl,pm,cgi,pod");
+ 	m_reg.WriteProfileString(_T("Preferences"),_T("Extension"),_T("All Files (*.*)|*.*|CPP Files (*.cpp;*.c;*.h;*.cxx;*.hpp)|*.cpp;*.c;*.h;*.cxx;*.hpp|Java Files(*.java)|*.java|HTML Files(*.html;*.htm;*.css;*.js)|*.html;*.htm;*.css;*.js|"));
  }