Menu
▾
▴
anyedit-cvs — Cvs commit info will come in this list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(30) |
Aug
(6) |
Sep
(3) |
Oct
(1) |
Nov
(13) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(17) |
Mar
(7) |
Apr
(10) |
May
(34) |
Jun
(17) |
Jul
(150) |
Aug
(59) |
Sep
(186) |
Oct
(57) |
Nov
(45) |
Dec
(22) |
| 2005 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(24) |
May
(10) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(35) |
Nov
(12) |
Dec
(1) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
(1) |
Dec
|
|
From: Leon W. <moo...@us...> - 2004-05-18 06:57:22
|
Update of /cvsroot/anyedit/AnyEditv2/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15734/res Modified Files: cur00001.cur cursor1.cur cursor2.cur Added Files: idr_tree.cur Log Message: The long awaited Guy's update - Rewritten Workspace/Projectfile handling - Improved Document/View architecture - Improved Project/New file dialog - CMisc bugs fixed - Independent CChildFrame derived classes for the document types - Cursor hotspot fix - Improved Splash Screen Index: cursor2.cur =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/res/cursor2.cur,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsJjcKvu and /tmp/cvsKaCx3H differ Index: cursor1.cur =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/res/cursor1.cur,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsETU0eH and /tmp/cvs7voEWU differ --- NEW FILE: idr_tree.cur --- (This appears to be a binary file; contents omitted.) Index: cur00001.cur =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/res/cur00001.cur,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs9zQiav and /tmp/cvsXVKyoJ differ |
|
From: boca4711 <boc...@us...> - 2004-05-15 11:46:07
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30427 Modified Files: SyntaxFile.cpp Log Message: Added missing SCLEX_BATCH Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SyntaxFile.cpp 10 May 2004 20:06:14 -0000 1.10 --- SyntaxFile.cpp 15 May 2004 11:45:57 -0000 1.11 *************** *** 237,240 **** --- 237,241 ---- if( name == "SCLEX_ERRORLIST" ) return SCLEX_ERRORLIST; if( name == "SCLEX_MAKEFILE" ) return SCLEX_MAKEFILE; + if( name == "SCLEX_BATCH" ) return SCLEX_BATCH; if( name == "SCLEX_XCODE" ) return SCLEX_XCODE; if( name == "SCLEX_LATEX" ) return SCLEX_LATEX; |
|
From: boca4711 <boc...@us...> - 2004-05-10 20:06:29
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22140 Modified Files: SciLexer.h Scintilla.h SyntaxFile.cpp scintillaif.cpp scintillaif.h Log Message: Updated to version 1.60 of scintilla control Index: scintillaif.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** scintillaif.cpp 19 Apr 2004 19:06:22 -0000 1.15 --- scintillaif.cpp 10 May 2004 20:06:14 -0000 1.16 *************** *** 1747,1750 **** --- 1747,1780 ---- } + void CScintilla::SetWrapVisualFlags(int wrapVisualFlags) + { + SPerform(SCI_SETWRAPVISUALFLAGS, (long)wrapVisualFlags, 0); + } + + int CScintilla::GetWrapVisualFlags() + { + return (int)SPerform(SCI_GETWRAPVISUALFLAGS, 0, 0); + } + + void CScintilla::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation) + { + SPerform(SCI_SETWRAPVISUALFLAGSLOCATION, (long)wrapVisualFlagsLocation, 0); + } + + int CScintilla::GetWrapVisualFlagsLocation() + { + return (int)SPerform(SCI_GETWRAPVISUALFLAGSLOCATION, 0, 0); + } + + void CScintilla::SetWrapStartIndent(int indent) + { + SPerform(SCI_SETWRAPSTARTINDENT, (long)indent, 0); + } + + int CScintilla::GetWrapStartIndent() + { + return (int)SPerform(SCI_GETWRAPSTARTINDENT, 0, 0); + } + void CScintilla::SetLayoutCache(int mode) { Index: scintillaif.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** scintillaif.h 19 Apr 2004 19:06:22 -0000 1.12 --- scintillaif.h 10 May 2004 20:06:18 -0000 1.13 *************** *** 162,166 **** //++FuncDef /** ! * Add text to the document. */ void AddText(int length, const char* text); --- 162,166 ---- //++FuncDef /** ! * Add text to the document at current position. */ void AddText(int length, const char* text); *************** *** 182,186 **** void ClearDocumentStyle(); /** ! * The number of characters in the document. */ int GetLength(); --- 182,186 ---- void ClearDocumentStyle(); /** ! * Returns the number of characters in the document. */ int GetLength(); *************** *** 1144,1147 **** --- 1144,1171 ---- int GetWrapMode(); /** + * Set the display mode of visual flags for wrapped lines. + */ + void SetWrapVisualFlags(int wrapVisualFlags); + /** + * Retrive the display mode of visual flags for wrapped lines. + */ + int GetWrapVisualFlags(); + /** + * Set the location of visual flags for wrapped lines. + */ + void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation); + /** + * Retrive the location of visual flags for wrapped lines. + */ + int GetWrapVisualFlagsLocation(); + /** + * Set the start indent for wrapped lines. + */ + void SetWrapStartIndent(int indent); + /** + * Retrive the start indent for wrapped lines. + */ + int GetWrapStartIndent(); + /** * Sets the degree of caching of layout information. */ Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SyntaxFile.cpp 4 May 2004 09:46:00 -0000 1.9 --- SyntaxFile.cpp 10 May 2004 20:06:14 -0000 1.10 *************** *** 281,284 **** --- 281,291 ---- if( name == "SCLEX_MSSQL" ) return SCLEX_MSSQL; if( name == "SCLEX_VERILOG" ) return SCLEX_VERILOG; + if( name == "SCLEX_KIX" ) return SCLEX_KIX; + if( name == "SCLEX_GUI4CLI" ) return SCLEX_GUI4CLI; + if( name == "SCLEX_SPECMAN" ) return SCLEX_SPECMAN; + if( name == "SCLEX_AU3" ) return SCLEX_AU3; + if( name == "SCLEX_APDL" ) return SCLEX_APDL; + if( name == "SCLEX_BASH" ) return SCLEX_BASH; + for( i = 0; i < name.GetLength(); ++ i ) { Index: Scintilla.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Scintilla.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Scintilla.h 22 Feb 2004 10:19:17 -0000 1.9 --- Scintilla.h 10 May 2004 20:06:14 -0000 1.10 *************** *** 389,392 **** --- 389,404 ---- #define SCI_SETWRAPMODE 2268 #define SCI_GETWRAPMODE 2269 + #define SC_WRAPVISUALFLAG_NONE 0x0000 + #define SC_WRAPVISUALFLAG_END 0x0001 + #define SC_WRAPVISUALFLAG_START 0x0002 + #define SCI_SETWRAPVISUALFLAGS 2460 + #define SCI_GETWRAPVISUALFLAGS 2461 + #define SC_WRAPVISUALFLAGLOC_DEFAULT 0x0000 + #define SC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001 + #define SC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002 + #define SCI_SETWRAPVISUALFLAGSLOCATION 2462 + #define SCI_GETWRAPVISUALFLAGSLOCATION 2463 + #define SCI_SETWRAPSTARTINDENT 2464 + #define SCI_GETWRAPSTARTINDENT 2465 #define SC_CACHE_NONE 0 #define SC_CACHE_CARET 1 Index: SciLexer.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SciLexer.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SciLexer.h 22 Feb 2004 10:19:17 -0000 1.6 --- SciLexer.h 10 May 2004 20:06:14 -0000 1.7 *************** *** 72,75 **** --- 72,81 ---- #define SCLEX_MSSQL 55 #define SCLEX_VERILOG 56 + #define SCLEX_KIX 57 + #define SCLEX_GUI4CLI 58 + #define SCLEX_SPECMAN 59 + #define SCLEX_AU3 60 + #define SCLEX_APDL 61 + #define SCLEX_BASH 62 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 194,197 **** --- 200,204 ---- #define SCE_HP_OPERATOR 101 #define SCE_HP_IDENTIFIER 102 + #define SCE_HPHP_COMPLEX_VARIABLE 104 #define SCE_HPA_START 105 #define SCE_HPA_DEFAULT 106 *************** *** 311,314 **** --- 318,322 ---- #define SCE_ERR_IFORT 17 #define SCE_ERR_ABSF 18 + #define SCE_ERR_TIDY 19 #define SCE_BAT_DEFAULT 0 #define SCE_BAT_COMMENT 1 *************** *** 653,656 **** --- 661,667 ---- #define SCE_MSSQL_GLOBAL_VARIABLE 12 #define SCE_MSSQL_FUNCTION 13 + #define SCE_MSSQL_STORED_PROCEDURE 14 + #define SCE_MSSQL_DEFAULT_PREF_DATATYPE 15 + #define SCE_MSSQL_COLUMN_NAME_2 16 #define SCE_V_DEFAULT 0 #define SCE_V_COMMENT 1 *************** *** 667,670 **** --- 678,753 ---- #define SCE_V_STRINGEOL 12 #define SCE_V_USER 19 + #define SCE_KIX_DEFAULT 0 + #define SCE_KIX_COMMENT 1 + #define SCE_KIX_STRING1 2 + #define SCE_KIX_STRING2 3 + #define SCE_KIX_NUMBER 4 + #define SCE_KIX_VAR 5 + #define SCE_KIX_MACRO 6 + #define SCE_KIX_KEYWORD 7 + #define SCE_KIX_FUNCTIONS 8 + #define SCE_KIX_OPERATOR 9 + #define SCE_KIX_IDENTIFIER 31 + #define SCE_GC_DEFAULT 0 + #define SCE_GC_COMMENTLINE 1 + #define SCE_GC_COMMENTBLOCK 2 + #define SCE_GC_GLOBAL 3 + #define SCE_GC_EVENT 4 + #define SCE_GC_ATTRIBUTE 5 + #define SCE_GC_CONTROL 6 + #define SCE_GC_COMMAND 7 + #define SCE_GC_STRING 8 + #define SCE_GC_OPERATOR 9 + #define SCE_SN_DEFAULT 0 + #define SCE_SN_CODE 1 + #define SCE_SN_COMMENTLINE 2 + #define SCE_SN_COMMENTLINEBANG 3 + #define SCE_SN_NUMBER 4 + #define SCE_SN_WORD 5 + #define SCE_SN_STRING 6 + #define SCE_SN_WORD2 7 + #define SCE_SN_WORD3 8 + #define SCE_SN_PREPROCESSOR 9 + #define SCE_SN_OPERATOR 10 + #define SCE_SN_IDENTIFIER 11 + #define SCE_SN_STRINGEOL 12 + #define SCE_SN_REGEXTAG 13 + #define SCE_SN_SIGNAL 14 + #define SCE_SN_USER 19 + #define SCE_AU3_DEFAULT 0 + #define SCE_AU3_COMMENT 1 + #define SCE_AU3_COMMENTBLOCK 2 + #define SCE_AU3_NUMBER 3 + #define SCE_AU3_FUNCTION 4 + #define SCE_AU3_KEYWORD 5 + #define SCE_AU3_MACRO 6 + #define SCE_AU3_STRING 7 + #define SCE_AU3_OPERATOR 8 + #define SCE_AU3_VARIABLE 9 + #define SCE_AU3_SENT 10 + #define SCE_AU3_PREPROCESSOR 11 + #define SCE_APDL_DEFAULT 0 + #define SCE_APDL_COMMENT 1 + #define SCE_APDL_COMMENTBLOCK 2 + #define SCE_APDL_NUMBER 3 + #define SCE_APDL_STRING 4 + #define SCE_APDL_WORD 5 + #define SCE_APDL_COMMAND 6 + #define SCE_APDL_PROCESSOR 7 + #define SCE_APDL_FUNCTION 8 + #define SCE_SH_DEFAULT 0 + #define SCE_SH_ERROR 1 + #define SCE_SH_COMMENTLINE 2 + #define SCE_SH_NUMBER 3 + #define SCE_SH_WORD 4 + #define SCE_SH_STRING 5 + #define SCE_SH_CHARACTER 6 + #define SCE_SH_OPERATOR 7 + #define SCE_SH_IDENTIFIER 8 + #define SCE_SH_SCALAR 9 + #define SCE_SH_PARAM 10 + #define SCE_SH_BACKTICKS 11 + #define SCE_SH_HERE_DELIM 12 + #define SCE_SH_HERE_Q 13 //--Autogenerated -- end of section automatically generated from Scintilla.iface |
|
From: M.Deepak <td...@us...> - 2004-05-05 15:21:49
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8020 Modified Files: AnyEdit.rc OutputBar.cpp Log Message: - Updated with some new nice images for output bar Index: OutputBar.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/OutputBar.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** OutputBar.cpp 4 May 2004 09:35:25 -0000 1.12 --- OutputBar.cpp 5 May 2004 15:21:40 -0000 1.13 *************** *** 134,138 **** m_wndTabs.AddTab (&m_wndOutputFind1, _T("Find in Files 1"), 2); m_wndTabs.AddTab (&m_wndOutputFind2, _T("Find in Files 2"), 3); ! m_wndTabs.AddTab (&m_wndEdit, _T("Edit"), 3); return 0; --- 134,138 ---- m_wndTabs.AddTab (&m_wndOutputFind1, _T("Find in Files 1"), 2); m_wndTabs.AddTab (&m_wndOutputFind2, _T("Find in Files 2"), 3); ! m_wndTabs.AddTab (&m_wndEdit, _T("Edit"), 4); return 0; Index: AnyEdit.rc =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** AnyEdit.rc 12 Apr 2004 15:11:40 -0000 1.35 --- AnyEdit.rc 5 May 2004 15:21:40 -0000 1.36 *************** *** 27,81 **** // ! IDR_ERRPARSESPECIALS MENU DISCARDABLE BEGIN ! POPUP "<ERRORPARSERSTRINGS>" ! BEGIN ! MENUITEM "Beginning of line\t^", ID_ERRORPARSERSTRINGS_BEGINNINGOFLINE ! MENUITEM "End of line\t$", ID_ERRORPARSERSTRINGS_ENDOFLINE [...5062 lines suppressed...] *** 2691,2699 **** #endif //_WIN32 #include "res\AnyEdit.rc2" // non-Microsoft Visual C++ edited resources ! #include "afxres.rc" // Standard components ! #include "afxprint.rc" // printing/print preview resources #endif ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED --- 2691,2699 ---- #endif //_WIN32 #include "res\AnyEdit.rc2" // non-Microsoft Visual C++ edited resources ! #include "afxres.rc" // Standard components ! #include "afxprint.rc" // printing/print preview resources #endif ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED |
|
From: M.Deepak <td...@us...> - 2004-05-05 15:21:49
|
Update of /cvsroot/anyedit/AnyEditv2/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8020/res Modified Files: bmp00022.bmp Log Message: - Updated with some new nice images for output bar Index: bmp00022.bmp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/res/bmp00022.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs0jqurR and /tmp/cvsdhJeH1 differ |
Update of /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16294/Config/Default/Syntax Modified Files: cpp.syn css.syn default.syn html.syn java.syn javascript.syn masm.syn pascal.syn perl.syn python.syn xml.syn Log Message: SyntaxFile Update - Change layout and internal working to speed up information retrieval. - Added a new executable to be compatible with the new syntax files. - The new executable also has the latest features :) Index: default.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/default.syn,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** default.syn 30 Apr 2004 15:59:24 -0000 1.4 --- default.syn 4 May 2004 10:23:45 -0000 1.5 *************** *** 35,122 **** <Fold>0</Fold> </Margins> ! <StyleBits>5</StyleBits> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> </Syntax> --- 35,125 ---- <Fold>0</Fold> </Margins> ! <StyleInformation> ! <StyleBits>5</StyleBits> ! <StyleMax>37</StyleMax> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! </StyleInformation> </Syntax> Index: cpp.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/cpp.syn,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cpp.syn 30 Apr 2004 15:59:24 -0000 1.4 --- cpp.syn 4 May 2004 10:23:45 -0000 1.5 *************** *** 43,397 **** <Fold>1</Fold> </Margins> ! <StyleBits>5</StyleBits> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Single Line Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Comment Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>UUIDs</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Preprocessor Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>Verbatim</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>E0FFE0</Background> ! </Color> ! </Style> ! <Style number="14"> ! <Name>Regular Expression</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F7F3F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="15"> ! <Name>Comment Line Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="16"> ! <Name>Keywords 2</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>B00040</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="17"> ! <Name>Comment Doc Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3060A0</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="18"> ! <Name>Comment Doc Keywords Error</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804020</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="19"> ! <Name>Global Class</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> <Keywords set="0"> <Word>asm</Word> --- 43,400 ---- <Fold>1</Fold> </Margins> ! <StyleInformation> ! <StyleBits>5</StyleBits> ! <StyleMax>37</StyleMax> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Single Line Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Comment Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>UUIDs</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Preprocessor Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>Verbatim</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>E0FFE0</Background> ! </Color> ! </Style> ! <Style number="14"> ! <Name>Regular Expression</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F7F3F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="15"> ! <Name>Comment Line Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="16"> ! <Name>Keywords 2</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>B00040</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="17"> ! <Name>Comment Doc Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3060A0</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="18"> ! <Name>Comment Doc Keywords Error</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804020</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="19"> ! <Name>Global Class</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! </StyleInformation> <Keywords set="0"> <Word>asm</Word> Index: pascal.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/pascal.syn,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pascal.syn 30 Apr 2004 15:59:24 -0000 1.2 --- pascal.syn 4 May 2004 10:23:45 -0000 1.3 *************** *** 42,396 **** <Fold>1</Fold> </Margins> ! <StyleBits>5</StyleBits> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Single Line Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Comment Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>UUIDs</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Preprocessor Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>Verbatim</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>E0FFE0</Background> ! </Color> ! </Style> ! <Style number="14"> ! <Name>Inline ASM</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F7F3F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="15"> ! <Name>Comment Line Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="16"> ! <Name>Keywords 2</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>B00040</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="17"> ! <Name>Comment Doc Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3060A0</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="18"> ! <Name>Comment Doc Keywords Error</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804020</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="19"> ! <Name>Global Class</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> <Keywords set="0"> <Word>alias</Word> --- 42,399 ---- <Fold>1</Fold> </Margins> ! <StyleInformation> ! <StyleBits>5</StyleBits> ! <StyleMax>37</StyleMax> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Single Line Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Comment Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>UUIDs</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Preprocessor Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>Verbatim</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>E0FFE0</Background> ! </Color> ! </Style> ! <Style number="14"> ! <Name>Inline ASM</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F7F3F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="15"> ! <Name>Comment Line Doc</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3F703F</Foreground> ! <Background>E0F0FF</Background> ! </Color> ! </Style> ! <Style number="16"> ! <Name>Keywords 2</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>B00040</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="17"> ! <Name>Comment Doc Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>3060A0</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="18"> ! <Name>Comment Doc Keywords Error</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>804020</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="19"> ! <Name>Global Class</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! </StyleInformation> <Keywords set="0"> <Word>alias</Word> Index: python.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/python.syn,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** python.syn 30 Apr 2004 15:59:24 -0000 1.4 --- python.syn 4 May 2004 10:23:45 -0000 1.5 *************** *** 42,312 **** <Fold>1</Fold> </Margins> ! <StyleBits>5</StyleBits> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Triple</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Triple Double</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>Classname</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Defined Name</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> <Keywords set="0"> <Word>and</Word> --- 42,315 ---- <Fold>1</Fold> </Margins> ! <StyleInformation> ! <StyleBits>5</StyleBits> ! <StyleMax>37</StyleMax> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="34"> ! <Name>Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>0000FF</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="35"> ! <Name>Bad Brace Matching</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F7F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Characters</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Keywords</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>Triple</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>Triple Double</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>Classname</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Defined Name</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F7F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Normal Text</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! </StyleInformation> <Keywords set="0"> <Word>and</Word> Index: masm.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/masm.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** masm.syn 26 Feb 2004 08:51:02 -0000 1.3 --- masm.syn 4 May 2004 10:23:45 -0000 1.4 *************** *** 38,294 **** <Fold>1</Fold> </Margins> ! <StyleBits>5</StyleBits> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>8</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>808080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>ADADAD</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Number</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Identifiers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>CPU Instruction</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>FPU Instruction</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>Register</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>46AA03</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Directive</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Directive Operand</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="11"> ! <Name>Comment Block</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>007F00</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="12"> ! <Name>Character</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>009300</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="13"> ! <Name>String EOL</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>E0C0E0</Background> ! </Color> ! </Style> ! <Style number="14"> ! <Name>Ext Instruction</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> <Keywords set="0"> <Word>aaa</Word> --- 38,297 ---- <Fold>1</Fold> </Margins> ! <StyleInformation> ! <StyleBits>5</StyleBits> ! <StyleMax>37</StyleMax> ! <Style number="0"> ! <Name>Whitespace</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="32"> ! <Name>Default</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>8</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>808080</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="33"> ! <Name>Line Numbers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7371BD</Foreground> ! <Background>EFEFEF</Background> ! </Color> ! </Style> ! <Style number="37"> ! <Name>Indentation Guides</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>DCDCDC</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="1"> ! <Name>Comment</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>ADADAD</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="2"> ! <Name>Number</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>FF0000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="3"> ! <Name>Strings</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>7F007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="4"> ! <Name>Operators</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>4B0082</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="5"> ! <Name>Identifiers</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>000000</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="6"> ! <Name>CPU Instruction</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="7"> ! <Name>FPU Instruction</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="8"> ! <Name>Register</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>1</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>46AA03</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="9"> ! <Name>Directive</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <Color> ! <Foreground>00007F</Foreground> ! <Background>FFFFFF</Background> ! </Color> ! </Style> ! <Style number="10"> ! <Name>Directive Operand</Name> ! <Font> ! <Name>Verdana</Name> ! <Size>10</Size> ! <Bold>0</Bold> ! <Italic>0</Italic> ! <Underline>0</Underline> ! </Font> ! <C... [truncated message content] |
|
From: Leon W. <moo...@us...> - 2004-05-04 10:23:57
|
Update of /cvsroot/anyedit/AnyEditBin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16294 Modified Files: AnyEdit.exe Log Message: SyntaxFile Update - Change layout and internal working to speed up information retrieval. - Added a new executable to be compatible with the new syntax files. - The new executable also has the latest features :) Index: AnyEdit.exe =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/AnyEdit.exe,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsJYR3lu and /tmp/cvs5CI9pY differ |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:57:45
|
Update of /cvsroot/anyedit/AnyEditBin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12520 Modified Files: SciLexer.dll Log Message: Scintilla update - Version 1.60 of scilexer.dll Index: SciLexer.dll =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/SciLexer.dll,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsXqbWqZ and /tmp/cvsSikWvd differ |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:47:18
|
Update of /cvsroot/anyedit/AnyEditBin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10799 Modified Files: gnu_regex.dll Log Message: Regex Update - All gnu_regex functions are now exported not only POSIX functions. Index: gnu_regex.dll =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/gnu_regex.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvshMmsWW and /tmp/cvs1TPHet differ |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:46:08
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10616 Modified Files: SyntaxFile.cpp SyntaxFile.h Log Message: SyntaxFile Update - Change layout and internal working to speed up information retrieval. Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SyntaxFile.cpp 22 Apr 2004 20:29:12 -0000 1.8 --- SyntaxFile.cpp 4 May 2004 09:46:00 -0000 1.9 *************** *** 31,35 **** szFileName = ""; m_bParsed = false; ! // Set the string compare functions for the CSortedArray's with keywords. for( iCount = 0; iCount < KEYWORDSET_MAX; ++ iCount ) --- 31,36 ---- szFileName = ""; m_bParsed = false; ! iMaxStyle = STYLE_MAX; ! // Set the string compare functions for the CSortedArray's with keywords. for( iCount = 0; iCount < KEYWORDSET_MAX; ++ iCount ) *************** *** 61,68 **** xnode = xparser.document().first_element_by_name( section ); ! if( xnode.empty() && !xnode.children() ) return false; xnode = xnode.first_element_by_name( element ); ! if( xnode.empty() && !xnode.children() ) return false; return atoi( xnode.child(0).value() ); --- 62,69 ---- xnode = xparser.document().first_element_by_name( section ); ! if( xnode.empty() || !xnode.children() ) return false; xnode = xnode.first_element_by_name( element ); ! if( xnode.empty() || !xnode.children() ) return false; return atoi( xnode.child(0).value() ); *************** *** 76,83 **** xnode = xparser.document().first_element_by_name( section ); ! if( xnode.empty() && !xnode.children() ) return false; xnode = xnode.first_element_by_name( element ); ! if( xnode.empty() && !xnode.children() ) return false; sprintf( szValue, "%i", iValue ); --- 77,84 ---- xnode = xparser.document().first_element_by_name( section ); ! if( xnode.empty() || !xnode.children() ) return false; xnode = xnode.first_element_by_name( element ); ! if( xnode.empty() || !xnode.children() ) return false; sprintf( szValue, "%i", iValue ); *************** *** 90,96 **** { int iCount; ! int iWordCount; char number[4]; ! xml_node tnode; if( szFileName.IsEmpty() ) return false; --- 91,97 ---- { int iCount; ! unsigned int iWordCount; char number[4]; ! xml_node xnode; if( szFileName.IsEmpty() ) return false; *************** *** 100,114 **** if( !xparser.parse_file( szFileName ) ) return false; // Read the keyword sets for( iCount = 0; iCount < KEYWORDSET_MAX; ++ iCount ) { sprintf( number, "%i", iCount ); ! tnode = xparser.document().first_element_by_attribute( TAG_KEYWORDS, ATT_KEYWORDS_SET, number );//(LPCTSTR)CString().Format( "%i", iCount ) ); ! if( tnode.empty() ) continue; ! for( iWordCount = 0; iWordCount < tnode.children(); ++ iWordCount ) { ! if( CString( tnode.child( iWordCount ).name() ) == TAG_KEYWORDS_WORD && tnode.child( iWordCount ).children() ) { ! Keywords[iCount].Add( CString( tnode.child( iWordCount ).child(0).value() ) ); } } --- 101,126 ---- if( !xparser.parse_file( szFileName ) ) return false; + // Read the max style + xnode = xparser.document().first_element_by_name( TAG_STYLE_INFORMATION ); + if( !xnode.empty() ) + { + xnode = xnode.first_element_by_name( TAG_STYLE_MAX ); + if( !xnode.empty() && xnode.children() ) + { + iMaxStyle = atoi( xnode.child(0).value() ); + } + } + // Read the keyword sets for( iCount = 0; iCount < KEYWORDSET_MAX; ++ iCount ) { sprintf( number, "%i", iCount ); ! xnode = xparser.document().first_element_by_attribute( TAG_KEYWORDS, ATT_KEYWORDS_SET, number );//(LPCTSTR)CString().Format( "%i", iCount ) ); ! if( xnode.empty() ) continue; ! for( iWordCount = 0; iWordCount < xnode.children(); ++ iWordCount ) { ! if( CString( xnode.child( iWordCount ).name() ) == TAG_KEYWORDS_WORD && xnode.child( iWordCount ).children() ) { ! Keywords[iCount].Add( CString( xnode.child( iWordCount ).child(0).value() ) ); } } *************** *** 279,283 **** int CSyntaxFile::GetLexerProperties( CMapStringToString& msts ) { ! int iCount; int iNrOfProperties; CString node_name; --- 291,295 ---- int CSyntaxFile::GetLexerProperties( CMapStringToString& msts ) { ! unsigned int iCount; int iNrOfProperties; CString node_name; *************** *** 591,596 **** xml_node xnode; ! xnode = xparser.document().first_element_by_name( TAG_STYLEBITS ); ! if( xnode.empty() && !xnode.children() ) return -1; return atoi( xnode.child(0).value() ); --- 603,611 ---- xml_node xnode; ! xnode = xparser.document().first_element_by_name( TAG_STYLE_INFORMATION ); ! if( xnode.empty() || !xnode.children() ) return -1; ! ! xnode = xnode.first_element_by_name( TAG_STYLE_BITS ); ! if( xnode.empty() || !xnode.children() ) return -1; return atoi( xnode.child(0).value() ); *************** *** 608,612 **** xnode = xnode.first_element_by_name( TAG_STYLE_NAME ); ! if( xnode.empty() && !xnode.children() ) return ""; return xnode.child(0).value(); --- 623,627 ---- xnode = xnode.first_element_by_name( TAG_STYLE_NAME ); ! if( xnode.empty() || !xnode.children() ) return ""; return xnode.child(0).value(); *************** *** 618,627 **** xml_node xnode; sprintf( number, "%i", iStyle ); ! xnode = xparser.document().first_element_by_attribute( TAG_STYLE, ATT_STYLE_NUMBER, number ); if( !xnode.empty() ) { xnode = xnode.first_element_by_name( TAG_STYLE_FONT ); } return xnode; } --- 633,648 ---- xml_node xnode; + if( iStyle > iMaxStyle ) return NULL; + + xnode = xparser.document().first_element_by_name( TAG_STYLE_INFORMATION ); + if( xnode.empty() || !xnode.children() ) return NULL; + sprintf( number, "%i", iStyle ); ! xnode = xnode.first_element_by_attribute( TAG_STYLE, ATT_STYLE_NUMBER, number ); if( !xnode.empty() ) { xnode = xnode.first_element_by_name( TAG_STYLE_FONT ); } + return xnode; } *************** *** 869,880 **** char numBer[4]; xml_node xnode; sprintf( numBer, "%i", iStyle ); ! xnode = xparser.document().first_element_by_attribute( "Style", ATT_STYLE_NUMBER, numBer ); if( !xnode.empty() ) { ! xnode = xnode.first_element_by_name( TAG_STYLE_COLOR ); } ! return xnode; } --- 890,908 ---- char numBer[4]; xml_node xnode; + xml_node tnode; + + if( iStyle > iMaxStyle ) return NULL; + + xnode = xparser.document().first_element_by_name( TAG_STYLE_INFORMATION ); + if( xnode.empty() && !xnode.children() ) return NULL; sprintf( numBer, "%i", iStyle ); ! xnode = xnode.first_element_by_attribute( "Style", ATT_STYLE_NUMBER, numBer ); if( !xnode.empty() ) { ! return xnode.first_element_by_name( TAG_STYLE_COLOR ); } ! ! return tnode; } Index: SyntaxFile.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SyntaxFile.h 22 Apr 2004 20:29:12 -0000 1.8 --- SyntaxFile.h 4 May 2004 09:46:00 -0000 1.9 *************** *** 30,35 **** #define TAG_INDENT "Indent" #define TAG_MARGINS "Margins" - #define TAG_STYLE "Style" - #define TAG_STYLEBITS "StyleBits" // Lexer sub tags --- 30,33 ---- *************** *** 81,84 **** --- 79,88 ---- #define TAG_MARGINS_FOLD "Fold" + // StyleInformation + #define TAG_STYLE_INFORMATION "StyleInformation" + #define TAG_STYLE_MAX "StyleMax" + #define TAG_STYLE_BITS "StyleBits" + #define TAG_STYLE "Style" + // Style sub tags #define TAG_STYLE_NAME "Name" *************** *** 111,114 **** --- 115,122 ---- /// Keep track if we parsed the syntax file bool m_bParsed; + + /// Keep track of the max defined style. + int iMaxStyle; + xml_parser xparser; /// Sorted array with all the keywords of a language |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:38:04
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9033 Modified Files: AnyEdit.dsp Log Message: Regex Update - New project define for compiling regex header. Index: AnyEdit.dsp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** AnyEdit.dsp 19 Apr 2004 19:06:20 -0000 1.32 --- AnyEdit.dsp 4 May 2004 09:37:55 -0000 1.33 *************** *** 1,23 **** # Microsoft Developer Studio Project File - Name="AnyEdit" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** NICHT BEARBEITEN ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=AnyEdit - Win32 Debug ! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE ! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak". !MESSAGE ! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben ! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak" CFG="AnyEdit - Win32 Debug" !MESSAGE ! !MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE ! !MESSAGE "AnyEdit - Win32 Release" (basierend auf "Win32 (x86) Application") ! !MESSAGE "AnyEdit - Win32 Debug" (basierend auf "Win32 (x86) Application") !MESSAGE --- 1,23 ---- # Microsoft Developer Studio Project File - Name="AnyEdit" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=AnyEdit - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak". !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak" CFG="AnyEdit - Win32 Debug" !MESSAGE ! !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "AnyEdit - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE "AnyEdit - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W3 /GX /Ox /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W3 /GX /Ox /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "__STDC4GNUREGEX__" /Yu"stdafx.h" /FD /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 72,76 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 72,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "__STDC4GNUREGEX__" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:36:07
|
Update of /cvsroot/anyedit/AnyEditv2/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8317/includes Modified Files: regex.h Log Message: Regex Update - All gnu_regex functions are now exported not only POSIX functions. - Moved include to StdAfx.h Index: regex.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/includes/regex.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** regex.h 11 Feb 2003 18:07:00 -0000 1.3 --- regex.h 4 May 2004 09:35:26 -0000 1.4 *************** *** 471,478 **** /* POSIX compatibility. */ ! extern "C" int regcomp (regex_t *preg, const char *pattern, int cflags); ! extern "C" int regexec (const regex_t *preg, const char *string, size_t nmatch,regmatch_t pmatch[], int eflags); ! extern "C" size_t regerror (int errcode, const regex_t *preg, char *errbuf,size_t errbuf_size); ! extern "C" void regfree (regex_t *preg); #endif /* not __REGEXP_LIBRARY_H__ */ --- 471,482 ---- /* POSIX compatibility. */ ! extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); ! extern int regexec ! _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, ! regmatch_t pmatch[], int eflags)); ! extern size_t regerror ! _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, ! size_t errbuf_size)); ! extern void regfree _RE_ARGS ((regex_t *preg)); #endif /* not __REGEXP_LIBRARY_H__ */ |
|
From: Leon W. <moo...@us...> - 2004-05-04 09:36:07
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8317 Modified Files: OutputBar.cpp StdAfx.h gnu_regex.lib Log Message: Regex Update - All gnu_regex functions are now exported not only POSIX functions. - Moved include to StdAfx.h Index: StdAfx.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/StdAfx.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StdAfx.h 22 Apr 2004 20:29:12 -0000 1.8 --- StdAfx.h 4 May 2004 09:35:25 -0000 1.9 *************** *** 39,42 **** --- 39,47 ---- #include "SciLexer.h" + // Regex include + extern "C" { + #include "./includes/regex.h" + } + // Disable STL warnings on Level 4, needs to be fixed. TODO #include <yvals.h> Index: gnu_regex.lib =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/gnu_regex.lib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsuWkp3g and /tmp/cvs6ONob9 differ Index: OutputBar.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/OutputBar.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** OutputBar.cpp 31 Jul 2003 12:25:32 -0000 1.11 --- OutputBar.cpp 4 May 2004 09:35:25 -0000 1.12 *************** *** 1,23 **** /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... --- 1,23 ---- /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... *************** *** 32,36 **** #include "OutputBar.h" #include "Misc.h" - #include ".\includes\regex.h" #include <memory> --- 32,35 ---- *************** *** 374,378 **** ( this->m_DataSeq[0] == regEntry->m_DataSeq[0]) && ( this->m_DataSeq[1] == regEntry->m_DataSeq[1]) && ! ( this->m_DataSeq[2] == regEntry->m_DataSeq[2]) ); */ --- 373,377 ---- ( this->m_DataSeq[0] == regEntry->m_DataSeq[0]) && ( this->m_DataSeq[1] == regEntry->m_DataSeq[1]) && ! ( this->m_DataSeq[2] == regEntry->m_DataSeq[2]) ); */ |
Update of /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11273/Config/Default/Syntax Modified Files: cpp.syn css.syn default.syn html.syn java.syn javascript.syn pascal.syn perl.syn python.syn xml.syn Log Message: Syntax File fixes - Added missing folding properties to language syntax file - Added style 0 to default syntax file, to avoid black texts. Index: java.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/java.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** java.syn 26 Feb 2004 08:51:02 -0000 1.3 --- java.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 2,7 **** --- 2,10 ---- <Lexer> <Name>SCLEX_CPP</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> <Property name="fold.preprocessor">1</Property> + <Property name="fold.compact">1</Property> + <Property name="fold.at.else">1</Property> </Lexer> <View> Index: python.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/python.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** python.syn 26 Feb 2004 08:51:02 -0000 1.3 --- python.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 2,7 **** --- 2,9 ---- <Lexer> <Name>SCLEX_PYTHON</Name> + <Property name="fold">1</Property> <Property name="fold.comment.python">1</Property> <Property name="fold.quotes.python">1</Property> + <Property name="tab.timmy.whinge.level">1</Property> </Lexer> <View> Index: html.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/html.syn,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.syn 15 Mar 2004 09:00:48 -0000 1.1 --- html.syn 30 Apr 2004 15:59:24 -0000 1.2 *************** *** 2,7 **** <Lexer> <Name>SCLEX_HTML</Name> - <Property name="fold.html">1</Property> <Property name="fold">1</Property> <Property name="fold.html.preprocessor">1</Property> <Property name="fold.compact">1</Property> --- 2,7 ---- <Lexer> <Name>SCLEX_HTML</Name> <Property name="fold">1</Property> + <Property name="fold.html">1</Property> <Property name="fold.html.preprocessor">1</Property> <Property name="fold.compact">1</Property> Index: pascal.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/pascal.syn,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pascal.syn 15 Mar 2004 09:00:48 -0000 1.1 --- pascal.syn 30 Apr 2004 15:59:24 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <Lexer> <Name>SCLEX_PASCAL</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> <Property name="fold.preprocessor">1</Property> Index: cpp.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/cpp.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cpp.syn 26 Feb 2004 08:51:02 -0000 1.3 --- cpp.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 2,7 **** --- 2,10 ---- <Lexer> <Name>SCLEX_CPP</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> <Property name="fold.preprocessor">1</Property> + <Property name="fold.compact">1</Property> + <Property name="fold.at.else">1</Property> </Lexer> <View> Index: xml.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/xml.syn,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xml.syn 15 Mar 2004 09:00:48 -0000 1.1 --- xml.syn 30 Apr 2004 15:59:24 -0000 1.2 *************** *** 3,6 **** --- 3,8 ---- <Name>SCLEX_XML</Name> <Property name="fold">1</Property> + <Property name="fold.html">1</Property> + <Property name="fold.html.preprocessor">1</Property> <Property name="fold.compact">1</Property> </Lexer> Index: css.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/css.syn,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** css.syn 15 Mar 2004 09:00:48 -0000 1.1 --- css.syn 30 Apr 2004 15:59:24 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <Lexer> <Name>SCLEX_CSS</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> <Property name="fold.compact">1</Property> Index: perl.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/perl.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** perl.syn 26 Feb 2004 08:51:02 -0000 1.3 --- perl.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 2,7 **** <Lexer> <Name>SCLEX_PERL</Name> <Property name="fold.comment">1</Property> ! <Property name="fold.compact">0</Property> </Lexer> <View> --- 2,8 ---- <Lexer> <Name>SCLEX_PERL</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> ! <Property name="fold.compact">1</Property> </Lexer> <View> Index: default.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/default.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** default.syn 26 Feb 2004 08:51:02 -0000 1.3 --- default.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 36,39 **** --- 36,53 ---- </Margins> <StyleBits>5</StyleBits> + <Style number="0"> + <Name>Whitespace</Name> + <Font> + <Name>Verdana</Name> + <Size>10</Size> + <Bold>0</Bold> + <Italic>0</Italic> + <Underline>0</Underline> + </Font> + <Color> + <Foreground>000000</Foreground> + <Background>FFFFFF</Background> + </Color> + </Style> <Style number="32"> <Name>Default</Name> Index: javascript.syn =================================================================== RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/javascript.syn,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** javascript.syn 26 Feb 2004 08:51:02 -0000 1.3 --- javascript.syn 30 Apr 2004 15:59:24 -0000 1.4 *************** *** 2,7 **** --- 2,10 ---- <Lexer> <Name>SCLEX_CPP</Name> + <Property name="fold">1</Property> <Property name="fold.comment">1</Property> <Property name="fold.preprocessor">1</Property> + <Property name="fold.compact">1</Property> + <Property name="fold.at.else">1</Property> </Lexer> <View> |
|
From: M.Deepak <td...@us...> - 2004-04-27 03:43:53
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24235 Modified Files: AnyEdit.cpp HtmlFile.h Log Message: - Added workspace file listing support to startup page Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** AnyEdit.cpp 20 Apr 2004 10:46:59 -0000 1.46 --- AnyEdit.cpp 27 Apr 2004 03:43:43 -0000 1.47 *************** *** 1071,1088 **** { ! CRecentFileList m_temprecent(ID_FILE_RECENTWORKSPACES_WS1,_T("Recent File List"),_T("file%d"),8,255); ! m_temprecent.ReadList(); CHtmlFile htm; htm.AddStart(); ! int i = m_temprecent.GetSize(); for(int j=0;j<i;j++) { ! if(!m_temprecent[j].IsEmpty()) ! htm.AddFileLink(m_temprecent[j]); } htm.AddMiddle(); htm.PrintToFile(); --- 1071,1102 ---- { ! CRecentFileList m_filelist(ID_FILE_RECENTWORKSPACES_WS1,_T("Recent File List"),_T("file%d"),8,255); ! m_filelist.ReadList(); CHtmlFile htm; htm.AddStart(); ! int i = m_filelist.GetSize(); for(int j=0;j<i;j++) { ! if(!m_filelist[j].IsEmpty()) ! htm.AddFileLink(m_filelist[j]); } htm.AddMiddle(); + + htm.Reset(); + CRecentFileList m_wslist(ID_FILE_RECENTWORKSPACES_WS1,_T("Recent WS List"),_T("file%d"),8,255); + m_wslist.ReadList(); + + i = m_wslist.GetSize(); + + for(j=0;j<i;j++) + { + if(!m_wslist[j].IsEmpty()) + htm.AddFileLink(m_wslist[j]); + } + + htm.PrintToFile(); Index: HtmlFile.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/HtmlFile.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HtmlFile.h 8 May 2003 12:00:56 -0000 1.2 --- HtmlFile.h 27 Apr 2004 03:43:43 -0000 1.3 *************** *** 49,52 **** --- 49,57 ---- } + void Reset() + { + fcnt=1; + } + void AddStart() { |
|
From: boca4711 <boc...@us...> - 2004-04-26 17:44:41
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2050 Modified Files: AnyEditView.cpp AnyEditView.h ChangeLog.txt FileTypeManager.h ScintillaEx.cpp ScintillaEx.h Log Message: Minor enhancements - ScintillaEx.h: replaced german texts - CScintillaEx: added doxygen class comment - CScintilla:FileOpen implemented; Opens a file and detect EOL mode (function from old CScintilla and bug fix) - Remove flickering on AnyEditView; OnEraseBkgnd (return TRUE) - Call LineDuplicate from view - CFileTypeManager added doxygen class comment Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** AnyEditView.cpp 22 Apr 2004 20:29:11 -0000 1.52 --- AnyEditView.cpp 26 Apr 2004 17:44:29 -0000 1.53 *************** *** 108,112 **** ON_UPDATE_COMMAND_UI(ID_TOOLS_PLAYRECORDING, OnUpdateToolsPlayrecording) ON_UPDATE_COMMAND_UI(ID_TOOLS_REPEATCOMMAND, OnUpdateToolsRepeatcommand) ! //}}AFX_MSG_MAP ON_WM_CONTEXTMENU() // Standard printing commands --- 108,113 ---- ON_UPDATE_COMMAND_UI(ID_TOOLS_PLAYRECORDING, OnUpdateToolsPlayrecording) ON_UPDATE_COMMAND_UI(ID_TOOLS_REPEATCOMMAND, OnUpdateToolsRepeatcommand) ! ON_COMMAND(ID_EDIT_ADVANCED_DUPLICATELINE, OnEditAdvancedDuplicateline) ! //}}AFX_MSG_MAP ON_WM_CONTEXTMENU() // Standard printing commands *************** *** 334,338 **** BOOL CAnyEditView::OnEraseBkgnd(CDC* pDC) { ! return CView::OnEraseBkgnd(pDC); } --- 335,340 ---- BOOL CAnyEditView::OnEraseBkgnd(CDC* pDC) { ! // return CView::OnEraseBkgnd(pDC); ! return TRUE; } *************** *** 2103,2104 **** --- 2105,2112 ---- return &m_Scintilla; } + + /// Duplicates current line without any selection. + void CAnyEditView::OnEditAdvancedDuplicateline() + { + m_Scintilla.LineDuplicate(); + } Index: FileTypeManager.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileTypeManager.h 19 Apr 2004 19:06:22 -0000 1.1 --- FileTypeManager.h 26 Apr 2004 17:44:32 -0000 1.2 *************** *** 21,24 **** --- 21,31 ---- class CSyntaxFile; + /** \class CFileTypeManager + * \brief A class which manages the file types. + * + * This class mananges the syntax definition files, associates file extensions to + * file type and sets configurations to views. + **/ + class CFileTypeManager { Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** ChangeLog.txt 19 Apr 2004 19:06:21 -0000 1.44 --- ChangeLog.txt 26 Apr 2004 17:44:32 -0000 1.45 *************** *** 30,34 **** 23) ShortFilenames are converted with CMisc.ShortToLongPath. This is used in OpenDocumentFile [#875940] ! Beta 2.0 [Tester's Release 2] --- 30,35 ---- 23) ShortFilenames are converted with CMisc.ShortToLongPath. This is used in OpenDocumentFile [#875940] ! 24) Remove flickering on AnyEditView ! 25) Call LineDuplicate from menu in view Beta 2.0 [Tester's Release 2] Index: ScintillaEx.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintillaEx.cpp 22 Apr 2004 20:29:12 -0000 1.2 --- ScintillaEx.cpp 26 Apr 2004 17:44:32 -0000 1.3 *************** *** 1,3 **** ! // SCintillaEx.cpp: Implementierung der Klasse CSCintillaEx. // ////////////////////////////////////////////////////////////////////// --- 1,3 ---- ! // SCintillaEx.cpp: implementation of the CSCintillaEx class. // ////////////////////////////////////////////////////////////////////// *************** *** 14,18 **** ////////////////////////////////////////////////////////////////////// ! // Konstruktion/Destruktion ////////////////////////////////////////////////////////////////////// --- 14,18 ---- ////////////////////////////////////////////////////////////////////// ! // Construction/Destruction ////////////////////////////////////////////////////////////////////// *************** *** 111,112 **** --- 111,159 ---- return sSelText; } + + /// Load a file from "filename" and detect EOL mode. + bool CScintillaEx::OpenFile(LPCTSTR filename) + { + int iLinesCR; + int iLinesLF; + int iLinesCRLF; + int iLineCount; + int iCurrentLine; + int iLineEndPos; + + if (! CScintilla::OpenFile(filename)) + return false; + + // Try to figure out the EOL mode of the document. + // @TODO: Should be an own function (DetectEOLMode) + iLinesCR = 0; + iLinesLF = 0; + iLinesCRLF = 0; + iLineEndPos = 0; + iCurrentLine = 0; + iLineCount = GetLineCount(); + while( iLinesCR < 10 && iLinesLF < 10 && iLinesCRLF < 10 && iCurrentLine < iLineCount ) + { + iLineEndPos = GetLineEndPosition( iCurrentLine ); + if( iLineEndPos <= 0 ) break; // reached the end so stop + if( iLineEndPos + 1 > GetLength() ) break; // reached end. + if( GetCharAt( iLineEndPos ) == '\r' ) + { + if( GetCharAt( iLineEndPos + 1 ) == '\n' ) + { + ++ iLinesCRLF; + } + else + { + ++ iLinesCR; + } + } + if( GetCharAt( iLineEndPos ) == '\n' ) ++ iLinesLF; + ++ iCurrentLine; + } + // Set the calculated EOL mode + if( iLinesCR > iLinesLF && iLinesCR > iLinesCRLF ) SetEOLMode( SC_EOL_CR ); + else if( iLinesLF > iLinesCR && iLinesLF > iLinesCRLF ) SetEOLMode( SC_EOL_LF ); + else SetEOLMode( SC_EOL_CRLF ); + return true; + } Index: ScintillaEx.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintillaEx.h 22 Apr 2004 20:29:12 -0000 1.2 --- ScintillaEx.h 26 Apr 2004 17:44:32 -0000 1.3 *************** *** 1,3 **** ! // SCintillaEx.h: Schnittstelle für die Klasse CSCintillaEx. // ////////////////////////////////////////////////////////////////////// --- 1,3 ---- ! // SCintillaEx.h: interface for the CSCintillaEx class. // ////////////////////////////////////////////////////////////////////// *************** *** 11,15 **** #include "scintillaif.h" ! #include "Scintilla.h" // Hinzugefügt von der Klassenansicht struct MacroHolder --- 11,15 ---- #include "scintillaif.h" ! #include "Scintilla.h" struct MacroHolder *************** *** 64,70 **** --- 64,78 ---- }; + /** \class CScintillaEx + * \brief A class which is an extension to CScintilla class. + * + * This class holds extensions to the standard scintilla control. + * All text based extensions should be added here. + **/ + class CScintillaEx : public CScintilla { public: + virtual bool OpenFile(LPCTSTR filename); CString GetSelText(void); void PerformMacro(MacroHolder* macro); Index: AnyEditView.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** AnyEditView.h 19 Apr 2004 19:06:21 -0000 1.29 --- AnyEditView.h 26 Apr 2004 17:44:32 -0000 1.30 *************** *** 175,179 **** afx_msg void OnUpdateToolsPlayrecording(CCmdUI* pCmdUI); afx_msg void OnUpdateToolsRepeatcommand(CCmdUI* pCmdUI); ! //}}AFX_MSG afx_msg void OnEditFind(); afx_msg void OnComboFunction(); --- 175,180 ---- afx_msg void OnUpdateToolsPlayrecording(CCmdUI* pCmdUI); afx_msg void OnUpdateToolsRepeatcommand(CCmdUI* pCmdUI); ! afx_msg void OnEditAdvancedDuplicateline(); ! //}}AFX_MSG afx_msg void OnEditFind(); afx_msg void OnComboFunction(); |
|
From: Leon W. <moo...@us...> - 2004-04-22 20:29:33
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19533 Modified Files: AnyEditView.cpp CodingPref.cpp ConfigFile.cpp ConfigFile.h EditorPref.cpp FileTypeManager.cpp FontPref.cpp ScintillaEx.cpp ScintillaEx.h StdAfx.h SyntaxFile.cpp SyntaxFile.h Log Message: CSyntaxFile and CConfigFile update and minor fixes and additions - BOOL <-> bool conversions in CSyntaxFile/CConfigFile - CSyntaxFile/CConfigFile added MFC dynamic macro'ss for memory leak checking - CSyntaxFile/CConfigFile now got doxygen comment - Added WINVER=0x0500 definition to make it compile again - Refixed AutoIndent changed bool back to int (3 possible values) - Fixed other problems related to these changes Index: FileTypeManager.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileTypeManager.cpp 20 Apr 2004 10:46:59 -0000 1.3 --- FileTypeManager.cpp 22 Apr 2004 20:29:12 -0000 1.4 *************** *** 21,25 **** CFileTypeManager::CFileTypeManager() { - } --- 21,24 ---- *************** *** 221,229 **** // Indentation ! pScintilla->SetTabIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); ! pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); ! pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ? 1 : 0 ); ! pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ? 1 : 0 ); // Set the number of Stylebits --- 220,228 ---- // Indentation ! pScintilla->SetTabIndents( pSyntaxFile->GetIndent() ); ! pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ); pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); ! pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ); ! pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ); // Set the number of Stylebits *************** *** 257,263 **** iTemp = pSyntaxFile->GetStyleFontSize( iCount ); if( -1 != iTemp ) pScintilla->StyleSetSize( iCount, iTemp ); ! pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ? 1 : 0 ); ! pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ? 1 : 0 ); ! pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount )? 1 : 0 ); // Set the color of the style --- 256,262 ---- iTemp = pSyntaxFile->GetStyleFontSize( iCount ); if( -1 != iTemp ) pScintilla->StyleSetSize( iCount, iTemp ); ! pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ); ! pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ); ! pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount ) ); // Set the color of the style Index: FontPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FontPref.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FontPref.cpp 6 Apr 2004 09:01:36 -0000 1.8 --- FontPref.cpp 22 Apr 2004 20:29:12 -0000 1.9 *************** *** 424,430 **** m_pSyntaxFile->SetStyleFontName( iStyleNumber, szFontName ); m_pSyntaxFile->SetStyleFontSize( iStyleNumber, atoi( szFontSize ) ); ! m_pSyntaxFile->SetStyleFontBold( iStyleNumber, bBold ); ! m_pSyntaxFile->SetStyleFontItalic( iStyleNumber, bItalic ); ! m_pSyntaxFile->SetStyleFontUnderline( iStyleNumber, bUnderline ); } return bChanged; --- 424,430 ---- m_pSyntaxFile->SetStyleFontName( iStyleNumber, szFontName ); m_pSyntaxFile->SetStyleFontSize( iStyleNumber, atoi( szFontSize ) ); ! m_pSyntaxFile->SetStyleFontBold( iStyleNumber, bBold ? true : false ); ! m_pSyntaxFile->SetStyleFontItalic( iStyleNumber, bItalic ? true : false ); ! m_pSyntaxFile->SetStyleFontUnderline( iStyleNumber, bUnderline ? true : false ); } return bChanged; Index: CodingPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CodingPref.cpp 6 Apr 2004 09:01:36 -0000 1.9 --- CodingPref.cpp 22 Apr 2004 20:29:11 -0000 1.10 *************** *** 134,161 **** // Code Highlighting ! if( m_bSyntaxHighlighting != m_pSyntaxFile->GetSyntaxHighlighting() ) { ! m_pSyntaxFile->SetSyntaxHighlighting( m_bSyntaxHighlighting ); bChanged = true; } ! if( m_bHighlightLine != m_pSyntaxFile->GetHighlightCurrentLine() ) { ! m_pSyntaxFile->SetHighlightCurrentLine( m_bHighlightLine ); bChanged = true; } ! if( m_bBraceMatch != m_pSyntaxFile->GetBraceMatch() ) { ! m_pSyntaxFile->SetBraceMatch( m_bBraceMatch ); bChanged = true; } // Auto Completion ! if( m_bAutoComp != m_pSyntaxFile->GetAutoCompletion() ) { ! m_pSyntaxFile->SetAutoCompletion( m_bAutoComp ); bChanged = true; } ! if( m_bCodeComp != m_pSyntaxFile->GetCodeCompletion() ) { ! m_pSyntaxFile->SetCodeCompletion( m_bCodeComp ); bChanged = true; } --- 134,161 ---- // Code Highlighting ! if( m_bSyntaxHighlighting != ( m_pSyntaxFile->GetSyntaxHighlighting() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetSyntaxHighlighting( m_bSyntaxHighlighting ? true : false ); bChanged = true; } ! if( m_bHighlightLine != ( m_pSyntaxFile->GetHighlightCurrentLine() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetHighlightCurrentLine( m_bHighlightLine ? true : false ); bChanged = true; } ! if( m_bBraceMatch != ( m_pSyntaxFile->GetBraceMatch() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetBraceMatch( m_bBraceMatch ? true : false ); bChanged = true; } // Auto Completion ! if( m_bAutoComp != ( m_pSyntaxFile->GetAutoCompletion() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetAutoCompletion( m_bAutoComp ? true : false ); bChanged = true; } ! if( m_bCodeComp != ( m_pSyntaxFile->GetCodeCompletion() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetCodeCompletion( m_bCodeComp ? true : false ); bChanged = true; } *************** *** 166,177 **** } // Class View ! if( m_bClassView != m_pSyntaxFile->GetClassView() ) { ! m_pSyntaxFile->SetClassView( m_bClassView ); bChanged = true; } ! if( m_bCVSorted != m_pSyntaxFile->GetSortClassView() ) { ! m_pSyntaxFile->SetSortClassView( m_bCVSorted ); bChanged = true; } --- 166,177 ---- } // Class View ! if( m_bClassView != ( m_pSyntaxFile->GetClassView() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetClassView( m_bClassView ? true : false ); bChanged = true; } ! if( m_bCVSorted != ( m_pSyntaxFile->GetSortClassView() ? TRUE : FALSE ) ) { ! m_pSyntaxFile->SetSortClassView( m_bCVSorted ? true : false ); bChanged = true; } Index: ScintillaEx.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaEx.h 19 Apr 2004 19:06:22 -0000 1.1 --- ScintillaEx.h 22 Apr 2004 20:29:12 -0000 1.2 *************** *** 73,78 **** int GetCaretInLine(void); int GetCurLineNumber(void); ! bool GetAutoIndent(void); ! void SetAutoIndent(bool bIndent); void SetDirectFunctionAndPointer(void); CWnd* SetFocus(void); --- 73,78 ---- int GetCaretInLine(void); int GetCurLineNumber(void); ! int GetAutoIndent(void); ! void SetAutoIndent(int iIndent); void SetDirectFunctionAndPointer(void); CWnd* SetFocus(void); *************** *** 81,85 **** protected: ! bool m_bAutoIndent; }; --- 81,85 ---- protected: ! int m_iAutoIndent; }; Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SyntaxFile.cpp 6 Apr 2004 09:01:36 -0000 1.7 --- SyntaxFile.cpp 22 Apr 2004 20:29:12 -0000 1.8 *************** *** 4,8 **** #include "stdafx.h" - //#include "anyedit.h" #include "SyntaxFile.h" #include <iostream> --- 4,7 ---- *************** *** 10,18 **** #ifdef _DEBUG - #undef THIS_FILE - static char THIS_FILE[]=__FILE__; #define new DEBUG_NEW #endif int CompareCString( CString s1, CString s2 ) { --- 9,19 ---- #ifdef _DEBUG #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; #endif + IMPLEMENT_DYNAMIC(CSyntaxFile,CObject); + int CompareCString( CString s1, CString s2 ) { *************** *** 29,33 **** szFileName = ""; ! m_bParsed = FALSE; // Set the string compare functions for the CSortedArray's with keywords. --- 30,34 ---- szFileName = ""; ! m_bParsed = false; // Set the string compare functions for the CSortedArray's with keywords. *************** *** 42,53 **** } ! // Gets a BOOL value of element from section. ! BOOL CSyntaxFile::GetBoolFromXMLFile( const TCHAR* section, const TCHAR* element ) { ! return GetIntFromXMLFile( section, element ) ? TRUE : FALSE; } ! // Sets a BOOL value of element from section to bValue. ! BOOL CSyntaxFile::SetBoolToXMLFile( const TCHAR* section, const TCHAR* element, BOOL bValue ) { return SetIntToXMLFile( section, element, bValue ? 1 : 0 ); --- 43,54 ---- } ! // Gets a bool value of element from section. ! bool CSyntaxFile::GetBoolFromXMLFile( const TCHAR* section, const TCHAR* element ) { ! return GetIntFromXMLFile( section, element ) ? true : false; } ! // Sets a bool value of element from section to bValue. ! bool CSyntaxFile::SetBoolToXMLFile( const TCHAR* section, const TCHAR* element, bool bValue ) { return SetIntToXMLFile( section, element, bValue ? 1 : 0 ); *************** *** 69,73 **** // Sets an int value of element from section to iValue. ! BOOL CSyntaxFile::SetIntToXMLFile( const TCHAR* section, const TCHAR* element, int iValue ) { xml_node xnode; --- 70,74 ---- // Sets an int value of element from section to iValue. ! bool CSyntaxFile::SetIntToXMLFile( const TCHAR* section, const TCHAR* element, int iValue ) { xml_node xnode; *************** *** 86,90 **** // Function to actually parse the synfile and the ability to check // if all goes well. ! BOOL CSyntaxFile::Parse() { int iCount; --- 87,91 ---- // Function to actually parse the synfile and the ability to check // if all goes well. ! bool CSyntaxFile::Parse() { int iCount; *************** *** 184,188 **** } ! void CSyntaxFile::Save() { filebuf fb; --- 185,189 ---- } ! bool CSyntaxFile::Save() { filebuf fb; *************** *** 190,200 **** // If not parsed don't save ! if( !m_bParsed ) return; fb.open( szFileName, ios::out ); ostream os(&fb); xnode = xparser.document(); ! if( xnode.empty() ) return; xnode.outer_xml( os ); fb.close(); } --- 191,202 ---- // If not parsed don't save ! if( !m_bParsed ) return true; fb.open( szFileName, ios::out ); ostream os(&fb); xnode = xparser.document(); ! if( xnode.empty() ) return false; xnode.outer_xml( os ); fb.close(); + return true; } *************** *** 308,312 **** // Returns if the WhiteSpace should be visible. ! BOOL CSyntaxFile::GetWhiteSpace() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_WHITESPACE ); --- 310,314 ---- // Returns if the WhiteSpace should be visible. ! bool CSyntaxFile::GetWhiteSpace() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_WHITESPACE ); *************** *** 314,318 **** // Sets if the WhiteSpace should be visible. ! BOOL CSyntaxFile::SetWhiteSpace( BOOL bWhiteSpace ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_WHITESPACE, bWhiteSpace ); --- 316,320 ---- // Sets if the WhiteSpace should be visible. ! bool CSyntaxFile::SetWhiteSpace( bool bWhiteSpace ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_WHITESPACE, bWhiteSpace ); *************** *** 320,324 **** // Returns if the EOL characthers should be visible. ! BOOL CSyntaxFile::GetEOL() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_EOL ); --- 322,326 ---- // Returns if the EOL characthers should be visible. ! bool CSyntaxFile::GetEOL() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_EOL ); *************** *** 326,330 **** // Sets if the EOL characthers should be visible. ! BOOL CSyntaxFile::SetEOL( BOOL bEOL ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_EOL, bEOL ); --- 328,332 ---- // Sets if the EOL characthers should be visible. ! bool CSyntaxFile::SetEOL( bool bEOL ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_EOL, bEOL ); *************** *** 332,336 **** // Returns if WordWrap is on. ! BOOL CSyntaxFile::GetWordWrap() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_WORDWRAP ); --- 334,338 ---- // Returns if WordWrap is on. ! bool CSyntaxFile::GetWordWrap() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_WORDWRAP ); *************** *** 338,342 **** // Sets WordWrap to true or false. ! BOOL CSyntaxFile::SetWordWrap( BOOL bWordWrap ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_WORDWRAP, bWordWrap ); --- 340,344 ---- // Sets WordWrap to true or false. ! bool CSyntaxFile::SetWordWrap( bool bWordWrap ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_WORDWRAP, bWordWrap ); *************** *** 351,355 **** // Sets the tab/indentation width to iTabWidth. ! BOOL CSyntaxFile::SetTabWidth( int iTabWidth ) { return SetIntToXMLFile( TAG_VIEW, TAG_VIEW_TABWIDTH, iTabWidth ); --- 353,357 ---- // Sets the tab/indentation width to iTabWidth. ! bool CSyntaxFile::SetTabWidth( int iTabWidth ) { return SetIntToXMLFile( TAG_VIEW, TAG_VIEW_TABWIDTH, iTabWidth ); *************** *** 357,361 **** // Returns if we want to use tabs or space (true is tabs!) ! BOOL CSyntaxFile::GetTabsToSpaces() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_TABSTOSPACES ); --- 359,363 ---- // Returns if we want to use tabs or space (true is tabs!) ! bool CSyntaxFile::GetTabsToSpaces() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_TABSTOSPACES ); *************** *** 363,367 **** // Sets the TabsToSpaces to true or false. ! BOOL CSyntaxFile::SetTabsToSpaces( BOOL bTabsToSpaces ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_TABSTOSPACES, bTabsToSpaces ); --- 365,369 ---- // Sets the TabsToSpaces to true or false. ! bool CSyntaxFile::SetTabsToSpaces( bool bTabsToSpaces ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_TABSTOSPACES, bTabsToSpaces ); *************** *** 369,373 **** // Returns if the RightEdge is on. ! BOOL CSyntaxFile::GetRightEdge() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE ); --- 371,375 ---- // Returns if the RightEdge is on. ! bool CSyntaxFile::GetRightEdge() { return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE ); *************** *** 375,379 **** // Set the RightEdge to true or false. ! BOOL CSyntaxFile::SetRightEdge( BOOL bRightEdge ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE, bRightEdge ); --- 377,381 ---- // Set the RightEdge to true or false. ! bool CSyntaxFile::SetRightEdge( bool bRightEdge ) { return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE, bRightEdge ); *************** *** 388,392 **** // Sets the RightEdgeColumn to iREColumn. ! BOOL CSyntaxFile::SetRightEdgeColumn( int iREColumn ) { return SetIntToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGECOLUMN, iREColumn ); --- 390,394 ---- // Sets the RightEdgeColumn to iREColumn. ! bool CSyntaxFile::SetRightEdgeColumn( int iREColumn ) { return SetIntToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGECOLUMN, iREColumn ); *************** *** 394,398 **** // Returns if SyntaxHighlighting is on. ! BOOL CSyntaxFile::GetSyntaxHighlighting() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_SYNTAXHIGHLIGHTING ); --- 396,400 ---- // Returns if SyntaxHighlighting is on. ! bool CSyntaxFile::GetSyntaxHighlighting() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_SYNTAXHIGHLIGHTING ); *************** *** 400,404 **** // Sets the SyntaxHighlighting to true or false. ! BOOL CSyntaxFile::SetSyntaxHighlighting( BOOL bSyntaxHighlighting ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_SYNTAXHIGHLIGHTING, bSyntaxHighlighting ); --- 402,406 ---- // Sets the SyntaxHighlighting to true or false. ! bool CSyntaxFile::SetSyntaxHighlighting( bool bSyntaxHighlighting ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_SYNTAXHIGHLIGHTING, bSyntaxHighlighting ); *************** *** 406,410 **** // Returns if the CurrentLine must be highlighted. ! BOOL CSyntaxFile::GetHighlightCurrentLine() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE ); --- 408,412 ---- // Returns if the CurrentLine must be highlighted. ! bool CSyntaxFile::GetHighlightCurrentLine() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE ); *************** *** 412,416 **** // Sets CurrentLine Highlighting. ! BOOL CSyntaxFile::SetHighlightCurrentLine( BOOL bHighlightCurrentLine ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE, bHighlightCurrentLine ); --- 414,418 ---- // Sets CurrentLine Highlighting. ! bool CSyntaxFile::SetHighlightCurrentLine( bool bHighlightCurrentLine ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE, bHighlightCurrentLine ); *************** *** 418,422 **** // Get Brace Matching ! BOOL CSyntaxFile::GetBraceMatch() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_BRACEMATCHING ); --- 420,424 ---- // Get Brace Matching ! bool CSyntaxFile::GetBraceMatch() { return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_BRACEMATCHING ); *************** *** 424,428 **** // Sets Brace Matching. ! BOOL CSyntaxFile::SetBraceMatch( BOOL bBraceMatch ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_BRACEMATCHING, bBraceMatch ); --- 426,430 ---- // Sets Brace Matching. ! bool CSyntaxFile::SetBraceMatch( bool bBraceMatch ) { return SetBoolToXMLFile( TAG_CODE, TAG_CODE_BRACEMATCHING, bBraceMatch ); *************** *** 430,434 **** // Is Auto Completion enabled? ! BOOL CSyntaxFile::GetAutoCompletion() { return GetBoolFromXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPLETION ); --- 432,436 ---- // Is Auto Completion enabled? ! bool CSyntaxFile::GetAutoCompletion() { return GetBoolFromXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPLETION ); *************** *** 436,440 **** // Enables or disables Auto Completion. ! BOOL CSyntaxFile::SetAutoCompletion( BOOL bAutoComp ) { return SetBoolToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPLETION, bAutoComp ); --- 438,442 ---- // Enables or disables Auto Completion. ! bool CSyntaxFile::SetAutoCompletion( bool bAutoComp ) { return SetBoolToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPLETION, bAutoComp ); *************** *** 442,446 **** // Is Code Completion enabled? ! BOOL CSyntaxFile::GetCodeCompletion() { return GetBoolFromXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_CODECOMPLETION ); --- 444,448 ---- // Is Code Completion enabled? ! bool CSyntaxFile::GetCodeCompletion() { return GetBoolFromXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_CODECOMPLETION ); *************** *** 448,452 **** // Enables or disables Code Completion. ! BOOL CSyntaxFile::SetCodeCompletion( BOOL bCodeComp ) { return SetBoolToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_CODECOMPLETION, bCodeComp ); --- 450,454 ---- // Enables or disables Code Completion. ! bool CSyntaxFile::SetCodeCompletion( bool bCodeComp ) { return SetBoolToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_CODECOMPLETION, bCodeComp ); *************** *** 460,464 **** // Sets the Auto Completion Key. ! BOOL CSyntaxFile::SetACKey( int iKey ) { return SetIntToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPKEY, iKey ); --- 462,466 ---- // Sets the Auto Completion Key. ! bool CSyntaxFile::SetACKey( int iKey ) { return SetIntToXMLFile( TAG_AUTOCOMP, TAG_AUTOCOMP_AUTOCOMPKEY, iKey ); *************** *** 466,470 **** // Is the Class View enabled? ! BOOL CSyntaxFile::GetClassView() { return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON ); --- 468,472 ---- // Is the Class View enabled? ! bool CSyntaxFile::GetClassView() { return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON ); *************** *** 472,476 **** // Enable or Disable the Class View. ! BOOL CSyntaxFile::SetClassView( BOOL bClassView ) { return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON, bClassView ); --- 474,478 ---- // Enable or Disable the Class View. ! bool CSyntaxFile::SetClassView( bool bClassView ) { return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON, bClassView ); *************** *** 478,482 **** // Returns if the Class View should be sorted. ! BOOL CSyntaxFile::GetSortClassView() { return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT ); --- 480,484 ---- // Returns if the Class View should be sorted. ! bool CSyntaxFile::GetSortClassView() { return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT ); *************** *** 484,488 **** // Set if the Class View should be sorted. ! BOOL CSyntaxFile::SetSortClassView( BOOL bSortClassView ) { return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT, bSortClassView ); --- 486,490 ---- // Set if the Class View should be sorted. ! bool CSyntaxFile::SetSortClassView( bool bSortClassView ) { return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT, bSortClassView ); *************** *** 496,500 **** // Sets the Class View Parser Delay time. ! BOOL CSyntaxFile::SetParserDelay( int iParserDelay ) { return SetIntToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_PARSEDELAY, iParserDelay ); --- 498,502 ---- // Sets the Class View Parser Delay time. ! bool CSyntaxFile::SetParserDelay( int iParserDelay ) { return SetIntToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_PARSEDELAY, iParserDelay ); *************** *** 502,506 **** // Returns if the Indent is on. ! BOOL CSyntaxFile::GetIndent() { return GetBoolFromXMLFile( TAG_INDENT, TAG_INDENT_INDENT ); --- 504,508 ---- // Returns if the Indent is on. ! bool CSyntaxFile::GetIndent() { return GetBoolFromXMLFile( TAG_INDENT, TAG_INDENT_INDENT ); *************** *** 508,512 **** // Set the Indent to true or false. ! BOOL CSyntaxFile::SetIndent( BOOL bIndent ) { return SetBoolToXMLFile( TAG_INDENT, TAG_INDENT_INDENT, bIndent ); --- 510,514 ---- // Set the Indent to true or false. ! bool CSyntaxFile::SetIndent( bool bIndent ) { return SetBoolToXMLFile( TAG_INDENT, TAG_INDENT_INDENT, bIndent ); *************** *** 520,524 **** // Sets the IndentSize to iIndentSize. ! BOOL CSyntaxFile::SetIndentSize( int iIndentSize ) { return SetIntToXMLFile( TAG_INDENT, TAG_INDENT_INDENTSIZE, iIndentSize ); --- 522,526 ---- // Sets the IndentSize to iIndentSize. ! bool CSyntaxFile::SetIndentSize( int iIndentSize ) { return SetIntToXMLFile( TAG_INDENT, TAG_INDENT_INDENTSIZE, iIndentSize ); *************** *** 532,536 **** // Sets the AutoIndent value ! BOOL CSyntaxFile::SetAutoIndent( int iAutoIndent ) { return SetIntToXMLFile( TAG_INDENT, TAG_INDENT_AUTOINDENT, iAutoIndent ); --- 534,538 ---- // Sets the AutoIndent value ! bool CSyntaxFile::SetAutoIndent( int iAutoIndent ) { return SetIntToXMLFile( TAG_INDENT, TAG_INDENT_AUTOINDENT, iAutoIndent ); *************** *** 538,542 **** // Gets if the IndentGuides are on. ! BOOL CSyntaxFile::GetIndentGuides() { return GetBoolFromXMLFile( TAG_INDENT, TAG_INDENT_INDENTGUIDES ); --- 540,544 ---- // Gets if the IndentGuides are on. ! bool CSyntaxFile::GetIndentGuides() { return GetBoolFromXMLFile( TAG_INDENT, TAG_INDENT_INDENTGUIDES ); *************** *** 544,548 **** // Sets the IndentGuides on or off. ! BOOL CSyntaxFile::SetIndentGuides( BOOL bIndentGuides ) { return SetBoolToXMLFile( TAG_INDENT, TAG_INDENT_INDENTGUIDES, bIndentGuides ); --- 546,550 ---- // Sets the IndentGuides on or off. ! bool CSyntaxFile::SetIndentGuides( bool bIndentGuides ) { return SetBoolToXMLFile( TAG_INDENT, TAG_INDENT_INDENTGUIDES, bIndentGuides ); *************** *** 550,554 **** // Returns if the LineNumber margin is on. ! BOOL CSyntaxFile::GetMarginLineNumber() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_LINENUMBERS ); --- 552,556 ---- // Returns if the LineNumber margin is on. ! bool CSyntaxFile::GetMarginLineNumber() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_LINENUMBERS ); *************** *** 556,560 **** // Sets the LineNumber margin to true or false. ! BOOL CSyntaxFile::SetMarginLineNumber( BOOL bLineNumbers ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_LINENUMBERS, bLineNumbers ); --- 558,562 ---- // Sets the LineNumber margin to true or false. ! bool CSyntaxFile::SetMarginLineNumber( bool bLineNumbers ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_LINENUMBERS, bLineNumbers ); *************** *** 562,566 **** // Returns if the Bookmark margin is on. ! BOOL CSyntaxFile::GetMarginBookmark() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_BOOKMARK ); --- 564,568 ---- // Returns if the Bookmark margin is on. ! bool CSyntaxFile::GetMarginBookmark() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_BOOKMARK ); *************** *** 568,572 **** // Sets the Bookmark margin to true or false. ! BOOL CSyntaxFile::SetMarginBookmark( BOOL bBookmark ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_BOOKMARK, bBookmark ); --- 570,574 ---- // Sets the Bookmark margin to true or false. ! bool CSyntaxFile::SetMarginBookmark( bool bBookmark ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_BOOKMARK, bBookmark ); *************** *** 574,578 **** // Returns if the Fold margin is on. ! BOOL CSyntaxFile::GetMarginFold() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_FOLD ); --- 576,580 ---- // Returns if the Fold margin is on. ! bool CSyntaxFile::GetMarginFold() { return GetBoolFromXMLFile( TAG_MARGINS, TAG_MARGINS_FOLD ); *************** *** 580,584 **** // Sets the Fold margin to true of false. ! BOOL CSyntaxFile::SetMarginFold( BOOL bFold ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_FOLD, bFold ); --- 582,586 ---- // Sets the Fold margin to true of false. ! bool CSyntaxFile::SetMarginFold( bool bFold ) { return SetBoolToXMLFile( TAG_MARGINS, TAG_MARGINS_FOLD, bFold ); *************** *** 639,652 **** } ! BOOL CSyntaxFile::SetStyleFontName( int iStyle, const char* FontName ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_NAME ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; return xnode.child(0).value( (TCHAR*)FontName ); --- 641,654 ---- } ! bool CSyntaxFile::SetStyleFontName( int iStyle, const char* FontName ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_NAME ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; return xnode.child(0).value( (TCHAR*)FontName ); *************** *** 668,672 **** } ! BOOL CSyntaxFile::SetStyleFontSize( int iStyle, int iValue ) { char szValue[4]; --- 670,674 ---- } ! bool CSyntaxFile::SetStyleFontSize( int iStyle, int iValue ) { char szValue[4]; *************** *** 674,683 **** xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_SIZE ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; sprintf( szValue, "%i", iValue ); --- 676,685 ---- xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_SIZE ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; sprintf( szValue, "%i", iValue ); *************** *** 686,773 **** ! BOOL CSyntaxFile::GetStyleFontBold( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_BOLD ); ! if( xnode.empty() && !xnode.children() ) return FALSE; ! return atoi( xnode.child(0).value() ) ? TRUE : FALSE; } ! BOOL CSyntaxFile::SetStyleFontBold( int iStyle, BOOL bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_BOLD ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; return xnode.child(0).value( bValue ? "1" : "0"); } ! BOOL CSyntaxFile::GetStyleFontItalic( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_ITALIC ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; ! return atoi( xnode.child(0).value() ) ? TRUE : FALSE; } ! BOOL CSyntaxFile::SetStyleFontItalic( int iStyle, BOOL bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_ITALIC ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; return xnode.child(0).value( bValue ? "1" : "0"); } ! BOOL CSyntaxFile::GetStyleFontUnderline( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_UNDERLINE ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; ! return atoi( xnode.child(0).value() ) ? TRUE : FALSE; } ! BOOL CSyntaxFile::SetStyleFontUnderline( int iStyle, BOOL bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_UNDERLINE ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; return xnode.child(0).value( bValue ? "1" : "0"); --- 688,775 ---- ! bool CSyntaxFile::GetStyleFontBold( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_BOLD ); ! if( xnode.empty() && !xnode.children() ) return false; ! return atoi( xnode.child(0).value() ) ? true : false; } ! bool CSyntaxFile::SetStyleFontBold( int iStyle, bool bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_BOLD ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; return xnode.child(0).value( bValue ? "1" : "0"); } ! bool CSyntaxFile::GetStyleFontItalic( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_ITALIC ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; ! return atoi( xnode.child(0).value() ) ? true : false; } ! bool CSyntaxFile::SetStyleFontItalic( int iStyle, bool bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_ITALIC ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; return xnode.child(0).value( bValue ? "1" : "0"); } ! bool CSyntaxFile::GetStyleFontUnderline( int iStyle ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_UNDERLINE ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; ! return atoi( xnode.child(0).value() ) ? true : false; } ! bool CSyntaxFile::SetStyleFontUnderline( int iStyle, bool bValue ) { xml_node xnode; xnode = GetStyleFontNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_FONT_UNDERLINE ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; return xnode.child(0).value( bValue ? "1" : "0"); *************** *** 893,897 **** } ! int CSyntaxFile::SetStyleColorForeground( int iStyle, int iColor ) { char szColor[9]; --- 895,899 ---- } ! bool CSyntaxFile::SetStyleColorForeground( int iStyle, int iColor ) { char szColor[9]; *************** *** 899,908 **** xnode = GetStyleColorNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_COLOR_FOREGROUND ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; ColorIntValueToRGBHex( iColor, szColor ); --- 901,910 ---- xnode = GetStyleColorNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_COLOR_FOREGROUND ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; ColorIntValueToRGBHex( iColor, szColor ); *************** *** 926,930 **** } ! int CSyntaxFile::SetStyleColorBackground( int iStyle, int iColor ) { char szColor[9]; --- 928,932 ---- } ! bool CSyntaxFile::SetStyleColorBackground( int iStyle, int iColor ) { char szColor[9]; *************** *** 932,941 **** xnode = GetStyleColorNode( iStyle ); ! if( xnode.empty() ) return FALSE; xnode = xnode.first_element_by_name( TAG_STYLE_COLOR_BACKGROUND ); ! if( xnode.empty() ) return FALSE; ! if( !xnode.children() ) return FALSE; ColorIntValueToRGBHex( iColor, szColor ); --- 934,943 ---- xnode = GetStyleColorNode( iStyle ); ! if( xnode.empty() ) return false; xnode = xnode.first_element_by_name( TAG_STYLE_COLOR_BACKGROUND ); ! if( xnode.empty() ) return false; ! if( !xnode.children() ) return false; ColorIntValueToRGBHex( iColor, szColor ); Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** AnyEditView.cpp 19 Apr 2004 19:06:20 -0000 1.51 --- AnyEditView.cpp 22 Apr 2004 20:29:11 -0000 1.52 *************** *** 377,381 **** break; case SCN_CHARADDED: ! if( ( scn->ch == '\r' || scn->ch == '\n' ) && m_Scintilla.GetAutoIndent() ) { int pos; --- 377,381 ---- break; case SCN_CHARADDED: ! if( ( scn->ch == '\r' || scn->ch == '\n' ) && m_Scintilla.GetAutoIndent() >= 1 ) { int pos; *************** *** 388,392 **** iIndentation = m_Scintilla.GetLineIndentation( m_Scintilla.GetCurLineNumber() - 1 ); // May we do extra indentation? ! if( m_Scintilla.GetAutoIndent() ) { // Get the position before the EOL characters --- 388,392 ---- iIndentation = m_Scintilla.GetLineIndentation( m_Scintilla.GetCurLineNumber() - 1 ); // May we do extra indentation? ! if( m_Scintilla.GetAutoIndent() >= 2 ) { // Get the position before the EOL characters *************** *** 405,409 **** SetLineIndentation( m_Scintilla.GetCurLineNumber(), iIndentation ); } ! if( scn->ch == '}' && m_Scintilla.GetAutoIndent() ) { int iIndentation; --- 405,409 ---- SetLineIndentation( m_Scintilla.GetCurLineNumber(), iIndentation ); } ! if( scn->ch == '}' && m_Scintilla.GetAutoIndent() >= 2 ) { int iIndentation; *************** *** 1911,1915 **** { GetDocument()->ToggleSyntaxHighlighting(); ! /* if( GetDocument()->GetSyntaxHighlighting() ) { --- 1911,1915 ---- { GetDocument()->ToggleSyntaxHighlighting(); ! /* if( GetDocument()->GetSyntaxHighlighting() ) { *************** *** 2090,2094 **** /// Update a view, when configuration has changed. /// @TODO: Add more hints like ShowEol, ShowWhiteSpace, ... ! void CAnyEditView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) { if (lHint == VIEW_SYNTAX) --- 2090,2094 ---- /// Update a view, when configuration has changed. /// @TODO: Add more hints like ShowEol, ShowWhiteSpace, ... ! void CAnyEditView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) { if (lHint == VIEW_SYNTAX) Index: SyntaxFile.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SyntaxFile.h 6 Apr 2004 09:01:36 -0000 1.7 --- SyntaxFile.h 22 Apr 2004 20:29:12 -0000 1.8 *************** *** 100,350 **** #define TAG_STYLE_COLOR_BACKGROUND "Background" class CSyntaxFile : public CObject { protected: CString szFileName; ! BOOL m_bParsed; xml_parser xparser; CSortedArray<CString, CString> Keywords[KEYWORDSET_MAX]; ! // Gets a BOOL value of element from section. ! BOOL GetBoolFromXMLFile( const TCHAR* section, const TCHAR* element ); ! // Sets a BOOL value of element from section to bValue. ! BOOL SetBoolToXMLFile( const TCHAR* section, const TCHAR* element, BOOL bValue ); ! // Get an int value of element from section. int GetIntFromXMLFile( const TCHAR* section, const TCHAR* element ); ! // Sets an int value of element from section to iValue. ! BOOL SetIntToXMLFile( const TCHAR* section, const TCHAR* element, int iValue ); ! // Converts a char array with hex chars to an int. int RGBHexValueToColorInt( const TCHAR* value ); ! // Converts an int into hex chars and puts them in szValue. Don't forget to reserve memory! void ColorIntValueToRGBHex( int iValue, char* szValue ); ! // Get the Font node of Style iStyle. Function is used by GetStyleFont* and SetStyleColor* xml_node GetStyleFontNode( int iStyle ); ! // Get the Color node of Style iStyle. Function is used by GetStyleColor* and SetStyleColor* xml_node GetStyleColorNode( int iStyle ); public: CSyntaxFile(); virtual ~CSyntaxFile(); ! // Get the currently set filename CString GetFilename(); ! // Set the filename of the syntax file to parse or save. void SetFilename( CString szFileName ); ! // Function to actually parse the synfile and the ability to check ! // if all goes well. ! BOOL Parse(); ! // Save the current values back in the synfile. ! void Save(); ! // Get the lexer number from, it changes the name in the syn-file to a number int GetLexerNumber(); ! // Get the properties to set on the lexer int GetLexerProperties( CMapStringToString& msts ); ! // Gets a String with all keywords out of iSet separated by cSep CString GetDelimitedKeywordSet( int iSet, char cSep = ' ' ); ! // Gets a String with all keywords out of all sets separated by cSep CString GetDelimitedKeywords( char cSep = ' ' ); ! // Returns if the WhiteSpace should be visible. ! BOOL GetWhiteSpace(); ! // Sets if the WhiteSpace should be visible. ! BOOL SetWhiteSpace( BOOL bWhiteSpace ); ! // Returns if the EOL characthers should be visible. ! BOOL GetEOL(); ! // Sets if the EOL characthers should be visible. ! BOOL SetEOL( BOOL bEOL ); ! // Returns if WordWrap is on. ! BOOL GetWordWrap(); ! // Sets WordWrap to true or false. ! BOOL SetWordWrap( BOOL bWordWrap ); ! // Get the tab/indentation width int GetTabWidth(); ! // Sets the tab/indentation width to iTabWidth. ! BOOL SetTabWidth( int iTabWidth ); ! // Returns if we want to use tabs or space (true is spaces!) ! BOOL GetTabsToSpaces(); ! // Sets the TabsToSpaces to true or false. ! BOOL SetTabsToSpaces( BOOL bUseTabs ); ! // Get the RightEdge type. ! BOOL GetRightEdge(); ! // Set the RightEdge to true or false. ! BOOL SetRightEdge( BOOL bRightEdge ); ! // Gets the RightEdgeColumn int GetRightEdgeColumn(); ! // Sets the RightEdgeColumn to iREColumn. ! BOOL SetRightEdgeColumn( int iREColumn ); ! // Returns if SyntaxHighlighting is on. ! BOOL GetSyntaxHighlighting(); ! // Sets the SyntaxHighlighting to true or false. ! BOOL SetSyntaxHighlighting( BOOL bSyntaxHighlighting ); ! // Returns if the CurrentLine must be Highlighted. ! BOOL GetHighlightCurrentLine(); ! // Sets CurrentLine Highlighting. ! BOOL SetHighlightCurrentLine( BOOL bHighlightCurrentLine ); ! // Get Brace Matching ! BOOL GetBraceMatch(); ! // Sets Brace Matching. ! BOOL SetBraceMatch( BOOL bBraceMatch ); ! // Is Auto Completion enabled? ! BOOL GetAutoCompletion(); ! // Enables or disables Auto Completion. ! BOOL SetAutoCompletion( BOOL bAutoComp ); ! // Is Code Completion enabled? ! BOOL GetCodeCompletion(); ! // Enables or disables Code Completion. ! BOOL SetCodeCompletion( BOOL bCodeComp ); ! // Get the Auto Completion Key. int GetACKey(); ! // Sets the Auto Completion Key. ! BOOL SetACKey( int iKey ); ! // Is the Class View enabled? ! BOOL GetClassView(); ! // Enable or Disable the Class View. ! BOOL SetClassView( BOOL bClassView ); ! // Returns if the Class View should be sorted. ! BOOL GetSortClassView(); ! // Set if the Class View should be sorted. ! BOOL SetSortClassView( BOOL bSortClassView ); ! // Returns the Class View Parser Delay time. int GetParserDelay(); ! // Sets the Class View Parser Delay time. ! BOOL SetParserDelay( int iParserDelay ); ! // Returns if Indent is on. ! int GetIndent(); ! // Sets Indent to true or false. ! BOOL SetIndent( BOOL bIndent ); ! // Gets the IndentSize ! BOOL GetIndentSize(); ! // Sets the IndentSize to iIndentSize ! BOOL SetIndentSize( int iIndentSize ); ! // Get the AutoIndent value int GetAutoIndent(); ! // Sets the AutoIndent value ! BOOL SetAutoIndent( int iAutoIndent ); ! // Gets if the IndentGuides are on. ! BOOL GetIndentGuides(); ! // Sets the IndentGuides on or off. ! BOOL SetIndentGuides( BOOL bIndentGuides ); ! // Returns if the LineNumber margin is on. ! BOOL GetMarginLineNumber(); ! // Sets the LineNumber margin to true or false. ! BOOL SetMarginLineNumber( BOOL bLineNumbers ); ! // Returns if the Bookmark margin is on. ! BOOL GetMarginBookmark(); ! // Sets the Bookmark margin to true or false. ! BOOL SetMarginBookmark( BOOL bBookmark ); ! // Returns if the Fold margin is on. ! BOOL GetMarginFold(); ! // Sets the Fold margin to true of false. ! BOOL SetMarginFold( BOOL bFold ); ! // Gets the Number of Stylebits int GetStyleBits(); ! // Gets the Name of iStyle. CString GetStyleName( int iStyle ); ! // Gets the FontName of iStyle. CString GetStyleFontName( int iStyle ); ! // Sets the FontName of iStyle. ! BOOL SetStyleFontName( int iStyle, const char* FontName ); ! // Gets the FontSize of iStyle font. int GetStyleFontSize( int iStyle ); ! // Sets the FontSize of iStyle font. ! BOOL SetStyleFontSize( int iStyle, int iValue ); ! // Get the FontBold attribute of iStyle font. ! BOOL GetStyleFontBold( int iStyle ); ! // Set the FontBold attribute of iStyle font. ! BOOL SetStyleFontBold( int iStyle, BOOL bValue ); ! // Get the FontItalic attribute of iStyle font. ! BOOL GetStyleFontItalic( int iStyle ); ! // Set the FontItalic attribute of iStyle font. ! BOOL SetStyleFontItalic( int iStyle, BOOL bValue ); ! // Get the FontUnderline attribute of iStyle font. ! BOOL GetStyleFontUnderline( int iStyle ); ! // Set the FontUnderline attribute of iStyle font. ! BOOL SetStyleFontUnderline( int iStyle, BOOL bValue ); ! // Get the Foreground Color of iStyle. int GetStyleColorForeground( int iStyle ); ! // Set the Foreground Color of iStyle. ! BOOL SetStyleColorForeground( int iStyle, int iColor ); ! // Get the Background Color of iStyle. int GetStyleColorBackground( int iStyle ); ! // Set the Background Color of iStyle. ! BOOL SetStyleColorBackground( int iStyle, int iColor ); }; --- 100,358 ---- #define TAG_STYLE_COLOR_BACKGROUND "Background" + /** \class CSyntaxFile + * \brief A class with the interface to a xml file with language definitions + */ class CSyntaxFile : public CObject { protected: + /// The filename of the Syntax file CString szFileName; ! /// Keep track if we parsed the syntax file ! bool m_bParsed; xml_parser xparser; + /// Sorted array with all the keywords of a language CSortedArray<CString, CString> Keywords[KEYWORDSET_MAX]; ! /// Gets a bool value of element from section. ! bool GetBoolFromXMLFile( const TCHAR* section, const TCHAR* element ); ! /// Sets a bool value of element from section to bValue. ! bool SetBoolToXMLFile( const TCHAR* section, const TCHAR* element, bool bValue ); ! /// Get an int value of element from section. int GetIntFromXMLFile( const TCHAR* section, const TCHAR* element ); ! /// Sets an int value of element from section to iValue. ! bool SetIntToXMLFile( const TCHAR* section, const TCHAR* element, int iValue ); ! /// Converts a char array with hex chars to an int. int RGBHexValueToColorInt( const TCHAR* value ); ! /// Converts an int into hex chars and puts them in szValue. Don't forget to reserve memory! void ColorIntValueToRGBHex( int iValue, char* szValue ); ! /// Get the Font node of Style iStyle. Function is used by GetStyleFont* and SetStyleColor* xml_node GetStyleFontNode( int iStyle ); ! /// Get the Color node of Style iStyle. Function is used by GetStyleColor* and SetStyleColor* xml_node GetStyleColorNode( int iStyle ); public: + DECLARE_DYNAMIC(CSyntaxFile) + CSyntaxFile(); virtual ~CSyntaxFile(); ! /// Get the currently set filename CString GetFilename(); ! /// Set the filename of the syntax file to parse or save. void SetFilename( CString szFileName ); ! /// Function to actually parse the synfile and the ability to check ! /// if all goes well. ! bool Parse(); ! /// Save the current values back in the synfile. ! bool Save(); ! /// Get the lexer number from, it changes the name in the syn-file to a number int GetLexerNumber(); ! /// Get the properties to set on the lexer int GetLexerProperties( CMapStringToString& msts ); ! /// Gets a String with all keywords out of iSet separated by cSep CString GetDelimitedKeywordSet( int iSet, char cSep = ' ' ); ! /// Gets a String with all keywords out of all sets separated by cSep CString GetDelimitedKeywords( char cSep = ' ' ); ! /// Returns if the WhiteSpace should be visible. ! bool GetWhiteSpace(); ! /// Sets if the WhiteSpace should be visible. ! bool SetWhiteSpace( bool bWhiteSpace ); ! /// Returns if the EOL characthers should be visible. ! bool GetEOL(); ! /// Sets if the EOL characthers should be visible. ! bool SetEOL( bool bEOL ); ! /// Returns if WordWrap is on. ! bool GetWordWrap(); ! /// Sets WordWrap to true or false. ! bool SetWordWrap( bool bWordWrap ); ! /// Get the tab/indentation width int GetTabWidth(); ! /// Sets the tab/indentation width to iTabWidth. ! bool SetTabWidth( int iTabWidth ); ! /// Returns if we want to use tabs or space (true is spaces!) ! bool GetTabsToSpaces(); ! /// Sets the TabsToSpaces to true or false. ! bool SetTabsToSpaces( bool bUseTabs ); ! /// Get the RightEdge type. ! bool GetRightEdge(); ! /// Set the RightEdge to true or false. ! bool SetRightEdge( bool bRightEdge ); ! /// Gets the RightEdgeColumn int GetRightEdgeColumn(); ! /// Sets the RightEdgeColumn to iREColumn. ! bool SetRightEdgeColumn( int iREColumn ); ! /// Returns if SyntaxHighlighting is on. ! bool GetSyntaxHighlighting(); ! /// Sets the SyntaxHighlighting to true or false. ! bool SetSyntaxHighlighting( bool bSyntaxHighlighting ); ! /// Returns if the CurrentLine must be Highlighted. ! bool GetHighlightCurrentLine(); ! /// Sets CurrentLine Highlighting. ! bool SetHighlightCurrentLine( bool bHighlightCurrentLine ); ! /// Get Brace Matching ! bool GetBraceMatch(); ! /// Sets Brace Matching. ! bool SetBraceMatch( bool bBraceMatch ); ! /// Is Auto Completion enabled? ! bool GetAutoCompletion(); ! /// Enables or disables Auto Completion. ! bool SetAutoCompletion( bool bAutoComp ); ! /// Is Code Completion enabled? ! bool GetCodeCompletion(); ! /// Enables or disables Code Completion. ! bool SetCodeCompletion( bool bCodeComp ); ! /// Get the Auto Completion Key. int GetACKey(); ! /// Sets the Auto Completion Key. ! bool SetACKey( int iKey ); ! /// Is the Class View enabled? ! bool GetClassView(); ! /// Enable or Disable the Class View. ! bool SetClassView( bool bClassView ); ! /// Returns if the Class View should be sorted. ! bool GetSortClassView(); ! /// Set if the Class View should be sorted. ! bool SetSortClassView( bool bSortClassView ); ! /// Returns the Class View Parser Delay time. int GetParserDelay(); ! /// Sets the Class View Parser Delay time. ! bool SetParserDelay( int iParserDelay ); ! /// Returns if Indent is on. ! bool GetIndent(); ! /// Sets Indent to true or false. ! bool SetIndent( bool bIndent ); ! /// Gets the IndentSize ! int GetIndentSize(); ! /// Sets the IndentSize to iIndentSize ! bool SetIndentSize( int iIndentSize ); ! /// Get the AutoIndent value int GetAutoIndent(); ! /// Sets the AutoIndent value ! bool SetAutoIndent( int iAutoIndent ); ! /// Gets if the IndentGuides are on. ! bool GetIndentGuides(); ! /// Sets the IndentGuides on or off. ! bool SetIndentGuides( bool bIndentGuides ); ! /// Returns if the LineNumber margin is on. ! bool GetMarginLineNumber(); ! /// Sets the LineNumber margin to true or false. ! bool SetMarginLineNumber( bool bLineNumbers ); ! /// Returns if the Bookmark margin is on. ! bool GetMarginBookmark(); ! /// Sets the Bookmark margin to true or false. ! bool SetMarginBookmark( bool bBookmark ); ! /// Returns if the Fold margin is on. ! bool GetMarginFold(); ! /// Sets the Fold margin to true of false. ! bool SetMarginFold( bool bFold ); ! /// Gets the Number of Stylebits int GetStyleBits(); ! /// Gets the Name of iStyle. CString GetStyleName( int iStyle ); ! /// Gets the FontName of iStyle. CString GetStyleFontName( int iStyle ); ! /// Sets the FontName of iStyle. ! bool SetStyleFontName( int iStyle, const char* FontName ); ! /// Gets the FontSize of iStyle font. int GetStyleFontSize( int iStyle ); ! /// Sets the FontSize of iStyle font. ! bool SetStyleFontSize( int iStyle, int iValue ); ! /// Get the FontBold attribute of iStyle font. ! bool GetStyleFontBold( int iStyle ); ! /// Set the FontBold attribute of iStyle font. ! bool SetStyleFontBold( int iStyle, bool bValue ); ! /// Get the FontItalic attribute of iStyle font. ! bool GetStyleFontItalic( int iStyle ); ! /// Set the FontItalic attribute of iStyle font. ! bool SetStyleFontItalic( int iStyle, bool bValue ); ! /// Get the FontUnderline attribute of iStyle font. ! bool GetStyleFontUnderline( int iStyle ); ! /// Set the FontUnderline attribute of iStyle font. ! bool SetStyleFontUnderline( int iStyle, bool bValue ); ! /// Get the Foreground Color of iStyle. int GetStyleColorForeground( int iStyle ); ! /// Set the Foreground Color of iStyle. ! bool SetStyleColorForeground( int iStyle, int iColor ); ! /// Get the Background Color of iStyle. int GetStyleColorBackground( int iStyle ); ! /// Set the Background Color of iStyle. ! bool SetStyleColorBackground( int iStyle, int iColor ); }; Index: ConfigFile.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConfigFile.h 15 Mar 2004 08:51:53 -0000 1.2 --- ConfigFile.h 22 Apr 2004 20:29:12 -0000 1.3 *************** *** 42,102 **** #define ANYEDIT_CONFIG_FILE "AnyEdit.cfg" class CConfigFile : public CObject { protected: CString szFileName; xml_parser xparser; ! // Get the node for the languages tag. xml_node GetLanguagesNode(); ! // Get the node of the language with number. xml_node GetLanguageNodeByNumber( int iNumber ); public: CConfigFile(); virtual ~CConfigFile(); ! // Set the Filename of the config file to parse. void SetFilename( CString lszFileName ); ! // Parse the config file. ! int Parse(); ! // Save the config file, including changes ! BOOL Save(); ! // Get the number of languages int GetLanguageCount(); ! // Get the name of the language with number iNumber. CString GetLanguageName( int iNumber ); ! // Set the name of the language with number iNumber to szName. ! BOOL SetLanguageName( int iNumber, CString szName ); ! // Get the syntaxfile name of the language with number iNumber. CString GetLanguageSyntaxFileName( int iNumber ); ! // Set the syntaxfile name of the language with number iNumber to szSyntaxFileName. ! BOOL SetLanguageSyntaxFileName( int iNumber, CString szSyntaxFileName ); ! // Get the auto completion filename of the language with number iNumber. CString GetLanguageAutoCompFileName( int iNumber ); ! // Set the auto completion filename of the language with number iNumber to szAutoCompFile. ! BOOL SetLanguageAutoCompFileName( int iNumber, CString szAutoCompFileName ); ! // Get the extensions string of language with number iNumber. CString GetLanguageExtensions( int iNumber ); ! // Set the extensions string of language with numbet iNumber to szExtensions. ! BOOL SetLanguageExtensions( int iNumber, CString szExtensions ); ! // Add a language to the config file. ! BOOL AddLanguage( CString szName, CString szSyntaxFile, CString szAutoCompFile, CString szExtensions ); ! // Remove a language with number iNumber from the Languages tag. ! BOOL RemoveLanguage( int iNumber ); }; --- 42,109 ---- #define ANYEDIT_CONFIG_FILE "AnyEdit.cfg" + /** \class CConfigFile + * \brief A class with the interface to the AnyEdit config file in XML + **/ + class CConfigFile : public CObject { protected: + /// The name of the config file CString szFileName; xml_parser xparser; ! /// Get the node for the languages tag. xml_node GetLanguagesNode(); ! /// Get the node of the language with number. xml_node GetLanguageNodeByNumber( int iNumber ); public: + DECLARE_DYNAMIC(CConfigFile) + CConfigFile(); virtual ~CConfigFile(); ! /// Set the Filename of the config file to parse. void SetFilename( CString lszFileName ); ! /// Parse the config file. ! bool Parse(); ! /// Save the config file, including changes ! bool Save(); ! /// Get the number of languages int GetLanguageCount(); ! /// Get the name of the language with number iNumber. CString GetLanguageName( int iNumber ); ! /// Set the name of the language with number iNumber to szName. ! bool SetLanguageName( int iNumber, CString szName ); ! /// Get the syntaxfile name of the language with number iNumber. CString GetLanguageSyntaxFileName( int iNumber ); ! /// Set the syntaxfile name of the language with number iNumber to szSyntaxFileName. ! bool SetLanguageSyntaxFileName( int iNumber, CString szSyntaxFileName ); ! /// Get the auto completion filename of the language with number iNumber. CString GetLanguageAutoCompFileName( int iNumber ); ! /// Set the auto completion filename of the language with number iNumber to szAutoCompFile. ! bool SetLanguageAutoCompFileName( int iNumber, CString szAutoCompFileName ); ! /// Get the extensions string of language with number iNumber. CString GetLanguageExtensions( int iNumber ); ! /// Set the extensions string of language with numbet iNumber to szExtensions. ! bool SetLanguageExtensions( int iNumber, CString szExtensions ); ! /// Add a language to the config file. ! bool AddLanguage( CString szName, CString szSyntaxFile, CString szAutoCompFile, CString szExtensions ); ! /// Remove a language with number iNumber from the Languages tag. ! bool RemoveLanguage( int iNumber ); }; Index: ConfigFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConfigFile.cpp 6 Apr 2004 09:01:36 -0000 1.3 --- ConfigFile.cpp 22 Apr 2004 20:29:12 -0000 1.4 *************** *** 4,8 **** #include "stdafx.h" - //#include "anyedit.h" #include "ConfigFile.h" #include <iostream> --- 4,7 ---- *************** *** 15,18 **** --- 14,19 ---- #endif + IMPLEMENT_DYNAMIC(CConfigFile,CObject) + ////////////////////////////////////////////////////////////////////// // Construction/Destruction *************** *** 36,40 **** // Parse the config file. ! BOOL CConfigFile::Parse() { if( szFileName.IsEmpty() ) return false; --- 37,41 ---- // Parse the config file. ! bool CConfigFile::Parse() { if( szFileName.IsEmpty() ) return false; *************** *** 46,50 **** // Save the config file, including changes. ! BOOL CConfigFile::Save() { filebuf fb; --- 47,51 ---- // Save the config file, including changes. ! bool CConfigFile::Save() { filebuf fb; *************** *** 53,60 **** ostream os(&fb); xnode = xparser.document(); ! if( xnode.empty() ) return FALSE; xnode.outer_xml( os ); fb.close(); ! return TRUE; } --- 54,61 ---- ostream os(&fb); xnode = xparser.document(); ! if( xnode.empty() ) return false; xnode.outer_xml( os ); fb.close(); ! return true; } *************** *** 82,86 **** xnode = GetLanguagesNode(); ! if( xnode.empty() ) return FALSE; sprintf( szNumber, "%i", iNumber ); --- 83,87 ---- xnode = GetLanguagesNode(); ! if( xnode.empty() ) return false; sprintf( szNumber, "%i", iNumber ); *************** *** 123,135 **** // Set the name of the language with number iNumber to szName. ! BOOL CConfigFile::SetLanguageName( int iNumber, CString szName ) { xml_node xnode; xnode = GetLanguageNodeByNumber( iNumber ); ! if( xnode.empty() || !xnode.children() ) return FALSE; xnode = xnode.first_element_by_name( TAG_LANGUAGE_NAME ); ! if( xnode.empty() || !xnode.children() ) return FALSE; return xnode.child(0).value( szName ); --- 124,136 ---- // Set the name of the language with number iNumber to szName. ! bool CConfigFile::SetLanguageName( int iNumber, CString szName ) { xml_node xnode; xnode = GetLanguageNodeByNumber( iNumber ); ! if( xnode.empty() || !xnode.children() ) return false; xnode = xnode.first_element_by_name( TAG_LANGUAGE_NAME ); ! if( xnode.empty() || !xnode.children() ) return false; return xnode.child(0).value( szName ); *************** *** 155,159 **** // Set the syntaxfile name of the language with number iNumber to szSyntaxFileName. ! BOOL CConfigFile::SetLanguageSyntaxFileName( int iNumber, CString szSyntaxFileName ) { xml_node xroot; --- 156,160 ---- // Set the syntaxfile name of the language with number iNumber to szSyntaxFileName. ! bool CConfigFile::SetLanguageSyntaxFileName( int iNumber, CString szSyntaxFileName ) { xml_node xroot; *************** *** 161,165 **** xroot = GetLanguageNodeByNumber( iNumber ); ! if( xroot.empty() || !xroot.children() ) return FALSE; xnode = xroot.first_element_by_name( TAG_LANGUAGE_SYNTAXFILE ); --- 162,166 ---- xroot = GetLanguageNodeByNumber( iNumber ); ! if( xroot.empty() || !xroot.children() ) return false; xnode = xroot.first_element_by_name( TAG_LANGUAGE_SY... [truncated message content] |
|
From: Leon W. <moo...@us...> - 2004-04-20 10:47:08
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28855 Modified Files: AnyEdit.cpp FileTypeManager.cpp Log Message: Bug fix, warning remove - AnyEditApp: Opening a file from the WorkspaceBar didn't work. - FileTypeManager: Removed another 3 warnings. Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** AnyEdit.cpp 19 Apr 2004 19:06:20 -0000 1.45 --- AnyEdit.cpp 20 Apr 2004 10:46:59 -0000 1.46 *************** *** 662,667 **** CString strLongFileName; ! m_misc.ShortToLongPath(strShortFileName, strLongFileName); ! CString ext = m_misc.GetFileExtension(lpszFileName); CString tempStr = _T("AEW"); --- 662,672 ---- CString strLongFileName; ! if( !m_misc.ShortToLongPath(strShortFileName, strLongFileName) ) ! { ! // If it fails, just take the name as is. ! // Maybe lpszFileName isn't an short name. ! strLongFileName = lpszFileName; ! } ! CString ext = m_misc.GetFileExtension(lpszFileName); CString tempStr = _T("AEW"); Index: FileTypeManager.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileTypeManager.cpp 20 Apr 2004 08:37:31 -0000 1.2 --- FileTypeManager.cpp 20 Apr 2004 10:46:59 -0000 1.3 *************** *** 257,263 **** iTemp = pSyntaxFile->GetStyleFontSize( iCount ); if( -1 != iTemp ) pScintilla->StyleSetSize( iCount, iTemp ); ! pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ); ! pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ); ! pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount ) ); // Set the color of the style --- 257,263 ---- iTemp = pSyntaxFile->GetStyleFontSize( iCount ); if( -1 != iTemp ) pScintilla->StyleSetSize( iCount, iTemp ); ! pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ? 1 : 0 ); ! pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ? 1 : 0 ); ! pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount )? 1 : 0 ); // Set the color of the style |
|
From: Leon W. <moo...@us...> - 2004-04-20 08:37:50
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6308 Modified Files: FileTypeManager.cpp Removed Files: Language.cpp Language.h Log Message: Warning fix, remove obsolete files Index: FileTypeManager.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileTypeManager.cpp 19 Apr 2004 19:06:22 -0000 1.1 --- FileTypeManager.cpp 20 Apr 2004 08:37:31 -0000 1.2 *************** *** 224,228 **** pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); ! pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ); pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ? 1 : 0 ); --- 224,228 ---- pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); ! pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ? 1 : 0 ); pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ? 1 : 0 ); --- Language.cpp DELETED --- --- Language.h DELETED --- |
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17791 Modified Files: AnyEdit.cpp AnyEdit.dsp AnyEdit.h AnyEditDoc.cpp AnyEditDoc.h AnyEditView.cpp AnyEditView.h ChangeLog.txt ChildFrm.cpp ChildFrm.h FindDialog.cpp FindDialog.h FindReplace.cpp FindReplace.h Language.cpp Language.h Misc.cpp Misc.h SAPrefsDialog.cpp scintillaif.cpp scintillaif.h Added Files: FileTypeManager.cpp FileTypeManager.h ScintillaEx.cpp ScintillaEx.h Log Message: Enhancements and code cleanup - add new class CScintillaEx. CScintilla was created from scintilla.ifacs. CScintillaEx is extension class for new features. - add new class CFileTypeManager. This class handles file types. - New window and Split window works now. CAnyEditDoc saves doc pointer from scintilla. CChildFrame got splitter window. - Bad bracket matches are shown in red. Bracket highlighting uses indent highlighting. - ShortFilenames are converted with CMisc.ShortToLongPath. This is used in OpenDocumentFile [#875940] --- NEW FILE: FileTypeManager.cpp --- // FileTypeManager.cpp: implementation of the CFileTypeManager class. // ////////////////////////////////////////////////////////////////////// #include "stdafx.h" #include "AnyEdit.h" #include "ConfigFile.h" #include "SyntaxFile.h" #include "FileTypeManager.h" #ifdef _DEBUG #undef THIS_FILE static char THIS_FILE[]=__FILE__; #define new DEBUG_NEW #endif ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// CFileTypeManager::CFileTypeManager() { } CFileTypeManager::~CFileTypeManager() { POSITION pos; // Cleanup Syntax File objects pos = mapSyntaxFiles.GetStartPosition(); while( NULL != pos ) { int iLanguageNr; CSyntaxFile* pSyntaxFile = NULL; mapSyntaxFiles.GetNextAssoc( pos, iLanguageNr, pSyntaxFile ); if( NULL != pSyntaxFile ) delete pSyntaxFile; } } /** Load all the Syntax files that are set in the * config file. These objects will be used to fill * the Scintilla object. */ void CFileTypeManager::LoadSyntaxFiles(CConfigFile *conf) { int iCount; FILE* fp; POSITION pos; CString szFileName; CSyntaxFile* pSyntaxFile; // Clear the list pos = mapSyntaxFiles.GetStartPosition(); while( NULL != pos ) { int iLanguage; mapSyntaxFiles.GetNextAssoc( pos, iLanguage, pSyntaxFile ); if( NULL != pSyntaxFile ) delete pSyntaxFile; } mapSyntaxFiles.RemoveAll(); // Get the Language count. int iNrLanguages = conf->GetLanguageCount(); for( iCount = 0; iCount < iNrLanguages; ++ iCount ) { pSyntaxFile = new CSyntaxFile(); if( NULL == pSyntaxFile ) continue; // throw memory exception! // Get the filename of the Syntax file szFileName = theApp.GetAppPath(); szFileName += CONFIG_DIR; szFileName += theApp.GetCurrentUser(); szFileName += '\\'; szFileName += SYNTAX_DIR; szFileName += conf->GetLanguageSyntaxFileName( iCount ); pSyntaxFile->SetFilename( szFileName ); fp = fopen( szFileName, "rw" ); // Read the syntax definitions from the file. if( !fp ) { CFile file1; CFile file2; UINT bytesRead; char filebuffer[1024]; // The username file doesn't exist read the default CString szDefaultFileName=theApp.GetAppPath(); szDefaultFileName += CONFIG_DIR; szDefaultFileName += DEFAULT_DIR; szDefaultFileName += SYNTAX_DIR; szDefaultFileName += conf->GetLanguageSyntaxFileName( iCount ); if( !file1.Open( szDefaultFileName, CFile::modeRead | CFile::typeBinary ) ) { continue; } if( !file2.Open( szFileName, CFile::modeCreate | CFile::modeWrite | CFile::typeBinary ) ) { continue; } bytesRead = 1; while( bytesRead ) { bytesRead = file1.Read( filebuffer, 1024 ); if( bytesRead ) file2.Write( filebuffer, bytesRead ); } } else { fclose( fp ); } // Add the parsed object to the Syntax file map. mapSyntaxFiles.SetAt( iCount, pSyntaxFile ); } } /** Fill the extension map with all the extension * from the config file and 'koppelen' it with a * Language number. */ void CFileTypeManager::FillExtensionMap(CConfigFile *conf) { int iCount; int iNrLanguages; CString szExtensions; CString szUppercaseExtension; CString szLanguageNr; iNrLanguages = conf->GetLanguageCount(); for( iCount = 0; iCount < iNrLanguages; ++ iCount ) { szExtensions = conf->GetLanguageExtensions( iCount ); if( !szExtensions.IsEmpty() ) { // Seperate the string with extensions int iStart = 0; int iEnd = 0; // Change the LanguageNr to String szLanguageNr.Format( "%i", iCount ); while( iEnd >= 0 ) { iEnd = szExtensions.Find( ',', iStart ); if( -1 != iEnd ) { // Add the found extension to the map szUppercaseExtension = szExtensions.Mid( iStart, iEnd - iStart ); szUppercaseExtension.MakeUpper(); mapExtensions.SetAt( szUppercaseExtension, szLanguageNr ); iStart = iEnd + 1; } } // Don't forget to add the last one if( iStart < szExtensions.GetLength() ) { szUppercaseExtension = szExtensions.Mid( iStart, szExtensions.GetLength() - iStart ); szUppercaseExtension.MakeUpper(); mapExtensions.SetAt( szUppercaseExtension, szLanguageNr ); } } } } int CFileTypeManager::GetLanguageNrFromExtension( CString szExtension ) { CString szLanguageNr = "0"; // Make upper to be sure. szExtension.MakeUpper(); mapExtensions.Lookup( szExtension, szLanguageNr ); return atoi( szLanguageNr ); } /// Find the SyntaxFile object by it's language number CSyntaxFile* CFileTypeManager::GetSyntaxFile( int iLanguage ) { CSyntaxFile* pSyntaxFile; mapSyntaxFiles.Lookup( iLanguage, pSyntaxFile ); return pSyntaxFile; } /// Initialize FileTypeManager. void CFileTypeManager::Init(CConfigFile *conf) { FillExtensionMap(conf); LoadSyntaxFiles(conf); } /** This function sets all the Properties of the * Scintilla object from a Syntaxfile. */ void CFileTypeManager::SetScintillaProperties(int iLanguage, CScintillaEx* pScintilla, BOOL bSyntaxHighlighting) { int iCount; CSyntaxFile* pSyntaxFile; CString szTemp; int iTemp; CMapStringToString mapLexerProps; POSITION pos; pSyntaxFile = GetSyntaxFile( iLanguage ); if( NULL == pSyntaxFile ) return; if( !pSyntaxFile->Parse() ) return; // Clear the Scintilla object pScintilla->StyleClearAll(); // Do some default AnyEdit settings pScintilla->StyleSetEOLFilled( STYLE_DEFAULT, true ); pScintilla->UsePopUp( false ); pScintilla->SetTabWidth( pSyntaxFile->GetTabWidth() ); pScintilla->SetEdgeColumn( pSyntaxFile->GetRightEdgeColumn() ); // Indentation pScintilla->SetTabIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ); pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ? 1 : 0 ); // Set the number of Stylebits iTemp = pSyntaxFile->GetStyleBits(); if( -1 != iTemp ) pScintilla->SetStyleBits( iTemp ); if( bSyntaxHighlighting ) { // Set the lexer iTemp = pSyntaxFile->GetLexerNumber(); if( -1 != iTemp ) pScintilla->SetLexer( iTemp ); // Set the lexer properties if( 0 < pSyntaxFile->GetLexerProperties( mapLexerProps ) ) { CString szTemp2; pos = mapLexerProps.GetStartPosition(); while( NULL != pos ) { mapLexerProps.GetNextAssoc( pos, szTemp, szTemp2 ); pScintilla->SetProperty( szTemp, szTemp2 ); } } // Set properties of each style if it is defined in the syntax for( iCount = 0; iCount <= STYLE_MAX; ++ iCount ) { // Set the font properties of the style szTemp = pSyntaxFile->GetStyleFontName( iCount ); if( !szTemp.IsEmpty() ) pScintilla->StyleSetFont( iCount, szTemp ); iTemp = pSyntaxFile->GetStyleFontSize( iCount ); if( -1 != iTemp ) pScintilla->StyleSetSize( iCount, iTemp ); pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ); pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ); pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount ) ); // Set the color of the style pScintilla->StyleSetFore( iCount, pSyntaxFile->GetStyleColorForeground( iCount ) ); pScintilla->StyleSetBack( iCount, pSyntaxFile->GetStyleColorBackground( iCount ) ); } // Set the keywords for the lexer for( iCount = 0; iCount <= KEYWORDSET_MAX; ++ iCount ) { szTemp = pSyntaxFile->GetDelimitedKeywordSet( iCount, ' ' ); if( !szTemp.IsEmpty() ) pScintilla->SetKeyWords( iCount, szTemp ); } } } /// Get SyntaxHighlighting for given language. BOOL CFileTypeManager::GetSyntaxHighlighting(int iLanguage) { CSyntaxFile* pSyntaxFile; pSyntaxFile = GetSyntaxFile( iLanguage ); if( NULL == pSyntaxFile ) return FALSE; if( !pSyntaxFile->Parse() ) return FALSE; return pSyntaxFile->GetSyntaxHighlighting(); } /** * We only want to do these settings the first time, on a change * of Preferences, we don't want the mess up the users menu * overridden settings. */ void CFileTypeManager::SetScintillaDefaultProperties(int iLanguage, CScintillaEx *pScintilla) { CSyntaxFile* pSyntaxFile; pSyntaxFile = GetSyntaxFile( iLanguage ); if( NULL == pSyntaxFile ) return; if( !pSyntaxFile->Parse() ) return; pScintilla->SetCaretLineVisible( pSyntaxFile->GetHighlightCurrentLine() ? 1 : 0 ); pScintilla->SetViewWS( pSyntaxFile->GetWhiteSpace() ? 1 : 0 ); pScintilla->SetViewEOL( pSyntaxFile->GetEOL() ? 1 : 0 ); pScintilla->SetWrapMode( pSyntaxFile->GetWordWrap() ? 1 : 0 ); pScintilla->SetUseTabs( pSyntaxFile->GetTabsToSpaces() ? false : true ); pScintilla->SetEdgeMode( pSyntaxFile->GetRightEdge() ); pScintilla->SetEdgeColour( RGB( 255, 255, 255 ) ); // These may need to be settable pScintilla->SetSelFore( false, RGB( 255, 255, 255 ) ); pScintilla->SetSelBack( true, RGB( 218, 218, 218) ); // pScintilla->SetSelFore( true, RGB( 255, 255, 255 ) ); // pScintilla->SetSelBack( true, RGB( 115, 113, 189 ) ); pScintilla->SetCaretLineBack( RGB( 255, 255, 238 ) ); pScintilla->SetCaretWidth( 1 ); // Set margins. // LineNumbers pScintilla->SetMarginWidthN( LINENUMBER_MARGIN_ID, pSyntaxFile->GetMarginLineNumber() ? LINENUMBER_MARGIN_SIZE : 0 ); pScintilla->SetMarginTypeN( LINENUMBER_MARGIN_ID, SC_MARGIN_NUMBER ); // Bookmark pScintilla->SetMarginWidthN( BOOKMARK_MARGIN_ID, pSyntaxFile->GetMarginBookmark() ? BOOKMARK_MARGIN_SIZE : 0 ); pScintilla->SetMarginTypeN( BOOKMARK_MARGIN_ID, SC_MARGIN_SYMBOL ); pScintilla->SetMarginMaskN( BOOKMARK_MARGIN_ID, ~SC_MASK_FOLDERS ); // Fold pScintilla->SetMarginWidthN( FOLD_MARGIN_ID, pSyntaxFile->GetMarginFold() ? FOLD_MARGIN_SIZE : 0 ); pScintilla->SetMarginTypeN( FOLD_MARGIN_ID, SC_MARGIN_SYMBOL ); pScintilla->SetMarginMaskN( FOLD_MARGIN_ID, SC_MASK_FOLDERS ); pScintilla->SetMarginSensitiveN( FOLD_MARGIN_ID, TRUE ); pScintilla->SetFoldingMargins( efsVSNet ); // Taken from AnyEditView::Init, need to be worked out. pScintilla->IndicSetStyle(0,INDIC_SQUIGGLE); pScintilla->IndicSetStyle(1,INDIC_TT); pScintilla->IndicSetStyle(2,INDIC_DIAGONAL); pScintilla->DefineMarker(SC_MARK_ARROW,SC_MARK_ARROW,RGB(0,0,255),RGB(231,231,255)); pScintilla->DefineMarker(SC_MARK_SHORTARROW,SC_MARK_SHORTARROW,RGB(107,27,18),RGB(251,252,226)); } /** Give a string with all keywords for a given language. The keywords * are separated by cSep. */ CString CFileTypeManager::GetDelimitedKeywords(int iLanguage, char cSep) { CString strKeyWords; strKeyWords.Empty(); CSyntaxFile* pSyntaxFile; pSyntaxFile = GetSyntaxFile( iLanguage ); if( NULL == pSyntaxFile ) return strKeyWords; if( !pSyntaxFile->Parse() ) return strKeyWords; return pSyntaxFile->GetDelimitedKeywords(cSep); } Index: AnyEditDoc.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AnyEditDoc.h 15 Mar 2004 13:08:48 -0000 1.10 --- AnyEditDoc.h 19 Apr 2004 19:06:20 -0000 1.11 *************** *** 9,22 **** #pragma once #endif // _MSC_VER > 1000 ! #include "scintillaif.h" ! #include "SyntaxFile.h" ! // Define the Margin ID's & Sizes ! #define LINENUMBER_MARGIN_ID 0 ! #define BOOKMARK_MARGIN_ID 1 ! #define FOLD_MARGIN_ID 2 ! #define LINENUMBER_MARGIN_SIZE 36 ! #define BOOKMARK_MARGIN_SIZE 16 ! #define FOLD_MARGIN_SIZE 14 class CAnyEditDoc : public CDocument --- 9,15 ---- #pragma once #endif // _MSC_VER > 1000 ! // #include "ScintillaEx.h" ! class CScintillaEx; class CAnyEditDoc : public CDocument *************** *** 32,36 **** BOOL bSyntaxHighlighting; // We want to keep track of the syntax highlighting setting. - CScintilla * m_pScintilla; CString szDocumentFilePath; CTime LastAccessTime; --- 25,28 ---- *************** *** 55,63 **** void ReloadDefaults(); void HasBeenModified(BOOL modified); ! void SetDocScintilla(CScintilla * m_pscin); int GetLanguageNr(); void SetLanguageNr( int iLanguageNr ); - void SetScintillaProperties(); BOOL GetSyntaxHighlighting(); void ToggleSyntaxHighlighting(); --- 47,54 ---- void ReloadDefaults(); void HasBeenModified(BOOL modified); ! void SetDocScintilla(CScintillaEx * m_pscin); int GetLanguageNr(); void SetLanguageNr( int iLanguageNr ); BOOL GetSyntaxHighlighting(); void ToggleSyntaxHighlighting(); *************** *** 70,73 **** --- 61,65 ---- protected: + int m_docPointer; ///< Doc Pointer of scintilla controls CString GetFileNameExtension( LPCTSTR lpszPathName ); void SetLastAccessTime(); Index: Misc.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Misc.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Misc.cpp 2 Dec 2003 12:03:35 -0000 1.6 --- Misc.cpp 19 Apr 2004 19:06:22 -0000 1.7 *************** *** 350,351 **** --- 350,402 ---- return TRUE; } + + /** Convert a short path to long path. + * If sShortPath is a long path then this path will be returned. This version works + * on Windows 95 or Win NT too. + * + * Original from Jase Jennings (NOS...@to...) + * Base on an article + * GetLongPathName API Function Emulation from www.CodeGuru.com + * written by Randall Garacci + */ + BOOL CMisc::ShortToLongPath(CString &sShortPath, CString &sLongPath) + { + USES_CONVERSION; + + LPSHELLFOLDER psfDesktop = NULL; + ULONG chEaten = 0; + LPITEMIDLIST pidlShellItem = NULL; + WCHAR szLongPath[_MAX_PATH] = { 0 }; + BOOL bResult = TRUE; + + // Get the Desktop's shell folder interface + HRESULT hr = SHGetDesktopFolder(&psfDesktop); + + LPCTSTR lpsz = (LPCTSTR)sShortPath; + LPWSTR lpwShortPath = A2W(lpsz); + + // Request an ID list (relative to the desktop) for the short pathname + hr = psfDesktop->ParseDisplayName(NULL, NULL, lpwShortPath, &chEaten, &pidlShellItem, NULL); + psfDesktop->Release(); // Release the desktop's IShellFolder + + if(FAILED(hr)) + { + // If we couldn't get an ID list for short pathname, it must not exist. + sLongPath.Empty(); + bResult = FALSE; + } + else + { + // We did get an ID list, convert it to a long pathname + SHGetPathFromIDListW(pidlShellItem, szLongPath); + + // Free the ID list allocated by ParseDisplayName + LPMALLOC pMalloc = NULL; + SHGetMalloc(&pMalloc); + pMalloc->Free(pidlShellItem); + pMalloc->Release(); + sLongPath = W2A(szLongPath); + } + + return bResult; + } Index: Language.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Language.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Language.cpp 12 Dec 2003 11:00:04 -0000 1.12 --- Language.cpp 19 Apr 2004 19:06:21 -0000 1.13 *************** *** 113,117 **** */ void ! CLanguage::FillUpScintilla(CScintilla * m_scintilla) { POSITION pos; --- 113,117 ---- */ void ! CLanguage::FillUpScintilla(CScintillaEx * m_scintilla) { POSITION pos; Index: scintillaif.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** scintillaif.h 26 Feb 2004 08:44:16 -0000 1.11 --- scintillaif.h 19 Apr 2004 19:06:22 -0000 1.12 *************** *** 1,6 **** #ifndef __SCINTILLAIF_H__ #define __SCINTILLAIF_H__ ! #include "stdafx.h" //! Block size for disk reading and writing. --- 1,23 ---- + /** + * @file ScintillaIF.h + * @brief Define scintilla wrapper class CScintilla [...3465 lines suppressed...] ! */ ! #endif --- 1904,1919 ---- * scintilla settings could be represented in a binary form. */ ! class CRecordingScintilla : public CScintilla { ! protected: ! virtual void Record(long Msg, WPARAM wParam, LPARAM lParam) = 0; ! public: ! inline long SPerform(long Msg, WPARAM wParam=0, LPARAM lParam=0) ! { ! // Record Message... ! Record(Msg, wParam, lParam); ! return 0; ! } }; ! ! #endif \ No newline at end of file Index: ChildFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChildFrm.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChildFrm.cpp 12 Apr 2004 15:11:41 -0000 1.3 --- ChildFrm.cpp 19 Apr 2004 19:06:21 -0000 1.4 *************** *** 116,126 **** } ! /// Add mini toolbar to AnyEditViews BOOL CChildFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) { - BOOL bRet = CMDIChildWnd::OnCreateClient(lpcs, pContext); - if (strcmp(pContext->m_pNewViewClass->m_lpszClassName, "CAnyEditView") == 0) { if(m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1)) { --- 116,138 ---- } ! /// Add splitter and mini toolbar to AnyEditViews. BOOL CChildFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) { if (strcmp(pContext->m_pNewViewClass->m_lpszClassName, "CAnyEditView") == 0) { + // CG: The following block was added by the Split Bars component. + { + if (!m_wndSplitter.Create(this, + 2, 2, // TODO: adjust the number of rows, columns + CSize(10, 10), // TODO: adjust the minimum pane size + pContext, + WS_CHILD | WS_VISIBLE | SPLS_DYNAMIC_SPLIT)) + { + TRACE0(_T("Failed to create split bar\n")); + return FALSE; // failed to create + } + + } + if(m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1)) { *************** *** 140,146 **** m_wndTool.SetBarStyle(CBRS_ALIGN_BOTTOM | CBRS_TOOLTIPS | CBRS_BORDER_TOP | CBRS_BORDER_LEFT | CBRS_BORDER_BOTTOM | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); } } ! ! return bRet; } --- 152,159 ---- m_wndTool.SetBarStyle(CBRS_ALIGN_BOTTOM | CBRS_TOOLTIPS | CBRS_BORDER_TOP | CBRS_BORDER_LEFT | CBRS_BORDER_BOTTOM | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); } + return TRUE; } ! else ! return CBCGMDIChildWnd::OnCreateClient(lpcs, pContext); } Index: FindReplace.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FindReplace.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FindReplace.h 18 Nov 2003 04:09:50 -0000 1.4 --- FindReplace.h 19 Apr 2004 19:06:21 -0000 1.5 *************** *** 8,12 **** // ! #include "scintillaif.h" #include "RegProfile.h" #include "Misc.h" --- 8,12 ---- // ! #include "ScintillaEx.h" #include "RegProfile.h" #include "Misc.h" *************** *** 18,22 **** // Construction public: ! CFindReplace(CWnd* pParent = NULL,CScintilla * m_scintilla=NULL); // standard constructor // Dialog Data --- 18,22 ---- // Construction public: ! CFindReplace(CWnd* pParent = NULL,CScintillaEx * m_scintilla=NULL); // standard constructor // Dialog Data *************** *** 44,48 **** protected: ! CScintilla * m_scintilla; CRegProfile m_reg; CMisc msc; --- 44,48 ---- protected: ! CScintillaEx * m_scintilla; CRegProfile m_reg; CMisc msc; --- NEW FILE: FileTypeManager.h --- // FileTypeManager.h: interface for the CFileTypeManager class. // ////////////////////////////////////////////////////////////////////// #if !defined(AFX_FILETYPEMANAGER_H__8CA4A23E_979E_4C71_92D9_46E1ED7FC2E9__INCLUDED_) #define AFX_FILETYPEMANAGER_H__8CA4A23E_979E_4C71_92D9_46E1ED7FC2E9__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 // Define the Margin ID's & Sizes #define LINENUMBER_MARGIN_ID 0 #define BOOKMARK_MARGIN_ID 1 #define FOLD_MARGIN_ID 2 #define LINENUMBER_MARGIN_SIZE 36 #define BOOKMARK_MARGIN_SIZE 16 #define FOLD_MARGIN_SIZE 14 class CConfigFile; class CSyntaxFile; class CFileTypeManager { public: /// Get keywords for a given language separated by cSep. CString GetDelimitedKeywords(int iLanguage, char cSep = ' '); /// Set default properties for a given language to a scintilla control. void SetScintillaDefaultProperties(int iLanguage, CScintillaEx* pScintilla); /// Give TRUE, when syntax highlighting is supported. BOOL GetSyntaxHighlighting(int iLanguage); /// Constructor CFileTypeManager(); /// Destructor virtual ~CFileTypeManager(); /// Initialize FileTypeManager void Init(CConfigFile *conf); /// Get the SyntaxFile object by it's language number. CSyntaxFile* GetSyntaxFile( int iLanguage ); /// Get the LanguageNr of ext. int GetLanguageNrFromExtension( CString szExtension ); /// Set properties for a given langugage to a scintilla control. void SetScintillaProperties(int iLanguage, CScintillaEx* pScintilla, BOOL bSyntaxHighlighting); protected: /// Map of language number pointing to a CSytnaxFile object. CMap<int, int, CSyntaxFile*, CSyntaxFile*> mapSyntaxFiles; /// Map of Extension strings pointing to a language number. CMapStringToString mapExtensions; /// Load all the configured syntax files. void LoadSyntaxFiles(CConfigFile *conf); /// Fill the map with extensions and language numbers void FillExtensionMap(CConfigFile *conf); }; #endif // !defined(AFX_FILETYPEMANAGER_H__8CA4A23E_979E_4C71_92D9_46E1ED7FC2E9__INCLUDED_) --- NEW FILE: ScintillaEx.cpp --- // SCintillaEx.cpp: Implementierung der Klasse CSCintillaEx. // ////////////////////////////////////////////////////////////////////// #include "stdafx.h" #include "stdafx.h" #include "ScintillaEx.h" #ifdef _DEBUG #undef THIS_FILE static char THIS_FILE[]=__FILE__; #define new DEBUG_NEW #endif ////////////////////////////////////////////////////////////////////// // Konstruktion/Destruktion ////////////////////////////////////////////////////////////////////// /// Constructor CScintillaEx::CScintillaEx() { } /// Destructor CScintillaEx::~CScintillaEx() { } /// Set focus to scintilla window. CWnd* CScintillaEx::SetFocus() { return CWnd::SetFocus(); } /// Set pointer for direct access on scintilla. void CScintillaEx::SetDirectFunctionAndPointer() { m_scihWnd = this->m_hWnd; m_Pointer = (void *) SPerform(SCI_GETDIRECTPOINTER); Perform = (scmsgfn) SPerform(SCI_GETDIRECTFUNCTION); } /// Set auto indent mode. void CScintillaEx::SetAutoIndent(bool bIndent) { m_bAutoIndent = bIndent; } /// Get auto indent mode. bool CScintillaEx::GetAutoIndent() { return m_bAutoIndent; } /// Get line number of current line where cursor is in. int CScintillaEx::GetCurLineNumber() { return LineFromPosition(GetCurrentPos()); } /// Get the cursor position in current line. int CScintillaEx::GetCaretInLine() { int caret = GetCurrentPos(); int line = LineFromPosition(caret); int lineStart = PositionFromLine(line); return caret - lineStart; } /// Get begin and end of selection as CharacterRange. CharacterRange CScintillaEx::GetSelection() { CharacterRange crange; crange.cpMin = GetSelectionStart(); crange.cpMax = GetSelectionEnd(); return crange; } /// Get text from a text range. void CScintillaEx::GetRange(long start, long end, char *text) { CScintilla::GetRange(start, end, text); } /// Performs a macro. void CScintillaEx::PerformMacro(MacroHolder *macro) { MacroHolder * mymacro = macro; while(mymacro) { if(mymacro->message == SCI_REPLACESEL) SPerform(mymacro->message, mymacro->wParam, (LPARAM)mymacro->replacesel); else SPerform(mymacro->message, mymacro->wParam, mymacro->lParam); mymacro = mymacro->next; } } /// Get selected text as CString. CString CScintillaEx::GetSelText() { int nStartSel = GetSelectionStart(); int nEndSel = GetSelectionEnd(); char* pszSelText = new char[nEndSel - nStartSel + 1]; CScintilla::GetSelText(pszSelText); CString sSelText(pszSelText); delete [] pszSelText; return sSelText; } Index: AnyEdit.dsp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AnyEdit.dsp 15 Mar 2004 13:08:48 -0000 1.31 --- AnyEdit.dsp 19 Apr 2004 19:06:20 -0000 1.32 *************** *** 1,23 **** # Microsoft Developer Studio Project File - Name="AnyEdit" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=AnyEdit - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak". !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak" CFG="AnyEdit - Win32 Debug" !MESSAGE ! !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "AnyEdit - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE "AnyEdit - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE --- 1,23 ---- # Microsoft Developer Studio Project File - Name="AnyEdit" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** NICHT BEARBEITEN ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=AnyEdit - Win32 Debug ! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE ! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak". !MESSAGE ! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben ! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "AnyEdit.mak" CFG="AnyEdit - Win32 Debug" !MESSAGE ! !MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE ! !MESSAGE "AnyEdit - Win32 Release" (basierend auf "Win32 (x86) Application") ! !MESSAGE "AnyEdit - Win32 Debug" (basierend auf "Win32 (x86) Application") !MESSAGE *************** *** 384,387 **** --- 384,391 ---- # Begin Source File + SOURCE=.\FileTypeManager.cpp + # End Source File + # Begin Source File + SOURCE=.\FindDialog.cpp # End Source File *************** *** 412,415 **** --- 416,423 ---- # Begin Source File + SOURCE=.\ScintillaEx.cpp + # End Source File + # Begin Source File + SOURCE=.\SeException.cpp # End Source File *************** *** 999,1002 **** --- 1007,1014 ---- # Begin Source File + SOURCE=.\FileTypeManager.h + # End Source File + # Begin Source File + SOURCE=.\FindDialog.h # End Source File *************** *** 1103,1106 **** --- 1115,1122 ---- # Begin Source File + SOURCE=.\ScintillaEx.h + # End Source File + # Begin Source File + SOURCE=.\includes\StdAfx.h # End Source File Index: scintillaif.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** scintillaif.cpp 27 Feb 2004 08:45:22 -0000 1.14 --- scintillaif.cpp 19 Apr 2004 19:06:22 -0000 1.15 *************** *** 1,218 **** #include "stdafx.h" #include "scintillaif.h" // Initialise no Scintilla dll on startup... HMODULE CScintilla::scidll = NULL; int CScintilla::refs = 0; - - //IMPLEMENT_DYNCREATE(CScintilla, CWnd) - [...4729 lines suppressed...] + { + SPerform(SCI_SETPROPERTY, (long)key, (long)value); + } + + void CScintilla::SetKeyWords(int keywordSet, const char* keyWords) + { + SPerform(SCI_SETKEYWORDS, (long)keywordSet, (long)keyWords); + } + + void CScintilla::SetLexerLanguage(const char* language) + { + SPerform(SCI_SETLEXERLANGUAGE, 0, (long)language); + } + + void CScintilla::LoadLexerLibrary(const char* path) + { + SPerform(SCI_LOADLEXERLIBRARY, 0, (long)path); + } + + //-- Index: AnyEdit.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** AnyEdit.h 6 Apr 2004 09:01:36 -0000 1.36 --- AnyEdit.h 19 Apr 2004 19:06:20 -0000 1.37 *************** *** 31,36 **** #include "Plugin.h" #include "ConfigFile.h" ! #include "SyntaxFile.h" ! #include "scintillaif.h" //Save final position --- 31,36 ---- #include "Plugin.h" #include "ConfigFile.h" ! #include "ScintillaEx.h" ! #include "FileTypeManager.h" //Save final position *************** *** 70,75 **** void LoadCustomState(); void SaveCustomState(); - void AddLangType(LPCSTR lang); - BOOL IsLangPresent(LPCSTR lang); void SetAppPath(LPCSTR appPath); LPCSTR GetAppPath(); --- 70,73 ---- *************** *** 94,98 **** LPCSTR GetCurDocPath(); void ResetClassView(LPCSTR str,BOOL parseForProject=false); - CString GetCompFilePathFromLang(LPCSTR lang); BOOL LockTagList(); void UnlockTagList(); --- 92,95 ---- *************** *** 142,153 **** // The main user config file for AnyEdit. CConfigFile ConfigFile; ! // Map of language number pointing to a CSytnaxFile object. ! CMap<int, int, CSyntaxFile*, CSyntaxFile*> mapSyntaxFiles; ! // Map of Extension strings pointing to a language number. ! CMapStringToString mapExtensions; // String with the name of the current user CString szUserName; protected: void LoadDocumentPosition(); void SaveDocumentPosition(); --- 139,148 ---- // The main user config file for AnyEdit. CConfigFile ConfigFile; ! // String with the name of the current user CString szUserName; protected: + CFileTypeManager m_fileTypeManager; void LoadDocumentPosition(); void SaveDocumentPosition(); *************** *** 159,177 **** BOOL ReadConfigFile(); - // Fill the map with extensions and language numbers - void FillExtensionMap(); - - // Load all the configured syntax files. - void LoadSyntaxFiles(); public: // Get a reference to the config file. Used in the Preferences dialogs CConfigFile* GetConfigFile(); - // Get the SyntaxFile object by it's language number. - CSyntaxFile* GetSyntaxFile( int iLanguage ); - - // Get the LanguageNr of ext. - int GetLanguageNrFromExtension( CString szExtension ); - // Overrides // ClassWizard generated virtual function overrides --- 154,163 ---- BOOL ReadConfigFile(); public: + CString GetCurrentUser(void); + CFileTypeManager* GetFileTypeManager(void); // Get a reference to the config file. Used in the Preferences dialogs CConfigFile* GetConfigFile(); // Overrides // ClassWizard generated virtual function overrides Index: AnyEditDoc.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AnyEditDoc.cpp 6 Apr 2004 09:01:36 -0000 1.20 --- AnyEditDoc.cpp 19 Apr 2004 19:06:20 -0000 1.21 *************** *** 8,11 **** --- 8,12 ---- #include "AnyEditView.h" #include <memory> + #include "ScintillaEx.h" #ifdef _DEBUG *************** *** 35,40 **** bFirstTimeProperties = TRUE; bSyntaxHighlighting = TRUE; - m_pScintilla = NULL; LastAccessTime = 0; } --- 36,41 ---- bFirstTimeProperties = TRUE; bSyntaxHighlighting = TRUE; LastAccessTime = 0; + m_docPointer = NULL; } *************** *** 108,111 **** --- 109,113 ---- } + /// Open a document which is given in lpszPathName. BOOL CAnyEditDoc::OnOpenDocument(LPCTSTR lpszPathName) { *************** *** 113,129 **** // Set the language number from the extension ! iLanguage = theApp.GetLanguageNrFromExtension( GetFileNameExtension( lpszPathName ) ); ! ! // Set the Scintilla properties ! SetScintillaProperties(); // Use Scintilla to open the file. ! m_pScintilla->OpenFile( lpszPathName ); SetPathName( lpszPathName ); SetLastAccessTime(); return TRUE; } BOOL CAnyEditDoc::OnSaveDocument(LPCTSTR lpszPathName) { --- 115,135 ---- // Set the language number from the extension ! iLanguage = theApp.GetFileTypeManager()->GetLanguageNrFromExtension( GetFileNameExtension( lpszPathName ) ); ! bSyntaxHighlighting = theApp.GetFileTypeManager()->GetSyntaxHighlighting(iLanguage); // Use Scintilla to open the file. ! POSITION pos = GetFirstViewPosition(); ! CAnyEditView* pFirstView = (CAnyEditView *) GetNextView( pos ); ! pFirstView->GetScintillaControl()->OpenFile( lpszPathName ); SetPathName( lpszPathName ); SetLastAccessTime(); + // Set the Scintilla properties + UpdateAllViews(NULL, VIEW_SYNTAX); + return TRUE; } + /// Save a document to a file which is given in lpszPathName. BOOL CAnyEditDoc::OnSaveDocument(LPCTSTR lpszPathName) { *************** *** 136,140 **** // Save it. ! BOOL saved = m_pScintilla->SaveFile(lpszPathName); if(saved) { --- 142,148 ---- // Save it. ! POSITION pos = GetFirstViewPosition(); ! CAnyEditView* pFirstView = (CAnyEditView *) GetNextView( pos ); ! BOOL saved = pFirstView->GetScintillaControl()->SaveFile(lpszPathName); if(saved) { *************** *** 142,154 **** // Check if we need to update the scintilla properties ! iTempLanguage = theApp.GetLanguageNrFromExtension( GetFileNameExtension( lpszPathName ) ); if( iLanguage != iTempLanguage ) { // Save the language nr. iLanguage = iTempLanguage; // Set FirstTimeProperties true, so we set all properties. bFirstTimeProperties = TRUE; // Set the Scintilla properties. ! SetScintillaProperties(); } --- 150,164 ---- // Check if we need to update the scintilla properties ! iTempLanguage = theApp.GetFileTypeManager()->GetLanguageNrFromExtension( GetFileNameExtension( lpszPathName ) ); if( iLanguage != iTempLanguage ) { // Save the language nr. iLanguage = iTempLanguage; + // Set FirstTimeProperties true, so we set all properties. bFirstTimeProperties = TRUE; + // Set the Scintilla properties. ! UpdateAllViews(NULL, VIEW_SYNTAX); } *************** *** 216,227 **** msg+= str; msg+= "'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?"; if(AfxMessageBox(msg,MB_YESNO)==IDYES) { ! m_pScintilla->SetFocus(); ! m_pScintilla->OpenFile(str); } else { ! m_pScintilla->SetFocus(); LastAccessTime = 0; } --- 226,239 ---- msg+= str; msg+= "'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?"; + POSITION pos = GetFirstViewPosition(); + CAnyEditView* pFirstView = (CAnyEditView *) GetNextView( pos ); if(AfxMessageBox(msg,MB_YESNO)==IDYES) { ! pFirstView->GetScintillaControl()->SetFocus(); ! pFirstView->GetScintillaControl()->OpenFile(str); } else { ! pFirstView->GetScintillaControl()->SetFocus(); LastAccessTime = 0; } *************** *** 271,278 **** } void CAnyEditDoc::ReloadDefaults() { ! SetScintillaProperties(); ! UpdateAllViews( NULL ); } --- 283,290 ---- } + /// Reloads default for configuration for all views. void CAnyEditDoc::ReloadDefaults() { ! UpdateAllViews( NULL, VIEW_SYNTAX ); } *************** *** 281,285 **** BOOL bResult=false; ! if (!m_pScintilla) { return bResult; --- 293,297 ---- BOOL bResult=false; ! if (!m_docPointer) { return bResult; *************** *** 297,304 **** return bResult; } ! int filsize = m_pScintilla->GetTextLength(); std::auto_ptr<char> fil(new char[filsize+100]); ! m_pScintilla->GetText(filsize,fil.get()); fp.Write(fil.get(),filsize); --- 309,318 ---- return bResult; } ! POSITION pos = GetFirstViewPosition(); ! CAnyEditView* pFirstView = (CAnyEditView *) GetNextView( pos ); ! int filsize = pFirstView->GetScintillaControl()->GetTextLength(); std::auto_ptr<char> fil(new char[filsize+100]); ! pFirstView->GetScintillaControl()->GetText(filsize,fil.get()); fp.Write(fil.get(),filsize); *************** *** 316,322 **** } ! void CAnyEditDoc::SetDocScintilla(CScintilla * m_pscin) { ! m_pScintilla = m_pscin; } --- 330,343 ---- } ! void CAnyEditDoc::SetDocScintilla(CScintillaEx * m_pscin) { ! if (m_docPointer == NULL) ! { ! m_docPointer = m_pscin->GetDocPointer(); ! } ! else ! { ! m_pscin->SetDocPointer(m_docPointer); ! } } *************** *** 327,462 **** } ! // Sets the Language number of the Language associated with the document. void CAnyEditDoc::SetLanguageNr( int iLanguageNr ) { iLanguage = iLanguageNr; ! } ! ! // This function sets all the Properties of the ! // Scintilla object from a Syntaxfile. ! void CAnyEditDoc::SetScintillaProperties() ! { ! int iCount; ! CSyntaxFile* pSyntaxFile; ! CString szTemp; ! int iTemp; ! CMapStringToString mapLexerProps; ! POSITION pos; ! ! pSyntaxFile = theApp.GetSyntaxFile( iLanguage ); ! if( NULL == pSyntaxFile ) return; ! ! if( !pSyntaxFile->Parse() ) return; ! ! // Clear the Scintilla object ! m_pScintilla->StyleClearAll(); ! ! // Do some default AnyEdit settings ! m_pScintilla->StyleSetEOLFilled( STYLE_DEFAULT, true ); ! m_pScintilla->UsePopUp( false ); ! ! if( bFirstTimeProperties ) ! { ! // We only want to do these settings the first time, on a change ! // of Preferences, we don't want the mess up the users menu ! // overridden settings. ! ! bSyntaxHighlighting = pSyntaxFile->GetSyntaxHighlighting(); ! m_pScintilla->SetCaretLineVisible( pSyntaxFile->GetHighlightCurrentLine() ? 1 : 0 ); ! m_pScintilla->SetViewWS( pSyntaxFile->GetWhiteSpace() ? 1 : 0 ); ! m_pScintilla->SetViewEOL( pSyntaxFile->GetEOL() ? 1 : 0 ); ! m_pScintilla->SetWrapMode( pSyntaxFile->GetWordWrap() ? 1 : 0 ); ! m_pScintilla->SetUseTabs( pSyntaxFile->GetTabsToSpaces() ? false : true ); ! m_pScintilla->SetEdgeMode( pSyntaxFile->GetRightEdge() ); ! m_pScintilla->SetEdgeColour( RGB( 255, 255, 255 ) ); ! ! // These may need to be settable ! m_pScintilla->SetSelFore( true, RGB( 255, 255, 255 ) ); ! m_pScintilla->SetSelBack( true, RGB( 115, 113, 189 ) ); ! m_pScintilla->SetCaretLineBack( RGB( 255, 255, 238 ) ); ! m_pScintilla->SetCaretWidth( 1 ); ! ! // Set margins. ! // LineNumbers ! m_pScintilla->SetMarginWidthN( LINENUMBER_MARGIN_ID, pSyntaxFile->GetMarginLineNumber() ? LINENUMBER_MARGIN_SIZE : 0 ); ! m_pScintilla->SetMarginTypeN( LINENUMBER_MARGIN_ID, SC_MARGIN_NUMBER ); ! // Bookmark ! m_pScintilla->SetMarginWidthN( BOOKMARK_MARGIN_ID, pSyntaxFile->GetMarginBookmark() ? BOOKMARK_MARGIN_SIZE : 0 ); ! m_pScintilla->SetMarginTypeN( BOOKMARK_MARGIN_ID, SC_MARGIN_SYMBOL ); ! m_pScintilla->SetMarginMaskN( BOOKMARK_MARGIN_ID, ~SC_MASK_FOLDERS ); ! // Fold ! m_pScintilla->SetMarginWidthN( FOLD_MARGIN_ID, pSyntaxFile->GetMarginFold() ? FOLD_MARGIN_SIZE : 0 ); ! m_pScintilla->SetMarginTypeN( FOLD_MARGIN_ID, SC_MARGIN_SYMBOL ); ! m_pScintilla->SetMarginMaskN( FOLD_MARGIN_ID, SC_MASK_FOLDERS ); ! m_pScintilla->SetMarginSensitiveN( FOLD_MARGIN_ID, TRUE ); ! m_pScintilla->SetFoldingMargins( efsVSNet ); ! ! // Taken from AnyEditView::Init, need to be worked out. ! m_pScintilla->IndicSetStyle(0,INDIC_SQUIGGLE); ! m_pScintilla->IndicSetStyle(1,INDIC_TT); ! m_pScintilla->IndicSetStyle(2,INDIC_DIAGONAL); ! m_pScintilla->DefineMarker(SC_MARK_ARROW,SC_MARK_ARROW,RGB(0,0,255),RGB(231,231,255)); ! m_pScintilla->DefineMarker(SC_MARK_SHORTARROW,SC_MARK_SHORTARROW,RGB(107,27,18),RGB(251,252,226)); ! ! } ! m_pScintilla->SetTabWidth( pSyntaxFile->GetTabWidth() ); ! m_pScintilla->SetEdgeColumn( pSyntaxFile->GetRightEdgeColumn() ); ! ! // Indentation ! m_pScintilla->SetTabIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); ! m_pScintilla->SetBackSpaceUnIndents( pSyntaxFile->GetIndent() ? 1 : 0 ); ! m_pScintilla->SetIndent( pSyntaxFile->GetIndentSize() ); ! m_pScintilla->SetAutoIndent( pSyntaxFile->GetAutoIndent() ); ! m_pScintilla->SetIndentationGuides( pSyntaxFile->GetIndentGuides() ? 1 : 0 ); ! ! // Set the number of Stylebits ! iTemp = pSyntaxFile->GetStyleBits(); ! if( -1 != iTemp ) m_pScintilla->SetStyleBits( iTemp ); ! ! if( bSyntaxHighlighting ) ! { ! // Set the lexer ! iTemp = pSyntaxFile->GetLexerNumber(); ! if( -1 != iTemp ) m_pScintilla->SetLexer( iTemp ); ! ! // Set the lexer properties ! if( 0 < pSyntaxFile->GetLexerProperties( mapLexerProps ) ) ! { ! CString szTemp2; ! pos = mapLexerProps.GetStartPosition(); ! while( NULL != pos ) ! { ! mapLexerProps.GetNextAssoc( pos, szTemp, szTemp2 ); ! m_pScintilla->SetProperty( szTemp, szTemp2 ); ! } ! } ! ! // Set properties of each style if it is defined in the syntax ! for( iCount = 0; iCount <= STYLE_MAX; ++ iCount ) ! { ! // Set the font properties of the style ! szTemp = pSyntaxFile->GetStyleFontName( iCount ); ! if( !szTemp.IsEmpty() ) m_pScintilla->StyleSetFont( iCount, szTemp ); ! iTemp = pSyntaxFile->GetStyleFontSize( iCount ); ! if( -1 != iTemp ) m_pScintilla->StyleSetSize( iCount, iTemp ); ! m_pScintilla->StyleSetBold( iCount, pSyntaxFile->GetStyleFontBold( iCount ) ); ! m_pScintilla->StyleSetItalic( iCount, pSyntaxFile->GetStyleFontItalic( iCount ) ); ! m_pScintilla->StyleSetUnderline( iCount, pSyntaxFile->GetStyleFontUnderline( iCount ) ); ! ! // Set the color of the style ! m_pScintilla->StyleSetFore( iCount, pSyntaxFile->GetStyleColorForeground( iCount ) ); ! m_pScintilla->StyleSetBack( iCount, pSyntaxFile->GetStyleColorBackground( iCount ) ); ! ! } ! ! // Set the keywords for the lexer ! for( iCount = 0; iCount <= KEYWORDSET_MAX; ++ iCount ) ! { ! szTemp = pSyntaxFile->GetDelimitedKeywordSet( iCount, ' ' ); ! if( !szTemp.IsEmpty() ) m_pScintilla->SetKeyWords( iCount, szTemp ); ! } ! } ! ! bFirstTimeProperties = FALSE; // Done first round and keep it false every other round. } --- 348,356 ---- } ! /// Sets the Language number of the Language associated with the document. void CAnyEditDoc::SetLanguageNr( int iLanguageNr ) { iLanguage = iLanguageNr; ! UpdateAllViews(NULL, VIEW_SYNTAX); } *************** *** 469,471 **** --- 363,366 ---- { bSyntaxHighlighting = bSyntaxHighlighting ? 0 : 1; + UpdateAllViews(NULL, VIEW_SYNTAX); } Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** AnyEdit.cpp 6 Apr 2004 09:01:36 -0000 1.44 --- AnyEdit.cpp 19 Apr 2004 19:06:20 -0000 1.45 *************** *** 41,44 **** --- 41,45 ---- #include "HtmlFile.h" #include "SAPrefsDialog.h" + #include "FileTypeManager.h" // for checking leaks *************** *** 97,102 **** CAnyEditApp::~CAnyEditApp() { - POSITION pos; - if( macroholder ) { --- 98,101 ---- *************** *** 106,119 **** } - - // Cleanup Syntax File objects - pos = mapSyntaxFiles.GetStartPosition(); - while( NULL != pos ) - { - int iLanguageNr; - CSyntaxFile* pSyntaxFile = NULL; - mapSyntaxFiles.GetNextAssoc( pos, iLanguageNr, pSyntaxFile ); - if( NULL != pSyntaxFile ) delete pSyntaxFile; - } } ///////////////////////////////////////////////////////////////////////////// --- 105,108 ---- *************** *** 665,674 **** } ! CDocument* CAnyEditApp::OpenDocumentFile(LPCTSTR lpszFileName) { - CMisc m_misc; CString ext = m_misc.GetFileExtension(lpszFileName); CString tempStr = _T("AEW"); --- 654,667 ---- } ! /// Open a document file. CDocument* CAnyEditApp::OpenDocumentFile(LPCTSTR lpszFileName) { CMisc m_misc; + CString strShortFileName = lpszFileName; + CString strLongFileName; + + m_misc.ShortToLongPath(strShortFileName, strLongFileName); + CString ext = m_misc.GetFileExtension(lpszFileName); CString tempStr = _T("AEW"); *************** *** 677,686 **** if(ext==_T("AEW")) { ! LoadWorkspaceFile(lpszFileName); return NULL; } else if(ext==tempStr) //open from message { ! tempStr = lpszFileName; tempStr.Delete(0); tempStr.Delete(tempStr.GetLength()-1); --- 670,679 ---- if(ext==_T("AEW")) { ! LoadWorkspaceFile(strLongFileName); return NULL; } else if(ext==tempStr) //open from message { ! tempStr = strLongFileName; tempStr.Delete(0); tempStr.Delete(tempStr.GetLength()-1); *************** *** 690,694 **** else if(ext==_T("AEP")) { ! LoadProjectFile(lpszFileName); return NULL; } --- 683,687 ---- else if(ext==_T("AEP")) { ! LoadProjectFile(strLongFileName); return NULL; } *************** *** 697,701 **** if(ext==tempStr) { ! tempStr = lpszFileName; tempStr.Delete(0); tempStr.Delete(tempStr.GetLength()-1); --- 690,694 ---- if(ext==tempStr) { ! tempStr = strLongFileName; tempStr.Delete(0); tempStr.Delete(tempStr.GetLength()-1); *************** *** 703,707 **** return NULL; } ! return CWinApp::OpenDocumentFile(lpszFileName); } --- 696,700 ---- return NULL; } ! return CWinApp::OpenDocumentFile(strLongFileName); } *************** *** 1111,1130 **** } - CString CAnyEditApp::GetCompFilePathFromLang(LPCSTR lang) - { - CHAR tempStr[1024]; - CString Sep =_T("\\"); - CString langStr = SEC_LANG + Sep + lang; - langStr=m_reg.GetProfileString(langStr,_T("ACPFile"),tempStr,_T("")); - if(langStr.IsEmpty()) - return langStr; - CString retStr = theApp.GetAppPath(); - theApp.SetAppPath(retStr); - retStr+= _T("Syntax\\"); - retStr+= langStr; - return retStr; - } - - void CAnyEditApp::UpdateStatus(int lineno, int colno, int filetype, int overwrite, int readfile) { --- 1104,1107 ---- *************** *** 1559,1565 **** } ! // Reading the configuration file. ! FillExtensionMap(); ! LoadSyntaxFiles(); return TRUE; --- 1536,1541 ---- } ! // Reading the configuration file. ! m_fileTypeManager.Init(GetConfigFile()); return TRUE; *************** *** 1572,1720 **** } - // Fill the extension map with all the extension - // from the config file and 'koppelen' it with a - // Language number. - void CAnyEditApp::FillExtensionMap() - { - int iCount; - int iNrLanguages; - CString szExtensions; - CString szUppercaseExtension; - CString szLanguageNr; - iNrLanguages = ConfigFile.GetLanguageCount(); - for( iCount = 0; iCount < iNrLanguages; ++ iCount ) - { - szExtensions = ConfigFile.GetLanguageExtensions( iCount ); - if( !szExtensions.IsEmpty() ) - { - // Seperate the string with extensions - int iStart = 0; - int iEnd = 0; - - // Change the LanguageNr to String - szLanguageNr.Format( "%i", iCount ); - - while( iEnd >= 0 ) - { - iEnd = szExtensions.Find( ',', iStart ); - if( -1 != iEnd ) - { - // Add the found extension to the map - szUppercaseExtension = szExtensions.Mid( iStart, iEnd - iStart ); - szUppercaseExtension.MakeUpper(); - mapExtensions.SetAt( szUppercaseExtension, szLanguageNr ); - iStart = iEnd + 1; - } - } - // Don't forget to add the last one - if( iStart < szExtensions.GetLength() ) - { - szUppercaseExtension = szExtensions.Mid( iStart, szExtensions.GetLength() - iStart ); - szUppercaseExtension.MakeUpper(); - mapExtensions.SetAt( szUppercaseExtension, szLanguageNr ); - } - } - } - } - - int CAnyEditApp::GetLanguageNrFromExtension( CString szExtension ) - { - CString szLanguageNr = "0"; - - // Make upper to be sure. - szExtension.MakeUpper(); - - mapExtensions.Lookup( szExtension, szLanguageNr ); - - return atoi( szLanguageNr ); - } - - // Load all the Syntax files that are set in the - // config file. These objects will be used to fill - // the Scintilla object. - void CAnyEditApp::LoadSyntaxFiles() - { - int iCount; - FILE* fp; - POSITION pos; - CString szFileName; - CSyntaxFile* pSyntaxFile; - - // Clear the list - pos = mapSyntaxFiles.GetStartPosition(); - while( NULL != pos ) - { - int iLanguage; - mapSyntaxFiles.GetNextAssoc( pos, iLanguage, pSyntaxFile ); - if( NULL != pSyntaxFile ) delete pSyntaxFile; - } - mapSyntaxFiles.RemoveAll(); - - // Get the Language count. - int iNrLanguages = ConfigFile.GetLanguageCount(); - - for( iCount = 0; iCount < iNrLanguages; ++ iCount ) - { - pSyntaxFile = new CSyntaxFile(); - if( NULL == pSyntaxFile ) continue; // throw memory exception! - - // Get the filename of the Syntax file - szFileName = GetAppPath(); - szFileName += CONFIG_DIR; - szFileName += szUserName; - szFileName += '\\'; - szFileName += SYNTAX_DIR; - szFileName += ConfigFile.GetLanguageSyntaxFileName( iCount ); - pSyntaxFile->SetFilename( szFileName ); - - fp = fopen( szFileName, "rw" ); - // Read the syntax definitions from the file. - if( !fp ) - { - CFile file1; - CFile file2; - UINT bytesRead; - char filebuffer[1024]; - // The username file doesn't exist read the default - CString szDefaultFileName=GetAppPath(); - szDefaultFileName += CONFIG_DIR; - szDefaultFileName += DEFAULT_DIR; - szDefaultFileName += SYNTAX_DIR; - szDefaultFileName += ConfigFile.GetLanguageSyntaxFileName( iCount ); - - if( !file1.Open( szDefaultFileName, CFile::modeRead | CFile::typeBinary ) ) - { - continue; - } - - if( !file2.Open( szFileName, CFile::modeCreate | CFile::modeWrite | CFile::typeBinary ) ) - { - continue; - } - - bytesRead = 1; - while( bytesRead ) - { - bytesRead = file1.Read( filebuffer, 1024 ); - if( bytesRead ) file2.Write( filebuffer, bytesRead ); - } - } - else - { - fclose( fp ); - } - // Add the parsed object to the Syntax file map. - mapSyntaxFiles.SetAt( iCount, pSyntaxFile ); - } - } - - // Find the SyntaxFile object by it's language number - CSyntaxFile* CAnyEditApp::GetSyntaxFile( int iLanguage ) - { - CSyntaxFile* pSyntaxFile; - mapSyntaxFiles.Lookup( iLanguage, pSyntaxFile ); - return pSyntaxFile; - } - void CAnyEditApp::SetModification( BOOL modval ) { --- 1548,1551 ---- *************** *** 1762,1766 **** } - void CAnyEditApp::OnConfigurePreferences() { --- 1593,1596 ---- *************** *** 1772,1778 **** dlg->SetTitle( "Preferences" ); dlg->DoModal(); ! FillExtensionMap(); ! LoadSyntaxFiles(); delete dlg; } --- 1602,1619 ---- dlg->SetTitle( "Preferences" ); dlg->DoModal(); ! m_fileTypeManager.Init(GetConfigFile()); delete dlg; } + + /// Get a pointer to FileTypeManager. + CFileTypeManager* CAnyEditApp::GetFileTypeManager() + { + return &m_fileTypeManager; + } + + /// Get Name of current User. + CString CAnyEditApp::GetCurrentUser() + { + return szUserName; + } Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ChangeLog.txt 12 Apr 2004 15:11:41 -0000 1.43 --- ChangeLog.txt 19 Apr 2004 19:06:21 -0000 1.44 *************** *** 22,25 **** --- 22,34 ---- 17) add toggle visibility of EOLs to mini toolbar 18) add some missing hints for buttons of minitoolbar + 19) add new class CScintillaEx. CScintilla was created from scintilla.ifacs. + CScintillaEx is extension class for new features. + 20) add new class CFileTypeManager. This class handles file types. + 21) New window and Split window works now. CAnyEditDoc saves doc pointer from scintilla. + CChildFrame got splitter window. + 22) Bad bracket matches are shown in red. Bracket highlighting uses indent highlighting. + 23) ShortFilenames are converted with CMisc.ShortToLongPath. + This is used in OpenDocumentFile [#875940] + Beta 2.0 [Tester's Release 2] --- NEW FILE: ScintillaEx.h --- (This appears to be a binary file; contents omitted.) Index: Misc.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Misc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Misc.h 2 Dec 2003 12:03:35 -0000 1.4 --- Misc.h 19 Apr 2004 19:06:22 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- { public: + BOOL ShortToLongPath(CString &sShortPath, CString &sLongPath); BOOL WriteStringToFile(CString str,LPCSTR filPath); BOOL IsFileReadOnly(LPCSTR filPath); Index: FindReplace.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FindReplace.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FindReplace.cpp 21 Nov 2003 13:53:00 -0000 1.8 --- FindReplace.cpp 19 Apr 2004 19:06:21 -0000 1.9 *************** *** 18,22 **** ! CFindReplace::CFindReplace(CWnd* pParent /*=NULL*/,CScintilla * m_scin) : CDialog(CFindReplace::IDD, pParent) { --- 18,22 ---- ! CFindReplace::CFindReplace(CWnd* pParent /*=NULL*/,CScintillaEx * m_scin) : CDialog(CFindReplace::IDD, pParent) { Index: Language.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Language.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Language.h 25 Nov 2003 15:05:56 -0000 1.4 --- Language.h 19 Apr 2004 19:06:22 -0000 1.5 *************** *** 12,16 **** #include <afxtempl.h> ! #include "scintillaif.h" #include "Misc.h" #include "AutoComp.h" --- 12,16 ---- #include <afxtempl.h> ! #include "ScintillaEx.h" #include "Misc.h" #include "AutoComp.h" *************** *** 75,79 **** //plenty more to come :) ! void FillUpScintilla(CScintilla * m_scintilla); }; --- 75,79 ---- //plenty more to come :) ! void FillUpScintilla(CScintillaEx * m_scintilla); }; Index: ChildFrm.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChildFrm.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChildFrm.h 12 Apr 2004 15:11:41 -0000 1.3 --- ChildFrm.h 19 Apr 2004 19:06:21 -0000 1.4 *************** *** 46,49 **** --- 46,50 ---- CRegProfile m_reg; ///< access to configuration file CToolBar m_wndTool; ///< mini toolbar + CSplitterWnd m_wndSplitter; ///< Splitter window //{{AFX_MSG(CChildFrame) afx_msg void OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd); Index: SAPrefsDialog.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SAPrefsDialog.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SAPrefsDialog.cpp 6 Apr 2004 09:01:36 -0000 1.9 --- SAPrefsDialog.cpp 19 Apr 2004 19:06:22 -0000 1.10 *************** *** 210,214 **** for( iCount = 1; iCount < iNrOfLanguages; ++ iCount ) { ! pSyntaxFile = theApp.GetSyntaxFile( iCount ); AddPage( m_pEditorPref[iCount], pConfigFile->GetLanguageName( iCount ), &dlgLang ); m_pEditorPref[iCount].SetDataFile( (CObject*)pSyntaxFile ); --- 210,214 ---- for( iCount = 1; iCount < iNrOfLanguages; ++ iCount ) { ! pSyntaxFile = theApp.GetFileTypeManager()->GetSyntaxFile( iCount ); AddPage( m_pEditorPref[iCount], pConfigFile->GetLanguageName( iCount ), &dlgLang ); m_pEditorPref[iCount].SetDataFile( (CObject*)pSyntaxFile ); *************** *** 573,577 **** // Here we actually save the data to disk. The pages save // it in memory (the SyntaxFile object). ! pSyntaxFile = theApp.GetSyntaxFile( iCount ); pSyntaxFile->Save(); } --- 573,577 ---- // Here we actually save the data to disk. The pages save // it in memory (the SyntaxFile object). ! pSyntaxFile = theApp.GetFileTypeManager()->GetSyntaxFile( iCount ); pSyntaxFile->Save(); } Index: FindDialog.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FindDialog.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FindDialog.cpp 2 Dec 2003 12:03:35 -0000 1.12 --- FindDialog.cpp 19 Apr ... [truncated message content] |
|
From: boca4711 <boc...@us...> - 2004-04-12 15:25:35
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9087 Modified Files: AnyEdit.rc AnyEditView.cpp AnyEditView.h ChangeLog.txt ChildFrm.cpp ChildFrm.h GeneralPref.cpp GeneralPref.h MDITabs.cpp MDITabs.h MainFrm.cpp Log Message: Bug fix and minor Enhancements - MDI toolbar has tooltips with full path of file. -Toggle visibility of MDI toolbar. - minitoolbar moved to CChildFrame, works in debug mode too - add toggle visibility of EOLs to mini toolbar - add some missing hints for buttons of minitoolbar Index: GeneralPref.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GeneralPref.h 25 Nov 2003 15:05:56 -0000 1.6 --- GeneralPref.h 12 Apr 2004 15:11:41 -0000 1.7 *************** *** 39,42 **** --- 39,43 ---- BOOL m_checkmod; BOOL m_minitoolbar; + BOOL m_tabbedSelector; //}}AFX_DATA Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** MainFrm.cpp 6 Apr 2004 09:01:36 -0000 1.33 --- MainFrm.cpp 12 Apr 2004 15:11:41 -0000 1.34 *************** *** 335,343 **** DWORD dw; if(m_reg.GetProfileInt(_T("Preferences"),_T("TabTop"),1)==0) ! dw=MT_IMAGES; else ! dw=MT_TOP|MT_IMAGES; m_wndMdiTabs.Create(this,dw); m_wndToolBar.EnableCustomizeButton (TRUE,ID_VIEW_CUSTOMIZE, _T("Customize...")); --- 335,345 ---- DWORD dw; if(m_reg.GetProfileInt(_T("Preferences"),_T("TabTop"),1)==0) ! dw = MT_IMAGES | MT_TOOLTIPS; else ! dw = MT_TOP | MT_IMAGES | MT_TOOLTIPS; m_wndMdiTabs.Create(this,dw); + if (m_reg.GetProfileInt(_T("Preferences"),_T("ShowTabSelector"),1)==0) + m_wndMdiTabs.SetVisible(false); m_wndToolBar.EnableCustomizeButton (TRUE,ID_VIEW_CUSTOMIZE, _T("Customize...")); Index: AnyEdit.rc =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** AnyEdit.rc 15 Mar 2004 08:51:53 -0000 1.34 --- AnyEdit.rc 12 Apr 2004 15:11:40 -0000 1.35 *************** *** 27,81 **** // ! IDR_ERRPARSESPECIALS MENU DISCARDABLE BEGIN ! POPUP "<ERRORPARSERSTRINGS>" ! BEGIN ! MENUITEM "Beginning of line\t^", ID_ERRORPARSERSTRINGS_BEGINNINGOFLINE ! MENUITEM "End of line\t$", ID_ERRORPARSERSTRINGS_ENDOFLINE [...5049 lines suppressed...] *** 2678,2686 **** #endif //_WIN32 #include "res\AnyEdit.rc2" // non-Microsoft Visual C++ edited resources ! #include "afxres.rc" // Standard components ! #include "afxprint.rc" // printing/print preview resources #endif ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED --- 2691,2699 ---- #endif //_WIN32 #include "res\AnyEdit.rc2" // non-Microsoft Visual C++ edited resources ! #include "afxres.rc" // Standard components ! #include "afxprint.rc" // printing/print preview resources #endif ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ChangeLog.txt 6 Apr 2004 09:01:36 -0000 1.42 --- ChangeLog.txt 12 Apr 2004 15:11:41 -0000 1.43 *************** *** 17,20 **** --- 17,25 ---- 12) Preferences changes - Add, Change and Remove Lanuages for Syntax Highlighting 13) Speed enhancement, syntax files are only parsed when needed + 14) MDI toolbar has tooltips with full path of file. + 15) Toggle visibility of MDI toolbar. + 16) minitoolbar moved to CChildFrame, works in debug mode too + 17) add toggle visibility of EOLs to mini toolbar + 18) add some missing hints for buttons of minitoolbar Beta 2.0 [Tester's Release 2] Index: MDITabs.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MDITabs.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MDITabs.cpp 15 Mar 2004 13:08:48 -0000 1.12 --- MDITabs.cpp 12 Apr 2004 15:11:41 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- #endif + #define countof(array) (sizeof(array)/sizeof(array[0])) + ///////////////////////////////////////////////////////////////////////////// // CMDITabs *************** *** 29,41 **** CMDITabs::CMDITabs() { ! m_mdiClient = NULL; ! m_minViews = 0; ! m_bImages = true; ! m_bTop = false; ! ! m_NumberOverlays.Create(IDB_NUMBERS, 16, 1, RGB(255,0,0)); ! m_MenuTab = 0; ! m_bPreview = FALSE; COLORREF clrBtnFace = ::GetSysColor(COLOR_BTNFACE); BYTE nRed = 0, nGreen = 0, nBlue = 0, nMax = 0; --- 31,43 ---- CMDITabs::CMDITabs() { ! m_mdiClient = NULL; ! m_minViews = 0; ! m_bImages = true; ! m_bTop = false; + m_NumberOverlays.Create(IDB_NUMBERS, 16, 1, RGB(255,0,0)); + m_MenuTab = 0; + m_bPreview = FALSE; + m_bVisible = true; COLORREF clrBtnFace = ::GetSysColor(COLOR_BTNFACE); BYTE nRed = 0, nGreen = 0, nBlue = 0, nMax = 0; *************** *** 74,77 **** --- 76,81 ---- //}}AFX_MSG_MAP ON_MESSAGE(WM_SIZEPARENT, OnSizeParent) + ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText) + ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText) END_MESSAGE_MAP() *************** *** 81,111 **** afx_msg LRESULT CMDITabs::OnSizeParent(WPARAM, LPARAM lParam) { ! if (GetItemCount() < m_minViews || m_bPreview) ! { ! ShowWindow(SW_HIDE); ! } ! else ! { ! AFX_SIZEPARENTPARAMS* pParams = reinterpret_cast<AFX_SIZEPARENTPARAMS*>(lParam); ! // AFX_SIZEPARENTPARAMS Params; ! // AFX_SIZEPARENTPARAMS *pParams=&Params; ! // ::GetClientRect(m_mdiClient,&Params.rect); ! const int height = 26 + (m_bImages ? 1 : 0); ! const int offset = 2; ! m_height = height + offset; ! m_width = pParams->rect.right - pParams->rect.left; ! if (m_bTop) ! { ! pParams->rect.top += height+1; ! MoveWindow(pParams->rect.left, pParams->rect.top - height-1, m_width, m_height, true); ! } ! else ! { ! pParams->rect.bottom -= height; ! MoveWindow(pParams->rect.left, pParams->rect.bottom - offset, m_width, m_height, true); ! } ! ShowWindow(SW_NORMAL); if(!gotmspin) --- 85,115 ---- afx_msg LRESULT CMDITabs::OnSizeParent(WPARAM, LPARAM lParam) { ! if (GetItemCount() < m_minViews || m_bPreview || !IsVisible()) ! { ! ShowWindow(SW_HIDE); ! } ! else ! { ! AFX_SIZEPARENTPARAMS* pParams = reinterpret_cast<AFX_SIZEPARENTPARAMS*>(lParam); ! // AFX_SIZEPARENTPARAMS Params; ! // AFX_SIZEPARENTPARAMS *pParams=&Params; ! // ::GetClientRect(m_mdiClient,&Params.rect); ! const int height = 26 + (m_bImages ? 1 : 0); ! const int offset = 2; ! m_height = height + offset; ! m_width = pParams->rect.right - pParams->rect.left; ! if (m_bTop) ! { ! pParams->rect.top += height+1; ! MoveWindow(pParams->rect.left, pParams->rect.top - height-1, m_width, m_height, true); ! } ! else ! { ! pParams->rect.bottom -= height; ! MoveWindow(pParams->rect.left, pParams->rect.bottom - offset, m_width, m_height, true); ! } ! ShowWindow(SW_NORMAL); if(!gotmspin) *************** *** 113,117 **** CTabCtrl::LockWindowUpdate(); CTabCtrl::InsertItem(0,"DEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEE"); ! CWnd* pWnd = GetWindow(GW_CHILD); while(pWnd) --- 117,121 ---- CTabCtrl::LockWindowUpdate(); CTabCtrl::InsertItem(0,"DEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEEDEEEEEEEEEEE"); ! CWnd* pWnd = GetWindow(GW_CHILD); while(pWnd) *************** *** 143,147 **** m_rectUpDn.left = rectCli.right - 35; m_rectUpDn.right = rectCli.right-10; ! pWnd->MoveWindow(&m_rectUpDn); m_Spin.SubclassWindow(pWnd->m_hWnd); --- 147,151 ---- m_rectUpDn.left = rectCli.right - 35; m_rectUpDn.right = rectCli.right-10; ! pWnd->MoveWindow(&m_rectUpDn); m_Spin.SubclassWindow(pWnd->m_hWnd); *************** *** 171,186 **** } ! } ! return 0; } void CMDITabs::OnSelChange(NMHDR* pNMHDR, LRESULT* pResult) { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(GetCurSel(), &item); ! ::BringWindowToTop(HWND(item.lParam)); ! *pResult = 0; } --- 175,190 ---- } ! } ! return 0; } void CMDITabs::OnSelChange(NMHDR* pNMHDR, LRESULT* pResult) { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(GetCurSel(), &item); ! ::BringWindowToTop(HWND(item.lParam)); ! *pResult = 0; } *************** *** 188,296 **** { ! SetRedraw(false); ! HWND active = ::GetTopWindow(m_mdiClient); // get active view window (actually the frame of the view) ! typedef std::vector<HWND> TWndVec; ! typedef TWndVec::iterator TWndIter; ! TWndVec vChild; // put all child windows in a list (actually a vector) ! for (HWND child = active; child; child = ::GetNextWindow(child, GW_HWNDNEXT)) ! { ! vChild.push_back(child); ! } ! TCITEM item; ! char ttext[1000]; ! char text[256]; ! item.pszText = text; ! for (int i = GetItemCount(); i--;) // for each tab ! { ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! TWndIter it = std::find(vChild.begin(), vChild.end(), HWND(item.lParam)); ! if (it == vChild.end()) // associatete view does no longer exist, so delete the tab ! { ! DeleteItem(i); ! if (m_bImages) ! RemoveImage(i); ! } ! else // update the tab's text, image and selection state ! { ! item.mask = TCIF_TEXT; ! ::GetWindowText(*it, ttext, 1000); ! CString str = ttext; ! int y = str.ReverseFind('\\'); ! str = str.Right(str.GetLength()- 1 - y); ! strcpy(text,str.GetBuffer(str.GetLength())); ! str.ReleaseBuffer(); //Stan - 2003-01-20 - otherwise a memory leak will happen ! // IAN : Add overlays as in WndTabs ! /*if (m_bImages) ! { ! if (i<9) ! { ! HICON hIconOverlay = m_NumberOverlays.ExtractIcon(i); ! HIMAGELIST hilmTemp = ! ImageList_Merge(m_images, i, m_NumberOverlays, i, 0, 0); ! HICON hIcon = ImageList_ExtractIcon(0, hilmTemp, 0); ! m_images.Replace(i, hIcon); ! ::DestroyIcon(hIcon); ! ImageList_Destroy(hilmTemp); ! } ! else ! m_images.Replace(i, (HICON)::GetClassLong(*it, GCL_HICONSM)); ! }*/ ! SetItem(i, &item); ! if (*it == active) ! SetCurSel(i); // associated view is active => make it the current selection ! vChild.erase(it); // remove view from list ! } ! } ! // all remaining views in vChild have to be added as new tabs ! i = GetItemCount(); ! for (TWndIter it = vChild.begin(), end = vChild.end(); it != end; ++it) ! { ! item.mask = TCIF_TEXT|TCIF_PARAM|TCIF_IMAGE; ! ::GetWindowText(*it, text, 256); ! //if (m_bImages) ! // m_images.Add((HICON)::GetClassLong(*it, GCL_HICONSM)); ! item.iImage = i; ! item.lParam = LPARAM(*it); ! InsertItem(i, &item); ! if (*it == active) ! SetCurSel(i); ! ++i; ! } ! // this removes the control when there are no tabs and shows it when there is at least one tab ! BOOL bShow = GetItemCount() >= m_minViews; ! if ((!bShow && IsWindowVisible()) || (bShow && !IsWindowVisible())) ! { ! static_cast<CMDIFrameWnd*>(FromHandlePermanent(::GetParent(m_mdiClient)))->RecalcLayout(); ! } ! RedrawWindow(NULL, NULL, RDW_FRAME|RDW_INVALIDATE|RDW_ERASE); ! SetRedraw(true); } void CMDITabs::OnPaint() { ! CPaintDC dc(this); - if (GetItemCount() == 0) - return; // do nothing - // cache some system colors - // DWORD shadow = ::GetSysColor(COLOR_3DSHADOW); - // DWORD dark = ::GetSysColor(COLOR_3DDKSHADOW); - // DWORD hilight = ::GetSysColor(COLOR_3DHILIGHT); - // DWORD light = ::GetSysColor(COLOR_3DLIGHT); - - CRect rectCli; GetClientRect(&rectCli); --- 192,300 ---- { ! SetRedraw(false); ! HWND active = ::GetTopWindow(m_mdiClient); // get active view window (actually the frame of the view) ! typedef std::vector<HWND> TWndVec; ! typedef TWndVec::iterator TWndIter; ! TWndVec vChild; // put all child windows in a list (actually a vector) ! for (HWND child = active; child; child = ::GetNextWindow(child, GW_HWNDNEXT)) ! { ! vChild.push_back(child); ! } ! TCITEM item; ! char ttext[1000]; ! char text[256]; ! item.pszText = text; ! for (int i = GetItemCount(); i--;) // for each tab ! { ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! TWndIter it = std::find(vChild.begin(), vChild.end(), HWND(item.lParam)); ! if (it == vChild.end()) // associatete view does no longer exist, so delete the tab ! { ! DeleteItem(i); ! if (m_bImages) ! RemoveImage(i); ! } ! else // update the tab's text, image and selection state ! { ! item.mask = TCIF_TEXT; ! ::GetWindowText(*it, ttext, 1000); ! CString str = ttext; ! int y = str.ReverseFind('\\'); ! str = str.Right(str.GetLength()- 1 - y); ! strcpy(text,str.GetBuffer(str.GetLength())); ! str.ReleaseBuffer(); //Stan - 2003-01-20 - otherwise a memory leak will happen ! // IAN : Add overlays as in WndTabs ! /*if (m_bImages) ! { ! if (i<9) ! { ! HICON hIconOverlay = m_NumberOverlays.ExtractIcon(i); ! HIMAGELIST hilmTemp = ! ImageList_Merge(m_images, i, m_NumberOverlays, i, 0, 0); ! HICON hIcon = ImageList_ExtractIcon(0, hilmTemp, 0); ! m_images.Replace(i, hIcon); ! ::DestroyIcon(hIcon); ! ImageList_Destroy(hilmTemp); ! } ! else ! m_images.Replace(i, (HICON)::GetClassLong(*it, GCL_HICONSM)); ! }*/ ! SetItem(i, &item); ! if (*it == active) ! SetCurSel(i); // associated view is active => make it the current selection ! vChild.erase(it); // remove view from list ! } ! } ! // all remaining views in vChild have to be added as new tabs ! i = GetItemCount(); ! for (TWndIter it = vChild.begin(), end = vChild.end(); it != end; ++it) ! { ! item.mask = TCIF_TEXT|TCIF_PARAM|TCIF_IMAGE; ! ::GetWindowText(*it, text, 256); ! //if (m_bImages) ! // m_images.Add((HICON)::GetClassLong(*it, GCL_HICONSM)); ! item.iImage = i; ! item.lParam = LPARAM(*it); ! InsertItem(i, &item); ! if (*it == active) ! SetCurSel(i); ! ++i; ! } ! // this removes the control when there are no tabs and shows it when there is at least one tab ! BOOL bShow = GetItemCount() >= m_minViews; ! if ((!bShow && IsWindowVisible()) || (bShow && !IsWindowVisible())) ! { ! static_cast<CMDIFrameWnd*>(FromHandlePermanent(::GetParent(m_mdiClient)))->RecalcLayout(); ! } ! RedrawWindow(NULL, NULL, RDW_FRAME|RDW_INVALIDATE|RDW_ERASE); ! SetRedraw(true); } void CMDITabs::OnPaint() { ! CPaintDC dc(this); ! ! if (GetItemCount() == 0) ! return; // do nothing ! ! // cache some system colors ! // DWORD shadow = ::GetSysColor(COLOR_3DSHADOW); ! // DWORD dark = ::GetSysColor(COLOR_3DDKSHADOW); ! // DWORD hilight = ::GetSysColor(COLOR_3DHILIGHT); ! // DWORD light = ::GetSysColor(COLOR_3DLIGHT); CRect rectCli; GetClientRect(&rectCli); *************** *** 299,303 **** CRect rect; ! GetItemRect(GetCurSel(), rect); rect.bottom+=2; --- 303,307 ---- CRect rect; ! GetItemRect(GetCurSel(), rect); rect.bottom+=2; *************** *** 305,313 **** rectCli.top = rectCli.bottom - 3; dc.FillRect(rectCli,&btnbrush); ! CPen penLight (PS_SOLID, 1, ::GetSysColor (COLOR_3DHILIGHT)); CPen penDkGray (PS_SOLID, 1, ::GetSysColor (COLOR_3DDKSHADOW)); CPen penGray (PS_SOLID, 1, ::GetSysColor (COLOR_3DSHADOW)); ! CPen* pOldPen = NULL; pOldPen = (CPen*) dc.SelectObject (&penLight); --- 309,317 ---- rectCli.top = rectCli.bottom - 3; dc.FillRect(rectCli,&btnbrush); ! CPen penLight (PS_SOLID, 1, ::GetSysColor (COLOR_3DHILIGHT)); CPen penDkGray (PS_SOLID, 1, ::GetSysColor (COLOR_3DDKSHADOW)); CPen penGray (PS_SOLID, 1, ::GetSysColor (COLOR_3DSHADOW)); ! CPen* pOldPen = NULL; pOldPen = (CPen*) dc.SelectObject (&penLight); *************** *** 316,320 **** dc.LineTo(rect.left,rect.top); dc.LineTo(rect.right,rect.top); ! dc.MoveTo(rectCli.left,rectCli.top); dc.LineTo(rect.left,rect.bottom-1); --- 320,324 ---- dc.LineTo(rect.left,rect.top); dc.LineTo(rect.right,rect.top); ! dc.MoveTo(rectCli.left,rectCli.top); dc.LineTo(rect.left,rect.bottom-1); *************** *** 336,340 **** { ! drawItemStruct.hDC=dc.GetSafeHdc(); drawItemStruct.itemID=i; --- 340,344 ---- { ! drawItemStruct.hDC=dc.GetSafeHdc(); drawItemStruct.itemID=i; *************** *** 381,385 **** m_rectUpDn.bottom = rectCli.bottom-1; //m_rectUpDn.left +=5; ! // m_rectUpDn.right+=2; //m_rectUpDn.OffsetRect(3,5); pWnd->MoveWindow(&m_rectUpDn); --- 385,389 ---- m_rectUpDn.bottom = rectCli.bottom-1; //m_rectUpDn.left +=5; ! // m_rectUpDn.right+=2; //m_rectUpDn.OffsetRect(3,5); pWnd->MoveWindow(&m_rectUpDn); *************** *** 403,436 **** void CMDITabs::OnNcPaint() { ! HDC hdc = ::GetWindowDC(m_hWnd); ! CRect rect; ! rect.left = 0; ! rect.top = m_bTop ? 0 : -2; ! rect.right = m_width; ! rect.bottom = m_height; ! HPEN pen = ::CreatePen(PS_SOLID, 0, ::GetSysColor(COLOR_3DFACE)); ! HGDIOBJ old = ::SelectObject(hdc, pen); ! if (m_bTop) ! { ! DrawEdge(hdc, rect, EDGE_ETCHED, BF_LEFT|BF_TOP); ! ::MoveToEx(hdc, 2, m_height - 1, NULL); ! ::LineTo(hdc, m_width - 2, m_height - 1); ! ::MoveToEx(hdc, 2, m_height - 2, NULL); ! ::LineTo(hdc, m_width - 2, m_height - 2); ! } ! else ! { ! DrawEdge(hdc, rect, EDGE_ETCHED, BF_LEFT|BF_BOTTOM|BF_TOP); ! ::MoveToEx(hdc, 2, 0, NULL); ! ::LineTo(hdc, m_width - 2, 0); ! ::MoveToEx(hdc, 2, 1, NULL); ! ::LineTo(hdc, m_width - 2, 1); ! } ! ::SelectObject(hdc, old); ! ::DeleteObject(pen); ! ::ReleaseDC(m_hWnd, hdc); if(gotmspin && m_Spin) --- 407,440 ---- void CMDITabs::OnNcPaint() { ! HDC hdc = ::GetWindowDC(m_hWnd); ! CRect rect; ! rect.left = 0; ! rect.top = m_bTop ? 0 : -2; ! rect.right = m_width; ! rect.bottom = m_height; ! HPEN pen = ::CreatePen(PS_SOLID, 0, ::GetSysColor(COLOR_3DFACE)); ! HGDIOBJ old = ::SelectObject(hdc, pen); ! if (m_bTop) ! { ! DrawEdge(hdc, rect, EDGE_ETCHED, BF_LEFT|BF_TOP); ! ::MoveToEx(hdc, 2, m_height - 1, NULL); ! ::LineTo(hdc, m_width - 2, m_height - 1); ! ::MoveToEx(hdc, 2, m_height - 2, NULL); ! ::LineTo(hdc, m_width - 2, m_height - 2); ! } ! else ! { ! DrawEdge(hdc, rect, EDGE_ETCHED, BF_LEFT|BF_BOTTOM|BF_TOP); ! ::MoveToEx(hdc, 2, 0, NULL); ! ::LineTo(hdc, m_width - 2, 0); ! ::MoveToEx(hdc, 2, 1, NULL); ! ::LineTo(hdc, m_width - 2, 1); ! } ! ::SelectObject(hdc, old); ! ::DeleteObject(pen); ! ::ReleaseDC(m_hWnd, hdc); if(gotmspin && m_Spin) *************** *** 451,541 **** void CMDITabs::Create(CFrameWnd* pMainFrame, DWORD dwStyle) { ! m_bTop = (dwStyle & MT_TOP); ! m_minViews = (dwStyle & MT_HIDEWLT2VIEWS) ? 2 : 1; ! DWORD dw=WS_CHILD|WS_VISIBLE|(m_bTop?0:TCS_BOTTOM)|TCS_SINGLELINE|TCS_FOCUSNEVER|TCS_FORCEICONLEFT|WS_CLIPSIBLINGS; ! CTabCtrl::Create(dw,CRect(0, 0, 0, 0), pMainFrame, 42); ! ModifyStyleEx(0, WS_EX_CLIENTEDGE); ! //ModifyStyleEx(0, WS_EX_STATICEDGE); ! SendMessage(WM_SETFONT, WPARAM(GetStockObject(DEFAULT_GUI_FONT)), 0); ! for (HWND wnd = ::GetTopWindow(*pMainFrame); wnd; wnd = ::GetNextWindow(wnd, GW_HWNDNEXT)) ! { ! char wndClass[32]; ! ::GetClassName(wnd, wndClass, 32); ! if (strncmp(wndClass, "MDIClient", 32) == 0) ! break; ! } ! m_mdiClient = wnd; ! ASSERT(m_mdiClient); // Ooops, no MDIClient window? ! // manipulate Z-order so, that our tabctrl is above the mdi client, but below any status bar ! ::SetWindowPos(m_hWnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); ! ::SetWindowPos(m_mdiClient, m_hWnd, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); ! m_bImages = (dwStyle & MT_IMAGES) != 0; ! if (m_bImages) ! { ! if (m_images.GetSafeHandle()) ! m_images.SetImageCount(0); ! else ! m_images.Create(16, 16, ILC_COLORDDB|ILC_MASK, 1, 1); ! SetImageList(&m_images); ! } ! //SetItemSize(CSize(50, 0)); // Fixed Width Experiment } void CMDITabs::OnContextMenu(CWnd* pWnd, CPoint point) { ! TCHITTESTINFO hit; ! hit.pt = point; ! ScreenToClient(&hit.pt); ! int i = HitTest(&hit); ! if (i >= 0) ! { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! HWND hWnd = HWND(item.lParam); ! SetCurSel(i); ! ::BringWindowToTop(hWnd); ! m_MenuTab = i; ! theApp.ShowPopupMenu(IDR_POPUP_TABS, point, AfxGetMainWnd ()); ! } } void CMDITabs::OnLButtonDblClk(UINT nFlags, CPoint point) { ! int i = GetCurSel(); ! if (i >= 0) ! { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! HWND hWnd = HWND(item.lParam); ! // ::ShowWindow(hWnd, SW_MAXIMIZE); ! BOOL bMaximize=FALSE; ! // check MDI windows ! CMDIFrameWnd* pFrameWnd = (CMDIFrameWnd*) GetParentFrame(); ! if(pFrameWnd==NULL) ! return; ! CWnd* pActiveWnd = pFrameWnd->MDIGetActive(&bMaximize); ! // maximize or restore MDIChild window based on its current state ! if((pActiveWnd->GetSafeHwnd() == hWnd) && bMaximize) ! ::ShowWindow(hWnd, SW_RESTORE); ! else ! ::ShowWindow(hWnd, SW_MAXIMIZE); ! } } void CMDITabs::DrawItem( LPDRAWITEMSTRUCT lpDrawItemStruct ) { ! CDC dc; dc.Attach(lpDrawItemStruct->hDC); --- 455,547 ---- void CMDITabs::Create(CFrameWnd* pMainFrame, DWORD dwStyle) { ! m_bTop = (dwStyle & MT_TOP); ! m_minViews = (dwStyle & MT_HIDEWLT2VIEWS) ? 2 : 1; ! DWORD dw=WS_CHILD|WS_VISIBLE|(m_bTop?0:TCS_BOTTOM)|TCS_SINGLELINE|TCS_FOCUSNEVER|TCS_FORCEICONLEFT|WS_CLIPSIBLINGS; ! if (dwStyle & MT_TOOLTIPS) ! dw |= TCS_TOOLTIPS; ! CTabCtrl::Create(dw,CRect(0, 0, 0, 0), pMainFrame, 42); ! ModifyStyleEx(0, WS_EX_CLIENTEDGE); ! //ModifyStyleEx(0, WS_EX_STATICEDGE); ! SendMessage(WM_SETFONT, WPARAM(GetStockObject(DEFAULT_GUI_FONT)), 0); ! for (HWND wnd = ::GetTopWindow(*pMainFrame); wnd; wnd = ::GetNextWindow(wnd, GW_HWNDNEXT)) ! { ! char wndClass[32]; ! ::GetClassName(wnd, wndClass, 32); ! if (strncmp(wndClass, "MDIClient", 32) == 0) ! break; ! } ! m_mdiClient = wnd; ! ASSERT(m_mdiClient); // Ooops, no MDIClient window? ! // manipulate Z-order so, that our tabctrl is above the mdi client, but below any status bar ! ::SetWindowPos(m_hWnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); ! ::SetWindowPos(m_mdiClient, m_hWnd, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); ! m_bImages = (dwStyle & MT_IMAGES) != 0; ! if (m_bImages) ! { ! if (m_images.GetSafeHandle()) ! m_images.SetImageCount(0); ! else ! m_images.Create(16, 16, ILC_COLORDDB|ILC_MASK, 1, 1); ! SetImageList(&m_images); ! } ! //SetItemSize(CSize(50, 0)); // Fixed Width Experiment } void CMDITabs::OnContextMenu(CWnd* pWnd, CPoint point) { ! TCHITTESTINFO hit; ! hit.pt = point; ! ScreenToClient(&hit.pt); ! int i = HitTest(&hit); ! if (i >= 0) ! { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! HWND hWnd = HWND(item.lParam); ! SetCurSel(i); ! ::BringWindowToTop(hWnd); ! m_MenuTab = i; ! theApp.ShowPopupMenu(IDR_POPUP_TABS, point, AfxGetMainWnd ()); ! } } void CMDITabs::OnLButtonDblClk(UINT nFlags, CPoint point) { ! int i = GetCurSel(); ! if (i >= 0) ! { ! TCITEM item; ! item.mask = TCIF_PARAM; ! GetItem(i, &item); ! HWND hWnd = HWND(item.lParam); ! // ::ShowWindow(hWnd, SW_MAXIMIZE); ! BOOL bMaximize=FALSE; ! // check MDI windows ! CMDIFrameWnd* pFrameWnd = (CMDIFrameWnd*) GetParentFrame(); ! if(pFrameWnd==NULL) ! return; ! CWnd* pActiveWnd = pFrameWnd->MDIGetActive(&bMaximize); ! // maximize or restore MDIChild window based on its current state ! if((pActiveWnd->GetSafeHwnd() == hWnd) && bMaximize) ! ::ShowWindow(hWnd, SW_RESTORE); ! else ! ::ShowWindow(hWnd, SW_MAXIMIZE); ! } } void CMDITabs::DrawItem( LPDRAWITEMSTRUCT lpDrawItemStruct ) { ! CDC dc; dc.Attach(lpDrawItemStruct->hDC); *************** *** 543,547 **** char buf[255]; int nCurItem = lpDrawItemStruct->itemID; ! CFont * oldFont; --- 549,553 ---- char buf[255]; int nCurItem = lpDrawItemStruct->itemID; ! CFont * oldFont; *************** *** 561,565 **** tcitem.cchTextMax=sizeof(buf); GetItem(nCurItem,&tcitem); ! CRect rect=lpDrawItemStruct->rcItem; rect.OffsetRect(1,4); --- 567,571 ---- tcitem.cchTextMax=sizeof(buf); GetItem(nCurItem,&tcitem); ! CRect rect=lpDrawItemStruct->rcItem; rect.OffsetRect(1,4); *************** *** 570,575 **** ! void CMDITabs::PreSubclassWindow() ! { CTabCtrl::PreSubclassWindow(); --- 576,581 ---- ! void CMDITabs::PreSubclassWindow() ! { CTabCtrl::PreSubclassWindow(); *************** *** 587,595 **** m_font.CreateFontIndirect(&metrics.lfStatusFont); metrics.lfStatusFont.lfWeight = FW_BOLD; ! m_fontbold.CreateFontIndirect(&metrics.lfStatusFont); } ! BOOL CMDITabs::OnEraseBkgnd(CDC* pDC) { ! return TRUE; } --- 593,669 ---- m_font.CreateFontIndirect(&metrics.lfStatusFont); metrics.lfStatusFont.lfWeight = FW_BOLD; ! m_fontbold.CreateFontIndirect(&metrics.lfStatusFont); } ! BOOL CMDITabs::OnEraseBkgnd(CDC* pDC) { ! return TRUE; } + + void CMDITabs::SetVisible(bool bVisible) + { + m_bVisible = bVisible; + } + + bool CMDITabs::IsVisible() + { + return m_bVisible; + } + + /// Show path of file as tooltip + BOOL CMDITabs::OnToolTipText( UINT id, NMHDR * pNMHDR, LRESULT * pResult ) + { + UNUSED_ALWAYS(id); + UNUSED_ALWAYS(pResult); + + ASSERT (pNMHDR->code == TTN_NEEDTEXTA || pNMHDR->code == TTN_NEEDTEXTW); + + TOOLTIPTEXTA* pTTTA = (TOOLTIPTEXTA *) pNMHDR; + TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW *) pNMHDR; + + CString strTipText; + + POINT point; + GetCursorPos(&point); + ScreenToClient(&point); + TCHITTESTINFO tcHitTest; + tcHitTest.pt = point; + + UINT nSel = HitTest(&tcHitTest); + + TCITEM item; + item.mask = TCIF_PARAM; + GetItem(nSel, &item); + + CMDIChildWnd* pChildWnd = (CMDIChildWnd*) FromHandlePermanent((HWND) item.lParam); + if (pChildWnd != NULL && pChildWnd->IsKindOf(RUNTIME_CLASS(CMDIChildWnd))) + { + CDocument* pDoc=((CMDIChildWnd*)pChildWnd)->GetActiveDocument(); + if(pDoc!=NULL) + { + strTipText=pDoc->GetPathName(); + } + + if(strTipText.IsEmpty()) + pChildWnd->GetWindowText(strTipText); + + if (! strTipText.IsEmpty()) + { + #ifndef _UNICODE + if (pNMHDR->code == TTN_NEEDTEXTA) + lstrcpyn(pTTTA->szText, strTipText, countof(pTTTA->szText)); + else + _mbstowcsz(pTTTW->szText, strTipText, countof(pTTTW->szText)); + #else + if (pNMHDR->code == TTN_NEEDTEXTA) + _wcstombsz(pTTTA->szText, strTipText, countof(pTTTA->szText)); + else + lstrcpyn(pTTTW->szText, strTipText, countof(pTTTW->szText)); + #endif + // return TRUE; + } + // return CWnd::OnToolTipText(nID, pNMHDR, pResult); + } + return TRUE; + } + Index: ChildFrm.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChildFrm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChildFrm.h 8 May 2003 12:00:56 -0000 1.2 --- ChildFrm.h 12 Apr 2004 15:11:41 -0000 1.3 *************** *** 6,14 **** #define AFX_CHILDFRM_H__06CE24AB_F738_11D5_B413_9B6FFB9DBC25__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 - class CChildFrame : public CBCGMDIChildWnd { --- 6,14 ---- #define AFX_CHILDFRM_H__06CE24AB_F738_11D5_B413_9B6FFB9DBC25__INCLUDED_ + #include "RegProfile.h" #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 class CChildFrame : public CBCGMDIChildWnd { *************** *** 26,33 **** // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CChildFrame) ! public: virtual BOOL PreCreateWindow(CREATESTRUCT& cs); virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_OVERLAPPEDWINDOW, const RECT& rect = rectDefault, CMDIFrameWnd* pParentWnd = NULL, CCreateContext* pContext = NULL); ! //}}AFX_VIRTUAL // Implementation --- 26,35 ---- // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CChildFrame) ! public: virtual BOOL PreCreateWindow(CREATESTRUCT& cs); virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_OVERLAPPEDWINDOW, const RECT& rect = rectDefault, CMDIFrameWnd* pParentWnd = NULL, CCreateContext* pContext = NULL); ! protected: ! virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext); ! //}}AFX_VIRTUAL // Implementation *************** *** 42,48 **** // Generated message map functions protected: //{{AFX_MSG(CChildFrame) afx_msg void OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() }; --- 44,52 ---- // Generated message map functions protected: + CRegProfile m_reg; ///< access to configuration file + CToolBar m_wndTool; ///< mini toolbar //{{AFX_MSG(CChildFrame) afx_msg void OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() }; Index: ChildFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChildFrm.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChildFrm.cpp 8 May 2003 12:00:56 -0000 1.2 --- ChildFrm.cpp 12 Apr 2004 15:11:41 -0000 1.3 *************** *** 1,23 **** /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not ! claim that you wrote the original software. If you use this software ! in a product, an acknowledgment in the product documentation would be ! appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be ! misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... --- 1,23 ---- /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not ! claim that you wrote the original software. If you use this software ! in a product, an acknowledgment in the product documentation would be ! appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be ! misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... *************** *** 32,35 **** --- 32,36 ---- #include "ChildFrm.h" #include "RegProfile.h" + #include "AnyEditView.h" #ifdef _DEBUG *************** *** 39,42 **** --- 40,44 ---- #endif + ///////////////////////////////////////////////////////////////////////////// // CChildFrame *************** *** 47,51 **** //{{AFX_MSG_MAP(CChildFrame) ON_WM_MDIACTIVATE() ! //}}AFX_MSG_MAP END_MESSAGE_MAP() --- 49,53 ---- //{{AFX_MSG_MAP(CChildFrame) ON_WM_MDIACTIVATE() ! //}}AFX_MSG_MAP END_MESSAGE_MAP() *************** *** 55,59 **** CChildFrame::CChildFrame() { ! // TODO: add member initialization code here } --- 57,61 ---- CChildFrame::CChildFrame() { ! // TODO: add member initialization code here } *************** *** 64,83 **** BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs) { ! // TODO: Modify the Window class or styles here by modifying ! // the CREATESTRUCT cs ! if( !CMDIChildWnd::PreCreateWindow(cs) ) ! return FALSE; ! //deepwashere ! //This is the code to maximize child window ! CRegProfile m_reg; ! if(m_reg.GetProfileInt(_T("Preferences"),_T("MaxChild"),1)) ! { ! cs.style = WS_CHILD | WS_VISIBLE | WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU ! | FWS_ADDTOTITLE | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_MAXIMIZE; ! } ! return TRUE; } --- 66,85 ---- BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs) { ! // TODO: Modify the Window class or styles here by modifying ! // the CREATESTRUCT cs ! if( !CMDIChildWnd::PreCreateWindow(cs) ) ! return FALSE; ! //deepwashere ! //This is the code to maximize child window ! CRegProfile m_reg; ! if(m_reg.GetProfileInt(_T("Preferences"),_T("MaxChild"),1)) ! { ! cs.style = WS_CHILD | WS_VISIBLE | WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU ! | FWS_ADDTOTITLE | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_MAXIMIZE; ! } ! return TRUE; } *************** *** 90,99 **** void CChildFrame::AssertValid() const { ! CMDIChildWnd::AssertValid(); } void CChildFrame::Dump(CDumpContext& dc) const { ! CMDIChildWnd::Dump(dc); } --- 92,101 ---- void CChildFrame::AssertValid() const { ! CMDIChildWnd::AssertValid(); } void CChildFrame::Dump(CDumpContext& dc) const { ! CMDIChildWnd::Dump(dc); } *************** *** 105,114 **** BOOL CChildFrame::Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CMDIFrameWnd* pParentWnd, CCreateContext* pContext) { ! // TODO: Add your specialized code here and/or call the base class ! return CMDIChildWnd::Create(lpszClassName, lpszWindowName, dwStyle, rect, pParentWnd, pContext); } void CChildFrame::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd) { ! CMDIChildWnd::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd); } --- 107,146 ---- BOOL CChildFrame::Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CMDIFrameWnd* pParentWnd, CCreateContext* pContext) { ! // TODO: Add your specialized code here and/or call the base class ! return CMDIChildWnd::Create(lpszClassName, lpszWindowName, dwStyle, rect, pParentWnd, pContext); } void CChildFrame::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd) { ! CMDIChildWnd::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd); ! } ! ! /// Add mini toolbar to AnyEditViews ! BOOL CChildFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) ! { ! BOOL bRet = CMDIChildWnd::OnCreateClient(lpcs, pContext); ! ! if (strcmp(pContext->m_pNewViewClass->m_lpszClassName, "CAnyEditView") == 0) ! { ! if(m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1)) ! { ! if (!m_wndTool.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_BOTTOM ! | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || ! !m_wndTool.LoadToolBar(IDR_VIEW)) ! { ! TRACE0("Failed to create toolbar 1\n"); ! return -1; // fail to create ! } ! ! m_wndTool.EnableDocking(CBRS_ALIGN_ANY); ! ! EnableDocking(CBRS_ALIGN_ANY); ! DockControlBar(&m_wndTool); ! ! m_wndTool.SetBarStyle(CBRS_ALIGN_BOTTOM | CBRS_TOOLTIPS | CBRS_BORDER_TOP | CBRS_BORDER_LEFT | CBRS_BORDER_BOTTOM | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); ! } ! } ! ! return bRet; } + Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** AnyEditView.cpp 16 Mar 2004 07:27:00 -0000 1.49 --- AnyEditView.cpp 12 Apr 2004 15:11:41 -0000 1.50 *************** *** 325,355 **** pDoc->SetDocScintilla(&m_Scintilla); - #ifndef DEBUG - - if(m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1)) - { - if (!m_wndTool.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_BOTTOM - | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || - !m_wndTool.LoadToolBar(IDR_VIEW)) - { - TRACE0("Failed to create toolbar 1\n"); - return -1; // fail to create - } - - m_wndTool.EnableDocking(CBRS_ALIGN_ANY); - - - CFrameWnd *parent = this->GetParentFrame(); - - if(parent!=NULL) - { - parent->EnableDocking(CBRS_ALIGN_ANY); - parent->DockControlBar(&m_wndTool); - } - - m_wndTool.SetBarStyle(CBRS_ALIGN_BOTTOM|CBRS_TOOLTIPS|CBRS_BORDER_TOP|CBRS_BORDER_LEFT|CBRS_BORDER_BOTTOM|CBRS_FLYBY); - } - #endif - return 0; } --- 325,328 ---- Index: GeneralPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GeneralPref.cpp 25 Nov 2003 15:05:56 -0000 1.8 --- GeneralPref.cpp 12 Apr 2004 15:11:41 -0000 1.9 *************** *** 55,58 **** --- 55,59 ---- m_checkmod = m_reg.GetProfileInt(_T("Preferences"),_T("CheckModification"),1); m_minitoolbar = m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1); + m_tabbedSelector = m_reg.GetProfileInt(_T("Preferences"),_T("ShowTabSelector"),1);; //}}AFX_DATA_INIT *************** *** 74,77 **** --- 75,79 ---- DDX_Check(pDX, IDC_CHECK14, m_checkmod); DDX_Check(pDX, IDC_CHECK7, m_minitoolbar); + DDX_Check(pDX, IDC_CHECK8, m_tabbedSelector); //}}AFX_DATA_MAP } *************** *** 100,103 **** --- 102,106 ---- m_reg.WriteProfileInt(_T("Preferences"),_T("CheckModification"),m_checkmod); m_reg.WriteProfileInt(_T("Preferences"),_T("MiniToolbar"),m_minitoolbar); + m_reg.WriteProfileInt(_T("Preferences"),_T("ShowTabSelector"),m_tabbedSelector); CSAPrefsSubDlg::OnOK(); Index: AnyEditView.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** AnyEditView.h 15 Mar 2004 13:08:48 -0000 1.27 --- AnyEditView.h 12 Apr 2004 15:11:41 -0000 1.28 *************** *** 17,20 **** --- 17,22 ---- #define PARSER_TIMER (WM_USER + 5000) + class CAnyEditDoc; + class CAnyEditView : public CView { *************** *** 32,37 **** BOOL outoffocus; - CToolBar m_wndTool; - // Attributes public: --- 34,37 ---- Index: MDITabs.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MDITabs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MDITabs.h 18 Nov 2003 05:41:37 -0000 1.5 --- MDITabs.h 12 Apr 2004 15:11:41 -0000 1.6 *************** *** 18,35 **** enum EMDITabStyles { ! MT_BOTTOM = 0x0000, // places tabs at bottom (default) ! MT_TOP = 0x0001, // place tabs at top ! MT_IMAGES = 0x0002, // show images ! MT_HIDEWLT2VIEWS = 0x0004, // Hide Tabs when less than two views are open (default is one view) ! MT_TOOLTIPS = 0x0008, // not implemented (a tooltip can appear about a tab) ! MT_BUTTONS = 0x0010, // not implemented (show tabs as buttons) ! MT_AUTOSIZE = 0x0020, // not implemented (tabs are sized to fit the entire width of the control) ! MT_TASKBAR = 0x0038 // MT_TOOLTIPS|MT_BUTTONS|MT_AUTOSIZE }; enum EWMMTGetInfo { ! WM_GETTABTIPTEXT = WM_APP + 0x0393, // send to associated view to get a tip text ! WM_GETTABSYSMENU = WM_APP + 0x0394 // if neccessary, the view can provide a different systemmenu by answering this message }; --- 18,35 ---- enum EMDITabStyles { ! MT_BOTTOM = 0x0000, ///< places tabs at bottom (default) ! MT_TOP = 0x0001, ///< place tabs at top ! MT_IMAGES = 0x0002, ///< show images ! MT_HIDEWLT2VIEWS = 0x0004, ///< Hide Tabs when less than two views are open (default is one view) ! MT_TOOLTIPS = 0x0008, ///< a tooltip can appear about a tab ! MT_BUTTONS = 0x0010, ///< not implemented (show tabs as buttons) ! MT_AUTOSIZE = 0x0020, ///< not implemented (tabs are sized to fit the entire width of the control) ! MT_TASKBAR = 0x0038 ///< MT_TOOLTIPS|MT_BUTTONS|MT_AUTOSIZE }; enum EWMMTGetInfo { ! WM_GETTABTIPTEXT = WM_APP + 0x0393, ///< send to associated view to get a tip text ! WM_GETTABSYSMENU = WM_APP + 0x0394 ///< if neccessary, the view can provide a different systemmenu by answering this message }; *************** *** 41,63 **** { public: ! CMDITabs(); ! void Create(CFrameWnd* pMainFrame, DWORD dwStyle = MT_BOTTOM|MT_IMAGES); ! void Update(); // sync the tabctrl with all views ! void SetMinViews(int minViews) ! { ! m_minViews = minViews; ! } private: ! HWND m_mdiClient; ! int m_height; ! int m_width; ! CImageList m_images; ! int m_minViews; // minimum number of views ! BOOL m_bImages; ! BOOL m_bTop; ! BOOL m_bPreview; CFont m_font,m_fontbold; HFONT m_hMenuFont; --- 41,63 ---- { public: ! CMDITabs(); ! void Create(CFrameWnd* pMainFrame, DWORD dwStyle = MT_BOTTOM|MT_IMAGES); ! void Update(); // sync the tabctrl with all views ! void SetMinViews(int minViews) ! { ! m_minViews = minViews; ! } private: ! HWND m_mdiClient; ! int m_height; ! int m_width; ! CImageList m_images; ! int m_minViews; // minimum number of views ! BOOL m_bImages; ! BOOL m_bTop; ! BOOL m_bPreview; CFont m_font,m_fontbold; HFONT m_hMenuFont; *************** *** 66,108 **** CLBSpinButtonCtrl m_Spin; BOOL gotmspin; ! CImageList m_NumberOverlays; ! int m_MenuTab; // item on which we opened context menu public: ! int GetMenuTab() ! { ! return m_MenuTab; ! }; ! void SetPreviewMode(BOOL bPreview) ! { ! m_bPreview = bPreview; ! }; protected: virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); ! // Overrides ! // ClassWizard generated virtual function overrides ! //{{AFX_VIRTUAL(CMDITabs) protected: virtual void PreSubclassWindow(); //}}AFX_VIRTUAL ! // Implementation public: ! // Generated message map functions protected: ! //{{AFX_MSG(CMDITabs) ! afx_msg void OnSelChange(NMHDR* pNMHDR, LRESULT* pResult); ! afx_msg void OnPaint(); ! afx_msg void OnNcPaint(); ! afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); ! afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point); afx_msg BOOL OnEraseBkgnd(CDC* pDC); //}}AFX_MSG ! afx_msg LRESULT OnSizeParent(WPARAM, LPARAM lParam); ! DECLARE_MESSAGE_MAP() }; #endif --- 66,115 ---- CLBSpinButtonCtrl m_Spin; BOOL gotmspin; ! bool m_bVisible; ! CImageList m_NumberOverlays; ! int m_MenuTab; // item on which we opened context menu public: ! int GetMenuTab() ! { ! return m_MenuTab; ! }; ! void SetPreviewMode(BOOL bPreview) ! { ! m_bPreview = bPreview; ! }; protected: virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); ! // Overrides ! // ClassWizard generated virtual function overrides ! //{{AFX_VIRTUAL(CMDITabs) protected: virtual void PreSubclassWindow(); //}}AFX_VIRTUAL ! // Implementation public: + /// Is MDI tabs visible. + bool IsVisible(); + /// Show or hide MDI tabs + void SetVisible(bool bVisible); ! // Generated message map functions protected: ! //{{AFX_MSG(CMDITabs) ! afx_msg void OnSelChange(NMHDR* pNMHDR, LRESULT* pResult); ! afx_msg void OnPaint(); ! afx_msg void OnNcPaint(); ! afx_msg void OnContextMenu(CWnd* pWnd, CPoint point); ! afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point); afx_msg BOOL OnEraseBkgnd(CDC* pDC); //}}AFX_MSG ! afx_msg LRESULT OnSizeParent(WPARAM, LPARAM lParam); ! afx_msg BOOL OnToolTipText( UINT id, NMHDR * pTTTStruct, LRESULT * pResult ); ! DECLARE_MESSAGE_MAP() }; #endif + |
|
From: boca4711 <boc...@us...> - 2004-04-12 15:25:31
|
Update of /cvsroot/anyedit/AnyEditv2/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9087/res Modified Files: bmp00021.bmp Log Message: Bug fix and minor Enhancements - MDI toolbar has tooltips with full path of file. -Toggle visibility of MDI toolbar. - minitoolbar moved to CChildFrame, works in debug mode too - add toggle visibility of EOLs to mini toolbar - add some missing hints for buttons of minitoolbar Index: bmp00021.bmp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/res/bmp00021.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs16y0Tr and /tmp/cvsYgnLhj differ |
|
From: Leon W. <moo...@us...> - 2004-04-06 09:14:30
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv645 Modified Files: AnyEdit.cpp AnyEdit.h AnyEditDoc.cpp BrowserView.cpp ChangeLog.txt CodingPref.cpp ColorPref.cpp ConfigFile.cpp EditorPref.cpp FontPref.cpp LangPref.cpp MainFrm.cpp MainFrm.h SAPrefsDialog.cpp SyntaxFile.cpp SyntaxFile.h Log Message: Bug fix and Speed enhancement - Fixed a bug when removing a Language from the Preferences - Speed improvement coz Syntax files are now only parsed when needed. Index: ColorPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ColorPref.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ColorPref.cpp 15 Mar 2004 08:51:53 -0000 1.7 --- ColorPref.cpp 6 Apr 2004 09:01:36 -0000 1.8 *************** *** 87,90 **** --- 87,91 ---- int iColor; CSyntaxFile* m_pSyntaxFile = (CSyntaxFile*)m_pDataFile; + if( !m_pSyntaxFile->Parse() ) return FALSE; CSAPrefsSubDlg::OnInitDialog(); Index: AnyEdit.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** AnyEdit.h 15 Mar 2004 13:08:48 -0000 1.35 --- AnyEdit.h 6 Apr 2004 09:01:36 -0000 1.36 *************** *** 60,64 **** void UpdateStatus(int lineno=-1,int colno=-1,int filetype=0,int overwrite=0,int readfile=0); void OpenStartupPage(); - void OpenPreferences(); void OpenBrowserWindow(LPCSTR url); void ResetAllProperties(); --- 60,63 ---- *************** *** 197,200 **** --- 196,200 ---- afx_msg void OnToolsLoadmacro(); afx_msg void OnUpdateToolsLoadmacro(CCmdUI* pCmdUI); + afx_msg void OnConfigurePreferences(); //}}AFX_MSG DECLARE_MESSAGE_MAP() Index: FontPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FontPref.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FontPref.cpp 15 Mar 2004 08:51:53 -0000 1.7 --- FontPref.cpp 6 Apr 2004 09:01:36 -0000 1.8 *************** *** 104,107 **** --- 104,108 ---- CString szTemp; CSyntaxFile* m_pSyntaxFile = (CSyntaxFile*)m_pDataFile; + if( !m_pSyntaxFile->Parse() ) return FALSE; CSAPrefsSubDlg::OnInitDialog(); Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** MainFrm.cpp 16 Mar 2004 07:27:00 -0000 1.32 --- MainFrm.cpp 6 Apr 2004 09:01:36 -0000 1.33 *************** *** 77,81 **** ON_UPDATE_COMMAND_UI(ID_VIEW_LOOK_CAPTIONS, OnUpdateViewLookCaptions) ON_WM_DESTROY() - ON_COMMAND(ID_CONFIGURE_PREFERENCES, OnConfigurePreferences) ON_COMMAND(ID_VIEW_BOOKMARK_TOOLBAR, OnViewBookmarkToolbar) ON_UPDATE_COMMAND_UI(ID_VIEW_BOOKMARK_TOOLBAR, OnUpdateViewBookmarkToolbar) --- 77,80 ---- *************** *** 928,943 **** } - void CMainFrame::OnConfigurePreferences() - { - CSAPrefsDialog* dlg; - - dlg = new CSAPrefsDialog(); - if( NULL == dlg ) return; - - dlg->SetTitle( "Preferences" ); - dlg->DoModal(); - delete dlg; - } - void CMainFrame::OnViewBookmarkToolbar() { --- 927,930 ---- *************** *** 1382,1390 **** } - void CMainFrame::ShowPreferences() - { - OnConfigurePreferences(); - } - void CMainFrame::UpdateStatus(int lineno, int colno, int filetype, int overwrite, int readfile) { --- 1369,1372 ---- Index: MainFrm.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** MainFrm.h 16 Mar 2004 07:27:00 -0000 1.22 --- MainFrm.h 6 Apr 2004 09:01:36 -0000 1.23 *************** *** 69,73 **** LPCSTR GetCurrentProject(); void UpdateStatus(int lineno=-1,int colno=-1,int filetype=0,int overwrite=0,int readfile=0); - void ShowPreferences(); CFindComboButton * GetFindButton(); void ReturnItemsForCodeList(CStringArray &arr); --- 69,72 ---- *************** *** 129,133 **** afx_msg void OnUpdateViewLookCaptions(CCmdUI* pCmdUI); afx_msg void OnDestroy(); - afx_msg void OnConfigurePreferences(); afx_msg void OnViewBookmarkToolbar(); afx_msg void OnUpdateViewBookmarkToolbar(CCmdUI* pCmdUI); --- 128,131 ---- Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** AnyEdit.cpp 16 Mar 2004 07:27:00 -0000 1.43 --- AnyEdit.cpp 6 Apr 2004 09:01:36 -0000 1.44 *************** *** 40,43 **** --- 40,44 ---- #include "version.h" #include "HtmlFile.h" + #include "SAPrefsDialog.h" // for checking leaks *************** *** 70,74 **** ON_COMMAND(ID_TOOLS_LOADMACRO, OnToolsLoadmacro) ON_UPDATE_COMMAND_UI(ID_TOOLS_LOADMACRO, OnUpdateToolsLoadmacro) ! //}}AFX_MSG_MAP // Standard file based document commands ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) --- 71,76 ---- ON_COMMAND(ID_TOOLS_LOADMACRO, OnToolsLoadmacro) ON_UPDATE_COMMAND_UI(ID_TOOLS_LOADMACRO, OnUpdateToolsLoadmacro) ! ON_COMMAND(ID_CONFIGURE_PREFERENCES, OnConfigurePreferences) ! //}}AFX_MSG_MAP // Standard file based document commands ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) *************** *** 1067,1076 **** } - void CAnyEditApp::OpenPreferences() - { - CMainFrame *pMainframe; - pMainframe = (CMainFrame*) m_pMainWnd; - pMainframe->ShowPreferences(); - } void CAnyEditApp::OpenStartupPage() --- 1069,1072 ---- *************** *** 1636,1646 **** // Load all the Syntax files that are set in the // config file. These objects will be used to fill ! // Scintilla. void CAnyEditApp::LoadSyntaxFiles() { int iCount; CString szFileName; CSyntaxFile* pSyntaxFile; // Get the Language count. int iNrLanguages = ConfigFile.GetLanguageCount(); --- 1632,1654 ---- // Load all the Syntax files that are set in the // config file. These objects will be used to fill ! // the Scintilla object. void CAnyEditApp::LoadSyntaxFiles() { int iCount; + FILE* fp; + POSITION pos; CString szFileName; CSyntaxFile* pSyntaxFile; + // Clear the list + pos = mapSyntaxFiles.GetStartPosition(); + while( NULL != pos ) + { + int iLanguage; + mapSyntaxFiles.GetNextAssoc( pos, iLanguage, pSyntaxFile ); + if( NULL != pSyntaxFile ) delete pSyntaxFile; + } + mapSyntaxFiles.RemoveAll(); + // Get the Language count. int iNrLanguages = ConfigFile.GetLanguageCount(); *************** *** 1660,1666 **** pSyntaxFile->SetFilename( szFileName ); // Read the syntax definitions from the file. ! if( !pSyntaxFile->Parse() ) { // The username file doesn't exist read the default CString szDefaultFileName=GetAppPath(); --- 1668,1679 ---- pSyntaxFile->SetFilename( szFileName ); + fp = fopen( szFileName, "rw" ); // Read the syntax definitions from the file. ! if( !fp ) { + CFile file1; + CFile file2; + UINT bytesRead; + char filebuffer[1024]; // The username file doesn't exist read the default CString szDefaultFileName=GetAppPath(); *************** *** 1669,1686 **** szDefaultFileName += SYNTAX_DIR; szDefaultFileName += ConfigFile.GetLanguageSyntaxFileName( iCount ); ! pSyntaxFile->SetFilename( szDefaultFileName ); ! if( !pSyntaxFile->Parse() ) { ! // How should we handle invalid syntax files? ! delete pSyntaxFile; ! continue; } ! else { ! // Save the default to the users syntax file. ! pSyntaxFile->SetFilename( szFileName ); ! pSyntaxFile->Save(); } } // Add the parsed object to the Syntax file map. --- 1682,1706 ---- szDefaultFileName += SYNTAX_DIR; szDefaultFileName += ConfigFile.GetLanguageSyntaxFileName( iCount ); ! ! if( !file1.Open( szDefaultFileName, CFile::modeRead | CFile::typeBinary ) ) { ! continue; } ! ! if( !file2.Open( szFileName, CFile::modeCreate | CFile::modeWrite | CFile::typeBinary ) ) { ! continue; } + bytesRead = 1; + while( bytesRead ) + { + bytesRead = file1.Read( filebuffer, 1024 ); + if( bytesRead ) file2.Write( filebuffer, bytesRead ); + } + } + else + { + fclose( fp ); } // Add the parsed object to the Syntax file map. *************** *** 1742,1743 **** --- 1762,1778 ---- } + + void CAnyEditApp::OnConfigurePreferences() + { + CSAPrefsDialog* dlg; + + dlg = new CSAPrefsDialog(); + if( NULL == dlg ) return; + + dlg->SetTitle( "Preferences" ); + dlg->DoModal(); + FillExtensionMap(); + LoadSyntaxFiles(); + + delete dlg; + } Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ChangeLog.txt 15 Mar 2004 13:08:48 -0000 1.41 --- ChangeLog.txt 6 Apr 2004 09:01:36 -0000 1.42 *************** *** 16,19 **** --- 16,20 ---- 11) Automatically set EOL mode on OpenDocument 12) Preferences changes - Add, Change and Remove Lanuages for Syntax Highlighting + 13) Speed enhancement, syntax files are only parsed when needed Beta 2.0 [Tester's Release 2] Index: LangPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/LangPref.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LangPref.cpp 15 Mar 2004 08:51:53 -0000 1.5 --- LangPref.cpp 6 Apr 2004 09:01:36 -0000 1.6 *************** *** 113,117 **** if( bff && !ff.IsDirectory() && !ff.IsDots() ) { ! if( ff.GetFileName() != "default" ) m_cbSyntaxFile.AddString( ff.GetFileName() ); } } --- 113,117 ---- if( bff && !ff.IsDirectory() && !ff.IsDots() ) { ! if( ff.GetFileName() != "default.syn" ) m_cbSyntaxFile.AddString( ff.GetFileName() ); } } *************** *** 180,183 **** --- 180,188 ---- } m_cbSyntaxFile.GetLBText( m_cbSyntaxFile.GetCurSel(), sSyntaxFile ); + if( sSyntaxFile.IsEmpty() ) + { + MessageBox( "You have to select a syntax file for the language!", "Error" ); + return; + } m_cbAutoCompFile.GetLBText( m_cbAutoCompFile.GetCurSel(), sAutoCompFile ); *************** *** 215,218 **** --- 220,230 ---- return; } + m_cbSyntaxFile.GetLBText( m_cbSyntaxFile.GetCurSel(), sTemp ); + if( sTemp.IsEmpty() ) + { + MessageBox( "You have to select a syntax file for the language!", "Error" ); + return; + } + if( pConfigFile->GetLanguageName( m_lbLanguageList.GetCurSel() + 1 ) != sName ) *************** *** 221,225 **** bChanges = true; } - m_cbSyntaxFile.GetLBText( m_cbSyntaxFile.GetCurSel(), sTemp ); if( pConfigFile->GetLanguageSyntaxFileName( m_lbLanguageList.GetCurSel() + 1 ) != sTemp ) { --- 233,236 ---- Index: AnyEditDoc.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AnyEditDoc.cpp 15 Mar 2004 13:08:48 -0000 1.19 --- AnyEditDoc.cpp 6 Apr 2004 09:01:36 -0000 1.20 *************** *** 321,324 **** --- 321,325 ---- } + // Gets the Language number of the Language associated with the document. int CAnyEditDoc::GetLanguageNr() { *************** *** 326,334 **** } void CAnyEditDoc::SetLanguageNr( int iLanguageNr ) { ! iLanguage = iLanguageNr; } void CAnyEditDoc::SetScintillaProperties() { --- 327,338 ---- } + // Sets the Language number of the Language associated with the document. void CAnyEditDoc::SetLanguageNr( int iLanguageNr ) { ! iLanguage = iLanguageNr; } + // This function sets all the Properties of the + // Scintilla object from a Syntaxfile. void CAnyEditDoc::SetScintillaProperties() { *************** *** 343,346 **** --- 347,352 ---- if( NULL == pSyntaxFile ) return; + if( !pSyntaxFile->Parse() ) return; + // Clear the Scintilla object m_pScintilla->StyleClearAll(); Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SyntaxFile.cpp 16 Mar 2004 07:27:00 -0000 1.6 --- SyntaxFile.cpp 6 Apr 2004 09:01:36 -0000 1.7 *************** *** 29,32 **** --- 29,33 ---- szFileName = ""; + m_bParsed = FALSE; // Set the string compare functions for the CSortedArray's with keywords. *************** *** 94,97 **** --- 95,100 ---- if( szFileName.IsEmpty() ) return false; + if( m_bParsed ) return true; + if( !xparser.parse_file( szFileName ) ) return false; *************** *** 111,115 **** } ! return true; } --- 114,118 ---- } ! return m_bParsed = true; } *************** *** 185,188 **** --- 188,194 ---- filebuf fb; xml_node xnode; + + // If not parsed don't save + if( !m_bParsed ) return; fb.open( szFileName, ios::out ); ostream os(&fb); Index: SyntaxFile.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SyntaxFile.h 15 Mar 2004 08:51:53 -0000 1.6 --- SyntaxFile.h 6 Apr 2004 09:01:36 -0000 1.7 *************** *** 105,108 **** --- 105,109 ---- protected: CString szFileName; + BOOL m_bParsed; xml_parser xparser; CSortedArray<CString, CString> Keywords[KEYWORDSET_MAX]; Index: ConfigFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConfigFile.cpp 15 Mar 2004 08:51:53 -0000 1.2 --- ConfigFile.cpp 6 Apr 2004 09:01:36 -0000 1.3 *************** *** 363,366 **** --- 363,375 ---- xnode = GetLanguagesNode(); + if( xnode.empty() ) return FALSE; + + uiCount = xnode.children(); + sprintf( szNumber, "%i", uiCount - 1 ); + + xattribute = xnode.attribute( (unsigned int)0 ); + if( xattribute.empty() ) return FALSE; + + if( !xattribute.value( szNumber ) ) return FALSE; sprintf( szNumber, "%i", iNumber ); Index: EditorPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/EditorPref.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EditorPref.cpp 15 Mar 2004 08:51:53 -0000 1.8 --- EditorPref.cpp 6 Apr 2004 09:01:36 -0000 1.9 *************** *** 102,105 **** --- 102,106 ---- // Cast the pointer. CSyntaxFile* m_pSyntaxFile = (CSyntaxFile*)m_pDataFile; + if( !m_pSyntaxFile->Parse() ) return FALSE; m_bMarginLineNumbers = m_pSyntaxFile->GetMarginLineNumber(); Index: CodingPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CodingPref.cpp 15 Mar 2004 08:51:53 -0000 1.8 --- CodingPref.cpp 6 Apr 2004 09:01:36 -0000 1.9 *************** *** 96,99 **** --- 96,100 ---- CString szParserDelay; CSyntaxFile* m_pSyntaxFile = (CSyntaxFile*)m_pDataFile; + if( !m_pSyntaxFile->Parse() ) return FALSE; CSAPrefsSubDlg::OnInitDialog(); Index: SAPrefsDialog.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SAPrefsDialog.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SAPrefsDialog.cpp 15 Mar 2004 13:08:48 -0000 1.8 --- SAPrefsDialog.cpp 6 Apr 2004 09:01:36 -0000 1.9 *************** *** 172,176 **** // Let's build the sub dialogs list to select from the tree int iCount; - CRegProfile registry; CString szLanguageName; CString szLanguageNr; --- 172,175 ---- Index: BrowserView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/BrowserView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BrowserView.cpp 8 May 2003 12:00:56 -0000 1.3 --- BrowserView.cpp 6 Apr 2004 09:01:36 -0000 1.4 *************** *** 99,103 **** else if(arr.GetAt(0).Compare("Preferences")==0) { ! theApp.OpenPreferences(); } --- 99,103 ---- else if(arr.GetAt(0).Compare("Preferences")==0) { ! theApp.OnConfigurePreferences(); } |
|
From: Leon W. <moo...@us...> - 2004-03-16 07:36:19
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700 Modified Files: AnyEdit.cpp AnyEditView.cpp CreditStatic.cpp MainFrm.cpp MainFrm.h SyntaxFile.cpp Log Message: Minor Enhancements - Save All now also saves Workspace. - Open file now opens in the directory of the current active document. - Ability to use non standard lexers. - Working About Box in Debug build. Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** MainFrm.cpp 15 Mar 2004 13:08:48 -0000 1.31 --- MainFrm.cpp 16 Mar 2004 07:27:00 -0000 1.32 *************** *** 1020,1024 **** void CMainFrame::OnFileSaveworkspace() { ! if(!m_wndWorkSpace.SaveCurrentWorkspace()) MessageBox(_T("Workspace Save Error ! Please submit bug report to an...@ya...")); } --- 1020,1024 ---- void CMainFrame::OnFileSaveworkspace() { ! if(m_wndWorkSpace.IsWorkspaceLoaded() && !m_wndWorkSpace.SaveCurrentWorkspace()) MessageBox(_T("Workspace Save Error ! Please submit bug report to an...@ya...")); } Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** AnyEditView.cpp 15 Mar 2004 13:08:48 -0000 1.48 --- AnyEditView.cpp 16 Mar 2004 07:27:00 -0000 1.49 *************** *** 1212,1215 **** --- 1212,1216 ---- // TODO: This may need to be cleaned up, check it. + CurDocPath = GetDocument()->GetPathName(); CString prevpath = theApp.GetCurDocPath(); if(prevpath.Compare(CurDocPath)==0) Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** AnyEdit.cpp 15 Mar 2004 13:08:47 -0000 1.42 --- AnyEdit.cpp 16 Mar 2004 07:27:00 -0000 1.43 *************** *** 728,732 **** } ! } --- 728,733 ---- } ! // Also save the workspace file ! ((CMainFrame*)m_pMainWnd)->OnFileSaveworkspace(); } *************** *** 825,828 **** --- 826,830 ---- dlg.m_ofn.lpstrFile = fileName.GetBuffer(3000); dlg.m_ofn.nMaxFile = 3000; + dlg.m_ofn.lpstrInitialDir = curDocPath; dlg.m_ofn.hwndOwner = AfxGetMainWnd()->m_hWnd; Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SyntaxFile.cpp 26 Feb 2004 08:44:16 -0000 1.5 --- SyntaxFile.cpp 16 Mar 2004 07:27:00 -0000 1.6 *************** *** 195,198 **** --- 195,199 ---- int CSyntaxFile::GetLexerNumber() { + int i; CString name; xml_node xnode; *************** *** 260,265 **** if( name == "SCLEX_MSSQL" ) return SCLEX_MSSQL; if( name == "SCLEX_VERILOG" ) return SCLEX_VERILOG; ! return -1; } --- 261,270 ---- if( name == "SCLEX_MSSQL" ) return SCLEX_MSSQL; if( name == "SCLEX_VERILOG" ) return SCLEX_VERILOG; + for( i = 0; i < name.GetLength(); ++ i ) + { + if( !isdigit( name[i] ) ) return -1; + } ! return atoi( name ); } Index: MainFrm.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MainFrm.h 28 Nov 2003 13:20:37 -0000 1.21 --- MainFrm.h 16 Mar 2004 07:27:00 -0000 1.22 *************** *** 137,141 **** --- 137,143 ---- afx_msg void OnHelpKeyboardkeymanager(); afx_msg void OnFileOpenworkspace(); + public: afx_msg void OnFileSaveworkspace(); + protected: afx_msg void OnFileCloseworkspace(); afx_msg void OnUpdateFileSaveworkspace(CCmdUI* pCmdUI); Index: CreditStatic.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/CreditStatic.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CreditStatic.cpp 15 Mar 2004 13:08:48 -0000 1.3 --- CreditStatic.cpp 16 Mar 2004 07:27:00 -0000 1.4 *************** *** 116,120 **** ASSERT(credits); ! if((str = strdup(credits)) == NULL) return; --- 116,120 ---- ASSERT(credits); ! if((str = _strdup(credits)) == NULL) return; |
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28954 Modified Files: AnyEdit.cpp AnyEdit.dsp AnyEdit.h AnyEditDoc.cpp AnyEditDoc.h AnyEditView.cpp AnyEditView.h ChangeLog.txt ClipTree.cpp CreditStatic.cpp DirextPref.cpp DumpHandleApp.cpp LBSpinButtonCtrl.cpp MDITabs.cpp MainFrm.cpp ProjectTree.cpp SAPrefsDialog.cpp StdAfx.h cgfiltyp.cpp pugxml.h Removed Files: ChangesLog.txt ScintillaDefaults.cpp ScintillaDefaults.h lineparse.h script.cpp script.h tokens.cpp tokens.h Log Message: Code Cleanup - CScintillaDefaults, CScript, CTokens and LineParser have become obsolete so they are removed. - AnyEditApp, AnyEditDoc, AnyEditView removed references to the deleted classes. - Pugxml.h disabled STL warnings. - Removed unreferenced local variables from multiple files Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** AnyEdit.cpp 18 Feb 2004 04:43:27 -0000 1.41 --- AnyEdit.cpp 15 Mar 2004 13:08:47 -0000 1.42 *************** *** 66,74 **** ON_COMMAND(ID_FILE_NEW, OnFileNew) ON_COMMAND(ID_FILE_OPENSTARTUPPAGE, OnFileOpenstartuppage) ! ON_COMMAND(ID_TOOLS_SAVEMACRO, OnToolsSavemacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_SAVEMACRO, OnUpdateToolsSavemacro) ! ON_COMMAND(ID_TOOLS_LOADMACRO, OnToolsLoadmacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_LOADMACRO, OnUpdateToolsLoadmacro) ! //}}AFX_MSG_MAP // Standard file based document commands ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) --- 66,74 ---- ON_COMMAND(ID_FILE_NEW, OnFileNew) ON_COMMAND(ID_FILE_OPENSTARTUPPAGE, OnFileOpenstartuppage) ! ON_COMMAND(ID_TOOLS_SAVEMACRO, OnToolsSavemacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_SAVEMACRO, OnUpdateToolsSavemacro) ! ON_COMMAND(ID_TOOLS_LOADMACRO, OnToolsLoadmacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_LOADMACRO, OnUpdateToolsLoadmacro) ! //}}AFX_MSG_MAP // Standard file based document commands ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) *************** *** 86,90 **** // Place all significant initialization in InitInstance m_bTabFlatBorders = FALSE; - //hClassViewParserThread=INVALID_HANDLE_VALUE; m_ClassViewParserThread=NULL; m_bLastParsedFileInCurrentProject=false; --- 86,89 ---- *************** *** 98,102 **** POSITION pos; ! if(macroholder) { macroholder->DeleteNext(); --- 97,101 ---- POSITION pos; ! if( macroholder ) { macroholder->DeleteNext(); *************** *** 105,116 **** } - pos = langmap.GetStartPosition(); - while( NULL != pos ) - { - CLanguage * lang; - CString str; - langmap.GetNextAssoc(pos,str,(CObject *&)lang); - delete lang; - } // Cleanup Syntax File objects --- 104,107 ---- *************** *** 242,249 **** LoadGlobalSettings(); - // m_sdefaults.LoadDefaults(); - - LoadLanguageExtensions(); - // First get the username of the current user TCHAR tcUserName[100]; --- 233,236 ---- *************** *** 416,423 **** } - void CAnyEditApp::PreLoadState() - { - } - void CAnyEditApp::SaveCustomState () { --- 403,406 ---- *************** *** 446,450 **** } - BOOL CAnyEditApp::OnViewDoubleClick (int iViewId) { --- 429,432 ---- *************** *** 468,472 **** // CAnyEditApp message handlers - int CAnyEditApp::ExitInstance() { --- 450,453 ---- *************** *** 535,540 **** sCredits += "Developer\r||"; ! sCredits += "Leon Wennekers|(moo...@so...)|||"; ! sCredits += "Additional Contributors\r||"; sCredits += "Mike Loolard|"; --- 516,521 ---- sCredits += "Developer\r||"; ! sCredits += "Leon Wennekers|(moo...@us...)|||"; ! sCredits += "Additional Contributors\r||"; sCredits += "Mike Loolard|"; *************** *** 659,664 **** return; } - CAnyEditView *pView = (CAnyEditView *) pChild->GetActiveView(); - //pView->SetCursorStartPoint(); deepwashere } --- 640,643 ---- *************** *** 756,765 **** pDocTemplate->SaveAllModified(); pDocTemplate->CloseAllDocuments(FALSE); - /*POSITION pos = pDocTemplate->GetFirstDocPosition(); - CAnyEditDoc * xx; - while((xx= (CAnyEditDoc *)pDocTemplate->GetNextDoc(pos)) !=NULL) - { - xx->OnCloseDocument(); - }*/ } --- 735,738 ---- *************** *** 1044,1065 **** } - /*void CAnyEditApp::SetDefaults(CScintilla *scintilla) - { - m_sdefaults.ApplyDefaults(scintilla); - }*/ - void CAnyEditApp::ResetAllProperties() { - // m_sdefaults.LoadDefaults(); - /* LoadLanguageExtensions(); - POSITION lpos = langmap.GetStartPosition(); - while(lpos!=NULL) - { - CString tstr; - CObject * tlang; - langmap.GetNextAssoc(lpos,tstr,tlang); - LoadLanguage(tstr); - }*/ - POSITION pos = pDocTemplate->GetFirstDocPosition(); while(pos!=NULL) --- 1017,1022 ---- *************** *** 1075,1079 **** } ! } --- 1032,1036 ---- } ! } *************** *** 1092,1225 **** - /*void CAnyEditApp::ApplyOtherDefaults(CScintilla *scintilla) - { - m_sdefaults.ApplyOtherDefaults(scintilla); - }*/ - - void CAnyEditApp::LoadLanguageExtensions() - { - int x = m_reg.GetProfileInt(SEC_LANG,_T("Count"),0); - TCHAR tempStr[1024]; - extmap.RemoveAll(); - - CString langstr; - CStringArray tmparr; - for(int i=1;i<=x;i++) - { - langstr = SEC_LANG; - langstr += REG_SEP; - langstr += m_reg.GetProfileString(SEC_LANG,msc.GetStringForInt(i),tempStr,""); - langstr = m_reg.GetProfileString(langstr,"Extension",tempStr,""); - tmparr.RemoveAll(); - msc.ReturnDelimitedArray(langstr,",",tmparr); - - for(int j=0;j<tmparr.GetSize();j++) - { - langstr = tmparr.GetAt(j); - langstr.MakeUpper(); - extmap.SetAt(langstr,msc.GetStringForInt(i)); - } - - } - - } - - CLanguage * CAnyEditApp::GetLanguage(LPCSTR ext) - { - - CString pos; - extmap.Lookup(ext,pos); - if(pos.IsEmpty()) - return NULL; - - CObject * lang=NULL; - langmap.Lookup(pos,lang); - if(lang==NULL) - lang = LoadLanguage(pos); - - return (CLanguage *)lang; - - } - - CString CAnyEditApp::SetScintillaLanguage(LPCSTR ext, CScintilla *scintilla) - { - - CString pos; - extmap.Lookup(ext,pos); - if(pos.IsEmpty()) - return ""; - - CObject * lang=NULL; - langmap.Lookup(pos,lang); - if(lang==NULL) - lang = LoadLanguage(pos); - else - { - // ((CLanguage *)lang)->FillUpScintilla(scintilla); - return pos; - } - - if(lang==NULL) - return pos; - - //((CLanguage *)lang)->FillUpScintilla(scintilla); - return pos; - } - - - - CObject * CAnyEditApp::LoadLanguage(LPCSTR langpos) - { - - char tempStr[1024]; - CString tempstr; - CString langstr = SEC_LANG; - CString acmpstr; - tempstr = m_reg.GetProfileString(langstr,langpos,tempStr,""); - - langstr += REG_SEP; - langstr += tempstr; - acmpstr = langstr; - langstr = m_reg.GetProfileString(langstr,"SyntaxFile",tempStr,""); - if(langstr.IsEmpty()) - return NULL; - - CString fullname = GetAppPath(); - fullname+= "\\Syntax\\"; - fullname+= langstr; - - FILE * fp = fopen(fullname,"rt"); - if(fp==NULL) - return NULL; - - CLanguage * lang; - CObject * tlang=NULL; - langmap.Lookup(langpos,tlang); - if(tlang==NULL) - { - lang = new CLanguage(); - }else - { - lang = (CLanguage *)tlang; - lang->ResetLanguage(); - } - - CScript sc; - int lp; - sc.process_script(fp,fullname.GetBuffer(fullname.GetLength()),&lp,lang); - fclose(fp); - - acmpstr=m_reg.GetProfileString(acmpstr,_T("ACPFile"),tempStr,_T("")); - fullname = GetAppPath(); - fullname += "Syntax\\"; - fullname += acmpstr; - - lang->LoadAcmpFile(fullname); - - langmap.SetAt(langpos,lang); - return (CObject *)lang; - - } - void CAnyEditApp::OnFileNew() --- 1049,1052 ---- *************** *** 1283,1288 **** LPCSTR CAnyEditApp::GetCurDocPath() { - //LPCSTR retS = curDocPath.GetBuffer(curDocPath.GetLength()); - //return retS; return curDocPath; } --- 1110,1113 ---- *************** *** 1535,1554 **** } - void CAnyEditApp::ReloadACMP() - { - POSITION pos = langmap.GetStartPosition(); - while(pos!=NULL) - { - CLanguage * lang; - CString str; - langmap.GetNextAssoc(pos,str,(CObject *&)lang); - if(lang)lang->LoadAcmpFile(); - } - } - void CAnyEditApp::OnToolsSavemacro() { - // TODO: Add your command handler code here - CString str; if(theApp.DoPromptFileName(str,_T("Choose file to save macro"),OFN_HIDEREADONLY,FALSE)) --- 1360,1365 ---- *************** *** 1876,1880 **** } - // Find the SyntaxFile object by it's language number CSyntaxFile* CAnyEditApp::GetSyntaxFile( int iLanguage ) --- 1687,1690 ---- *************** *** 1884,1885 **** --- 1694,1741 ---- return pSyntaxFile; } + + void CAnyEditApp::SetModification( BOOL modval ) + { + check_modification = modval; + } + + BOOL CAnyEditApp::CheckModification() + { + return check_modification; + } + + BOOL CAnyEditApp::GetAlphabetic() + { + return alphabetic; + } + + void CAnyEditApp::SetLastSearchText( LPCSTR stxt ) + { + lastsearchtext=stxt; + } + + LPCSTR CAnyEditApp::GetLastSearchText() + { + return lastsearchtext; + } + + void CAnyEditApp::SetSearchDirection( BOOL down ) + { + lastsearchdirection = down; + } + + BOOL CAnyEditApp::GetSearchDirection() + { + return lastsearchdirection; + } + + void CAnyEditApp::SetLastFlags( int flags ) + { + lastsearchflags = flags; + } + + int CAnyEditApp::GetLastFlags() + { + return lastsearchflags; + } + Index: AnyEdit.dsp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** AnyEdit.dsp 19 Feb 2004 07:39:34 -0000 1.30 --- AnyEdit.dsp 15 Mar 2004 13:08:48 -0000 1.31 *************** *** 72,76 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 72,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 412,419 **** # Begin Source File - SOURCE=.\ScintillaDefaults.cpp - # End Source File - # Begin Source File - SOURCE=.\SeException.cpp # End Source File --- 412,415 ---- *************** *** 1390,1429 **** # End Source File # End Group - # Begin Group "langparser" - - # PROP Default_Filter "" - # Begin Source File - - SOURCE=.\Language.cpp - # End Source File - # Begin Source File - - SOURCE=.\Language.h - # End Source File - # Begin Source File - - SOURCE=.\lineparse.h - # End Source File - # Begin Source File - - SOURCE=.\script.cpp - # End Source File - # Begin Source File - - SOURCE=.\script.h - # End Source File - # Begin Source File - - SOURCE=.\strlist.h - # End Source File - # Begin Source File - - SOURCE=.\tokens.cpp - # End Source File - # Begin Source File - - SOURCE=.\tokens.h - # End Source File - # End Group # Begin Source File --- 1386,1389 ---- Index: AnyEdit.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** AnyEdit.h 12 Feb 2004 13:05:50 -0000 1.34 --- AnyEdit.h 15 Mar 2004 13:08:48 -0000 1.35 *************** *** 13,19 **** #endif - #include "Language.h" - #include "script.h" - #include "resource.h" // main symbols --- 13,16 ---- *************** *** 29,33 **** #include "DumpHandleApp.h" #include "FindComboBox.h" - #include "ScintillaDefaults.h" #include "Misc.h" #include "TagList.h" --- 26,29 ---- *************** *** 36,39 **** --- 32,36 ---- #include "ConfigFile.h" #include "SyntaxFile.h" + #include "scintillaif.h" //Save final position *************** *** 65,76 **** void OpenPreferences(); void OpenBrowserWindow(LPCSTR url); - CObject * LoadLanguage(LPCSTR langpos); - CString SetScintillaLanguage(LPCSTR ext, CScintilla *scintilla); - CLanguage * GetLanguage(LPCSTR ext); - void LoadLanguageExtensions(); - // void ApplyOtherDefaults(CScintilla * scintilla); void ResetAllProperties(); ! // void SetDefaults(CScintilla * scintilla); ! CBCGToolbarComboBoxButton * GetFindCombo(); void ReturnItemsForCodeList(CStringArray &arr); void UpdateMditabs(); --- 62,67 ---- void OpenPreferences(); void OpenBrowserWindow(LPCSTR url); void ResetAllProperties(); ! CBCGToolbarComboBoxButton* GetFindCombo(); void ReturnItemsForCodeList(CStringArray &arr); void UpdateMditabs(); *************** *** 78,84 **** CAnyEditApp(); ~CAnyEditApp(); ! virtual void PreLoadState(); ! void LoadCustomState (); ! void SaveCustomState (); void AddLangType(LPCSTR lang); BOOL IsLangPresent(LPCSTR lang); --- 69,74 ---- CAnyEditApp(); ~CAnyEditApp(); ! void LoadCustomState(); ! void SaveCustomState(); void AddLangType(LPCSTR lang); BOOL IsLangPresent(LPCSTR lang); *************** *** 113,160 **** BOOL GetDocumentPosition(LPCSTR filepath,long &startpos,long &endpos,int &visline); void SetDocumentPosition(LPCSTR filepath, long startpos, long endpos, int visline); ! void SetModification(BOOL modval) ! { ! check_modification = modval; ! } ! BOOL CheckModification() ! { ! return check_modification; ! } ! BOOL GetAlphabetic() ! { ! return alphabetic; ! } ! void SetLastSearchText(LPCSTR stxt) ! { ! lastsearchtext=stxt; ! } ! ! LPCSTR GetLastSearchText() ! { ! return lastsearchtext; ! } ! ! void SetSearchDirection(BOOL down) ! { ! lastsearchdirection = down; ! } ! ! BOOL GetSearchDirection() ! { ! return lastsearchdirection; ! } ! ! void SetLastFlags(int flags) ! { ! lastsearchflags = flags; ! } ! ! int GetLastFlags() ! { ! return lastsearchflags; ! } public: - void ReloadACMP(); void ClearClassView(); CComboBox * findbox; --- 103,117 ---- BOOL GetDocumentPosition(LPCSTR filepath,long &startpos,long &endpos,int &visline); void SetDocumentPosition(LPCSTR filepath, long startpos, long endpos, int visline); ! void SetModification( BOOL modval ); ! BOOL CheckModification(); ! BOOL GetAlphabetic(); ! void SetLastSearchText( LPCSTR stxt ); ! LPCSTR GetLastSearchText(); ! void SetSearchDirection( BOOL down ); ! BOOL GetSearchDirection(); ! void SetLastFlags( int flags ); ! int GetLastFlags(); public: void ClearClassView(); CComboBox * findbox; *************** *** 173,178 **** CString curDocPath; BOOL m_bLastParsedFileInCurrentProject; - CMapStringToOb langmap; - CMapStringToString extmap; CMisc msc; CWinThread* m_ClassViewParserThread; --- 130,133 ---- *************** *** 248,255 **** CBCGMouseManager m_MouseManager; CBCGContextMenuManager m_ContextMenuManager; ! CScintillaDefaults m_sdefaults; ! } ! ; ! extern CAnyEditApp theApp; --- 203,207 ---- CBCGMouseManager m_MouseManager; CBCGContextMenuManager m_ContextMenuManager; ! }; extern CAnyEditApp theApp; Index: AnyEditDoc.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AnyEditDoc.cpp 26 Feb 2004 08:44:16 -0000 1.18 --- AnyEditDoc.cpp 15 Mar 2004 13:08:48 -0000 1.19 *************** *** 32,36 **** CAnyEditDoc::CAnyEditDoc() { - m_pDocLang = NULL; iLanguage = 0; // Use default if unknown bFirstTimeProperties = TRUE; --- 32,35 ---- *************** *** 218,225 **** msg+= "'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?"; if(AfxMessageBox(msg,MB_YESNO)==IDYES) ! { m_pScintilla->SetFocus(); m_pScintilla->OpenFile(str); ! } else { --- 217,224 ---- msg+= "'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?"; if(AfxMessageBox(msg,MB_YESNO)==IDYES) ! { m_pScintilla->SetFocus(); m_pScintilla->OpenFile(str); ! } else { *************** *** 322,346 **** } ! void CAnyEditDoc::SetDocLanguage(CLanguage * m_plang) ! { ! m_pDocLang = m_plang; ! } ! ! void CAnyEditDoc::GetListWords(CString &result) ! { ! if(m_pDocLang==NULL) return; ! m_pDocLang->GetListWords(result); ! } ! ! BOOL CAnyEditDoc::GetAcmpValueToArray(LPCSTR val, CStringArray &arr) ! { ! if(m_pDocLang==NULL) return FALSE; ! return m_pDocLang->GetValueToArray(val,arr); ! } ! ! BOOL CAnyEditDoc::GetAcmpWordList(CStringArray &arr) { ! if(m_pDocLang==NULL) return FALSE; ! return m_pDocLang->GetAcmpWordList(arr); } --- 321,327 ---- } ! int CAnyEditDoc::GetLanguageNr() { ! return iLanguage; } Index: AnyEditDoc.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AnyEditDoc.h 23 Feb 2004 14:24:40 -0000 1.9 --- AnyEditDoc.h 15 Mar 2004 13:08:48 -0000 1.10 *************** *** 10,14 **** #endif // _MSC_VER > 1000 #include "scintillaif.h" - #include "Language.h" #include "SyntaxFile.h" --- 10,13 ---- *************** *** 35,39 **** CScintilla * m_pScintilla; CString szDocumentFilePath; - CLanguage * m_pDocLang; CTime LastAccessTime; --- 34,37 ---- *************** *** 54,66 **** // Implementation public: - BOOL GetAcmpWordList(CStringArray &arr); - BOOL GetAcmpValueToArray(LPCSTR val, CStringArray &arr); - void GetListWords(CString &result); BOOL SaveTempCopy(CString tempPath); void ReloadDefaults(); void HasBeenModified(BOOL modified); void SetDocScintilla(CScintilla * m_pscin); - void SetDocLanguage(CLanguage * m_plang); void SetLanguageNr( int iLanguageNr ); void SetScintillaProperties(); --- 52,61 ---- // Implementation public: BOOL SaveTempCopy(CString tempPath); void ReloadDefaults(); void HasBeenModified(BOOL modified); void SetDocScintilla(CScintilla * m_pscin); + int GetLanguageNr(); void SetLanguageNr( int iLanguageNr ); void SetScintillaProperties(); Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** AnyEditView.cpp 26 Feb 2004 08:44:16 -0000 1.47 --- AnyEditView.cpp 15 Mar 2004 13:08:48 -0000 1.48 *************** *** 10,14 **** #include "FindReplace.h" #include "Goto.h" - #include "Language.h" #include "SyntaxFile.h" --- 10,13 ---- *************** *** 93,114 **** ON_COMMAND(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnToolsHighlightcurrentline) ON_UPDATE_COMMAND_UI(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnUpdateToolsHighlightcurrentline) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP, OnConfigureCurrentdocumentWordwrap) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP, OnUpdateConfigureCurrentdocumentWordwrap) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING, OnConfigureCurrentdocumentSyntaxhighlighting) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING, OnUpdateConfigureCurrentdocumentSyntaxhighlighting) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS, OnConfigureCurrentdocumentLinenumbers) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS, OnUpdateConfigureCurrentdocumentLinenumbers) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN, OnConfigureCurrentdocumentBookmarkmargin) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN, OnUpdateConfigureCurrentdocumentBookmarkmargin) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnConfigureCurrentdocumentFoldmargin) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnUpdateConfigureCurrentdocumentFoldmargin) ! ON_WM_DESTROY() ! ON_COMMAND(ID_FILE_PRINT_PREVIEW, OnFilePrintPreview) ! ON_COMMAND(ID_TOOLS_REPEATCOMMAND, OnToolsRepeatcommand) ! ON_COMMAND(ID_TOOLS_PLAYRECORDING, OnToolsPlayrecording) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_RECORDMACRO, OnUpdateToolsRecordmacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_PLAYRECORDING, OnUpdateToolsPlayrecording) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_REPEATCOMMAND, OnUpdateToolsRepeatcommand) ! //}}AFX_MSG_MAP ON_WM_CONTEXTMENU() // Standard printing commands --- 92,113 ---- ON_COMMAND(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnToolsHighlightcurrentline) ON_UPDATE_COMMAND_UI(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnUpdateToolsHighlightcurrentline) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP, OnConfigureCurrentdocumentWordwrap) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP, OnUpdateConfigureCurrentdocumentWordwrap) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING, OnConfigureCurrentdocumentSyntaxhighlighting) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING, OnUpdateConfigureCurrentdocumentSyntaxhighlighting) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS, OnConfigureCurrentdocumentLinenumbers) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS, OnUpdateConfigureCurrentdocumentLinenumbers) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN, OnConfigureCurrentdocumentBookmarkmargin) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN, OnUpdateConfigureCurrentdocumentBookmarkmargin) ! ON_COMMAND(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnConfigureCurrentdocumentFoldmargin) ! ON_UPDATE_COMMAND_UI(ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN, OnUpdateConfigureCurrentdocumentFoldmargin) ! ON_WM_DESTROY() ! ON_COMMAND(ID_FILE_PRINT_PREVIEW, OnFilePrintPreview) ! ON_COMMAND(ID_TOOLS_REPEATCOMMAND, OnToolsRepeatcommand) ! ON_COMMAND(ID_TOOLS_PLAYRECORDING, OnToolsPlayrecording) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_RECORDMACRO, OnUpdateToolsRecordmacro) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_PLAYRECORDING, OnUpdateToolsPlayrecording) ! ON_UPDATE_COMMAND_UI(ID_TOOLS_REPEATCOMMAND, OnUpdateToolsRepeatcommand) ! //}}AFX_MSG_MAP ON_WM_CONTEXTMENU() // Standard printing commands *************** *** 145,149 **** CAnyEditView::CAnyEditView() { - // TODO: add construction code here EnableParsing = FALSE; ParseTimeLimit = m_reg.GetProfileInt(_T("Preferences"),_T("ParserDelay"),1500); --- 144,147 ---- *************** *** 153,164 **** CAnyEditView::~CAnyEditView() - {} - - BOOL CAnyEditView::PreCreateWindow(CREATESTRUCT& cs) { - // TODO: Modify the Window class or styles here by modifying - // the CREATESTRUCT cs - - return CView::PreCreateWindow(cs); } --- 151,155 ---- *************** *** 168,174 **** void CAnyEditView::OnDraw(CDC* pDC) { - //CAnyEditDoc* pDoc = GetDocument(); - //ASSERT_VALID(pDoc); - // TODO: add draw code for native data here } --- 159,162 ---- *************** *** 370,376 **** { CView::OnSize(nType, cx, cy); - ::MoveWindow(m_Scintilla, 0, 0, cx, cy, TRUE); - } --- 358,362 ---- *************** *** 382,387 **** BOOL CAnyEditView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) { - - SCNotification *scn = (SCNotification*)lParam; --- 368,371 ---- *************** *** 497,505 **** void CAnyEditView::OnUpdateEditCut(CCmdUI* pCmdUI) { ! int i = m_Scintilla.GetSelectionEnd()-m_Scintilla.GetSelectionStart(); ! if(i==0) pCmdUI->Enable(FALSE); else pCmdUI->Enable(TRUE); } --- 481,492 ---- void CAnyEditView::OnUpdateEditCut(CCmdUI* pCmdUI) { ! if( m_Scintilla.GetSelectionEnd() - m_Scintilla.GetSelectionStart() == 0 ) ! { pCmdUI->Enable(FALSE); + } else + { pCmdUI->Enable(TRUE); + } } *************** *** 511,520 **** void CAnyEditView::OnUpdateEditCopy(CCmdUI* pCmdUI) { ! ! int i = m_Scintilla.GetSelectionEnd()-m_Scintilla.GetSelectionStart(); ! if(i==0) pCmdUI->Enable(FALSE); else pCmdUI->Enable(TRUE); } --- 498,509 ---- void CAnyEditView::OnUpdateEditCopy(CCmdUI* pCmdUI) { ! if( m_Scintilla.GetSelectionEnd() - m_Scintilla.GetSelectionStart() == 0 ) ! { pCmdUI->Enable(FALSE); + } else + { pCmdUI->Enable(TRUE); + } } *************** *** 526,530 **** void CAnyEditView::OnUpdateEditPaste(CCmdUI* pCmdUI) { - // TODO: Add your command update UI handler code here pCmdUI->Enable(m_Scintilla.CanPaste()); } --- 515,518 ---- *************** *** 535,542 **** } ! void CAnyEditView::OnUpdateEditUndo ! (CCmdUI* pCmdUI) { - // TODO: Add your command update UI handler code here pCmdUI->Enable(m_Scintilla.CanUndo()); } --- 523,528 ---- } ! void CAnyEditView::OnUpdateEditUndo(CCmdUI* pCmdUI) { pCmdUI->Enable(m_Scintilla.CanUndo()); } *************** *** 630,634 **** if(m_Scintilla.MarkerNext(1,1 << SC_MARK_ARROW)>0) pCmdUI->Enable(true); - else pCmdUI->Enable(false); --- 616,619 ---- *************** *** 835,839 **** CFindDialog fnd(NULL,&m_Scintilla,&stext); ! int i = fnd.DoModal(); } --- 820,824 ---- CFindDialog fnd(NULL,&m_Scintilla,&stext); ! fnd.DoModal(); } *************** *** 884,888 **** //Next Get Nearest words from word list for document type... CString lwords; ! GetDocument()->GetListWords(lwords); CStringArray extwords; --- 869,875 ---- //Next Get Nearest words from word list for document type... CString lwords; ! CSyntaxFile* pSyntaxFile; ! pSyntaxFile = theApp.GetSyntaxFile( GetDocument()->GetLanguageNr() ); ! if( NULL != pSyntaxFile ) lwords = pSyntaxFile->GetDelimitedKeywords(); CStringArray extwords; *************** *** 1297,1302 **** int flags = SCFIND_WORDSTART;// | (autoCompleteIgnoreCase ? 0 : SCFIND_MATCHCASE); int posCurrentWord = m_Scintilla.GetCurrentPos() - rootlen; - int minWordLength = 0; - int nwords = 0; CString tmpword; // wordsNear contains a list of words separated by single spaces and with a space --- 1284,1287 ---- *************** *** 1646,1650 **** linebuf[current] = '\0'; ! const char *root = linebuf + startword; CStringArray arr; if(GetDocument()->GetAcmpValueToArray(root,arr)) --- 1631,1635 ---- linebuf[current] = '\0'; ! /* const char *root = linebuf + startword; CStringArray arr; if(GetDocument()->GetAcmpValueToArray(root,arr)) *************** *** 1655,1659 **** m_Scintilla.DeleteBack(); InsertStringArray(arr); ! } } --- 1640,1644 ---- m_Scintilla.DeleteBack(); InsertStringArray(arr); ! }*/ } *************** *** 1662,1666 **** { CStringArray arr; ! BOOL b = GetDocument()->GetAcmpWordList(arr); if(b) { --- 1647,1651 ---- { CStringArray arr; ! BOOL b = FALSE;//GetDocument()->GetAcmpWordList(arr); if(b) { *************** *** 1679,1687 **** void CAnyEditView::CodeFillUp(const char *fup) { ! CStringArray arr; if(GetDocument()->GetAcmpValueToArray(fup,arr)) { InsertStringArray(arr); ! } } --- 1664,1672 ---- void CAnyEditView::CodeFillUp(const char *fup) { ! /* CStringArray arr; if(GetDocument()->GetAcmpValueToArray(fup,arr)) { InsertStringArray(arr); ! }*/ } *************** *** 1818,1822 **** BOOL CAnyEditView::OnCommand(WPARAM wParam, LPARAM lParam) { - // TODO: Add your specialized code here and/or call the base class if (HIWORD(wParam)==SCEN_CHANGE) { --- 1803,1806 ---- *************** *** 2047,2051 **** CString filnam ;//= "temp\\"; filnam+= CurDocPath.Right(CurDocPath.GetLength()-rev-1); - BOOL parseForProject=true; if (!theApp.IsFileInCurrentProject(CurDocPath)) { --- 2031,2034 ---- *************** *** 2060,2064 **** void CAnyEditView::OnFilePrintPreview() { - // TODO: Add your command handler code here BCGPrintPreview(this); } --- 2043,2046 ---- *************** *** 2124,2126 **** pCmdUI->Enable(FALSE); } - --- 2106,2107 ---- Index: AnyEditView.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** AnyEditView.h 23 Feb 2004 14:30:59 -0000 1.26 --- AnyEditView.h 15 Mar 2004 13:08:48 -0000 1.27 *************** *** 50,54 **** public: virtual void OnDraw(CDC* pDC); // overridden to draw this view - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo); virtual void OnInitialUpdate(); --- 50,53 ---- Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ChangeLog.txt 27 Feb 2004 08:45:22 -0000 1.40 --- ChangeLog.txt 15 Mar 2004 13:08:48 -0000 1.41 *************** *** 15,18 **** --- 15,19 ---- 10) Preferences changes - Code Options (Highlighting, AutoCompletion, ClassView) [#715770] 11) Automatically set EOL mode on OpenDocument + 12) Preferences changes - Add, Change and Remove Lanuages for Syntax Highlighting Beta 2.0 [Tester's Release 2] Index: ClipTree.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ClipTree.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClipTree.cpp 25 Nov 2003 15:05:56 -0000 1.3 --- ClipTree.cpp 15 Mar 2004 13:08:48 -0000 1.4 *************** *** 110,114 **** void CClipTree::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult) { ! NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; HTREEITEM selItem = GetSelectedItem(); --- 110,114 ---- void CClipTree::OnItemexpanding(NMHDR* pNMHDR, LRESULT* pResult) { ! // NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; HTREEITEM selItem = GetSelectedItem(); Index: CreditStatic.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/CreditStatic.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreditStatic.cpp 8 May 2003 12:00:56 -0000 1.2 --- CreditStatic.cpp 15 Mar 2004 13:08:48 -0000 1.3 *************** *** 703,707 **** CRect r(m_ClientRect); r.top = r.bottom-m_nClip; ! int x = memDC.DrawText((const char *)m_szWork,m_szWork.GetLength()-rmcode,&r,DT_TOP|DT_CENTER| DT_NOPREFIX | DT_SINGLELINE); m_bDrawText=FALSE; --- 703,707 ---- CRect r(m_ClientRect); r.top = r.bottom-m_nClip; ! memDC.DrawText((const char *)m_szWork,m_szWork.GetLength()-rmcode,&r,DT_TOP|DT_CENTER| DT_NOPREFIX | DT_SINGLELINE); m_bDrawText=FALSE; *************** *** 887,891 **** if(m_szWork.GetLength()-rmcode != 0) { ! int x = memDC.DrawText((const char *)m_szWork,m_szWork.GetLength()-rmcode,&r,DT_TOP|DT_CENTER| DT_NOPREFIX | DT_SINGLELINE); size = memDC.GetTextExtent((LPCTSTR)m_szWork,m_szWork.GetLength()-rmcode); --- 887,891 ---- if(m_szWork.GetLength()-rmcode != 0) { ! memDC.DrawText((const char *)m_szWork,m_szWork.GetLength()-rmcode,&r,DT_TOP|DT_CENTER| DT_NOPREFIX | DT_SINGLELINE); size = memDC.GetTextExtent((LPCTSTR)m_szWork,m_szWork.GetLength()-rmcode); Index: DirextPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/DirextPref.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DirextPref.cpp 8 May 2003 12:00:56 -0000 1.3 --- DirextPref.cpp 15 Mar 2004 13:08:48 -0000 1.4 *************** *** 196,200 **** void CDirextPref::OnItemchangedList1(NMHDR* pNMHDR, LRESULT* pResult) { ! NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; /*CString itemExt; --- 196,200 ---- void CDirextPref::OnItemchangedList1(NMHDR* pNMHDR, LRESULT* pResult) { ! // NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR; /*CString itemExt; Index: DumpHandleApp.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/DumpHandleApp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DumpHandleApp.cpp 8 May 2003 12:00:56 -0000 1.2 --- DumpHandleApp.cpp 15 Mar 2004 13:08:48 -0000 1.3 *************** *** 120,124 **** void CDumpHandleApp::HandleException(CSeException * e) { - UINT nIDP = AFX_IDP_INTERNAL_FAILURE; // generic message string // user has not been alerted yet of this catastrophic problem CString q,r,s; --- 120,123 ---- Index: LBSpinButtonCtrl.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/LBSpinButtonCtrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LBSpinButtonCtrl.cpp 18 Nov 2003 05:41:37 -0000 1.1 --- LBSpinButtonCtrl.cpp 15 Mar 2004 13:08:48 -0000 1.2 *************** *** 788,792 **** //In case UDS_NOTHOUSANDS style not applied //we have to delete thousands delimiter from string ! strText.Remove((TCHAR)0xA0); NMUPDOWN nmUpDn; --- 788,793 ---- //In case UDS_NOTHOUSANDS style not applied //we have to delete thousands delimiter from string ! int i = 0xA0; ! strText.Remove((TCHAR)i); NMUPDOWN nmUpDn; Index: MDITabs.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MDITabs.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MDITabs.cpp 18 Nov 2003 05:41:37 -0000 1.11 --- MDITabs.cpp 15 Mar 2004 13:08:48 -0000 1.12 *************** *** 286,293 **** // cache some system colors ! DWORD shadow = ::GetSysColor(COLOR_3DSHADOW); ! DWORD dark = ::GetSysColor(COLOR_3DDKSHADOW); ! DWORD hilight = ::GetSysColor(COLOR_3DHILIGHT); ! DWORD light = ::GetSysColor(COLOR_3DLIGHT); --- 286,293 ---- // cache some system colors ! // DWORD shadow = ::GetSysColor(COLOR_3DSHADOW); ! // DWORD dark = ::GetSysColor(COLOR_3DDKSHADOW); ! // DWORD hilight = ::GetSysColor(COLOR_3DHILIGHT); ! // DWORD light = ::GetSysColor(COLOR_3DLIGHT); Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** MainFrm.cpp 12 Feb 2004 13:05:50 -0000 1.30 --- MainFrm.cpp 15 Mar 2004 13:08:48 -0000 1.31 *************** *** 1,23 **** /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... --- 1,23 ---- /********************************************************************* Copyright (C) 2002 DeepSoft - M.Deepak ! This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. ! Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: ! 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. ! 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. ! 3. This notice may not be removed or altered from any source distribution. ! http://www.anyedit.org M.Deepak - de...@an... *************** *** 133,137 **** CMainFrame::CMainFrame() { - // TODO: add member initialization code here outInt = 0; FullScreen=FALSE; --- 133,136 ---- *************** *** 236,242 **** } - //m_wndStatusBar.setb - //m_wndStatusBar.SetPaneStyle(0,SBPS_STRETCH); - //Docking bar workspace --- 235,238 ---- *************** *** 318,322 **** //m_wndToolBar.LoadState (strControlBarRegEntry); //m_wndMenuBar.LoadState (strControlBarRegEntry); ! // TODO: add LoadState for all your predefined toolbars here //m_wndToolbarBookMark.LoadState (strControlBarRegEntry); --- 314,318 ---- //m_wndToolBar.LoadState (strControlBarRegEntry); //m_wndMenuBar.LoadState (strControlBarRegEntry); ! // TODO: add LoadState for all your predefined toolbars here //m_wndToolbarBookMark.LoadState (strControlBarRegEntry); *************** *** 359,362 **** --- 355,359 ---- return 0; } + //deepwashere BOOL CMainFrame::OnShowPopupMenu (CBCGPopupMenu* pMenuPopup) *************** *** 463,468 **** popUp.DeleteMenu(y,MF_BYPOSITION); } - - } --- 460,463 ---- *************** *** 505,509 **** popUp.DeleteMenu(delCnt,MF_BYPOSITION); } - } --- 500,503 ---- *************** *** 539,544 **** if( !CMDIFrameWnd::PreCreateWindow(cs) ) return FALSE; - // TODO: Modify the Window class or styles here by modifying - // the CREATESTRUCT cs cs.style = WS_OVERLAPPED | WS_CAPTION | FWS_ADDTOTITLE --- 533,536 ---- *************** *** 700,704 **** void CMainFrame::OnUpdateUserTools(CCmdUI* pCmdUI) { - } --- 692,695 ---- *************** *** 718,723 **** afx_msg LRESULT CMainFrame::OnToolbarReset(WPARAM wp,LPARAM) { - // TODO: reset toolbar with id = (UINT) wp to its initial state: - // UINT uiToolBarId = (UINT) wp; if (uiToolBarId == IDR_MAINFRAME) --- 709,712 ---- *************** *** 769,780 **** LRESULT CMainFrame::OnHelpCustomizeToolbars(WPARAM wp, LPARAM lp) { - int iPageNum = (int) wp; - CBCGToolbarCustomize* pDlg = (CBCGToolbarCustomize*) lp; ASSERT_VALID (pDlg); - // TODO: show help about page number iPageNum - - return 0; } --- 758,764 ---- *************** *** 785,789 **** CMDIFrameWnd::OnUpdateFrameTitle(bAddToTitle); m_wndMdiTabs.Update(); - // sync the mditabctrl with all views } --- 769,772 ---- *************** *** 831,842 **** void CMainFrame::OnWindowManager() { - // TODO: Add your command handler code here ShowWindowsDialog (); - } BOOL CMainFrame::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo) { - // TODO: Add your specialized code here and/or call the base class CWnd* pWndFocus = GetFocus (); --- 814,822 ---- *************** *** 952,985 **** CSAPrefsDialog* dlg; - // TODO: Need to clean this up yet. Will be done in the completion of the - // preferences update. - /* CGeneralPref dlgGeneral; - EditorPref dlgEditor; - CFontPref dlgFont; - CColorPref dlgColor; - CToolPref dlgTool; - CAssociationPref dlgAssoc; - CCodingPref dlgCoding; - CLangPref dlgLang; - CTemplatePref dlgTemplate; - CDirextPref dlgExtDir; - - dlg.AddPage(dlgGeneral, "General"); - dlg.AddPage(dlgEditor,"Editor Options"); - dlg.AddPage(dlgFont,"Fonts",&dlgEditor); - dlg.AddPage(dlgColor,"Colors",&dlgEditor); - dlg.AddPage(dlgLang,"Language Settings"); - dlg.AddPage(dlgTool,"Tools"); - dlg.AddPage(dlgTemplate,"Language Tools"); - dlg.AddPage(dlgExtDir,"Folders & Extensions"); - dlg.AddPage(dlgCoding,"Coding Preferences"); - dlg.AddPage(dlgAssoc,"File Associations"); - */ dlg = new CSAPrefsDialog(); if( NULL == dlg ) return; ! dlg->SetTitle("Preferences"); ! // dlg->SetConstantText("DeepSoft"); ! dlg->DoModal(); delete dlg; --- 932,939 ---- CSAPrefsDialog* dlg; dlg = new CSAPrefsDialog(); if( NULL == dlg ) return; ! dlg->SetTitle( "Preferences" ); dlg->DoModal(); delete dlg; *************** *** 1151,1155 **** LRESULT CMainFrame::OnOpenFileMsg(WPARAM wParam, LPARAM /*lParam*/) { - //LPCTSTR * temps2 = (LPCTSTR *) wParam; char m_cmdline[_MAX_FNAME]; ::GlobalGetAtomName( (ATOM)wParam, m_cmdline, _MAX_FNAME ); --- 1105,1108 ---- *************** *** 1297,1301 **** CClipTextEditor cedit; cedit.SetType(TRUE); ! if(cedit.DoModal()==IDOK)theApp.ReloadACMP(); } --- 1250,1254 ---- CClipTextEditor cedit; cedit.SetType(TRUE); ! cedit.DoModal(); } Index: ProjectTree.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ProjectTree.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ProjectTree.cpp 2 Dec 2003 12:03:35 -0000 1.10 --- ProjectTree.cpp 15 Mar 2004 13:08:48 -0000 1.11 *************** *** 440,444 **** void CProjectTree::OnItemexpanded(NMHDR* pNMHDR, LRESULT* pResult) { ! NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; SetFolderImages(); *pResult = 0; --- 440,444 ---- void CProjectTree::OnItemexpanded(NMHDR* pNMHDR, LRESULT* pResult) { ! // NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; SetFolderImages(); *pResult = 0; *************** *** 879,883 **** void CProjectTree::OnBegindrag(NMHDR* pNMHDR, LRESULT* pResult) { ! NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; CPoint ptAction; --- 879,883 ---- void CProjectTree::OnBegindrag(NMHDR* pNMHDR, LRESULT* pResult) { ! // NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; CPoint ptAction; Index: SAPrefsDialog.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SAPrefsDialog.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SAPrefsDialog.cpp 15 Mar 2004 08:51:53 -0000 1.7 --- SAPrefsDialog.cpp 15 Mar 2004 13:08:48 -0000 1.8 *************** *** 679,683 **** if ((iIdx >= 0) && (iIdx < m_pages.GetSize())) { ! pageStruct *pPS = (pageStruct *)m_pages.GetAt(iIdx); if (m_iCurPage!=iIdx) { --- 679,683 ---- if ((iIdx >= 0) && (iIdx < m_pages.GetSize())) { ! // pageStruct *pPS = (pageStruct *)m_pages.GetAt(iIdx); if (m_iCurPage!=iIdx) { Index: StdAfx.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/StdAfx.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** StdAfx.h 22 Feb 2004 10:19:17 -0000 1.6 --- StdAfx.h 15 Mar 2004 13:08:48 -0000 1.7 *************** *** 37,40 **** --- 37,48 ---- #include "SciLexer.h" + // Disable STL warnings on Level 4, needs to be fixed. TODO + #include <yvals.h> + #pragma warning(disable: 4018) + #pragma warning(disable: 4146) + #pragma warning(disable: 4244) + #pragma warning(disable: 4663) + #pragma warning(disable: 4097) + //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. Index: cgfiltyp.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/cgfiltyp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cgfiltyp.cpp 8 May 2003 12:00:56 -0000 1.2 --- cgfiltyp.cpp 15 Mar 2004 13:08:48 -0000 1.3 *************** *** 295,299 **** !szValue || !szData ) { ! ::SetLastError(E_INVALIDARG); return FALSE; } --- 295,299 ---- !szValue || !szData ) { ! ::SetLastError((unsigned long)E_INVALIDARG); return FALSE; } Index: pugxml.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/pugxml.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pugxml.h 28 Nov 2003 13:20:38 -0000 1.1 --- pugxml.h 15 Mar 2004 13:08:48 -0000 1.2 *************** *** 25,32 **** #endif ! #include <iostream> #include <ostream> #include <string> #if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG) # include <assert.h> --- 25,41 ---- #endif ! // A fix to get rid of level 4 warnings comming from STL ! #pragma warning(push) ! #include <yvals.h> ! #pragma warning(disable: 4018) ! #pragma warning(disable: 4146) ! #pragma warning(disable: 4244) ! #pragma warning(disable: 4663) #include <iostream> #include <ostream> #include <string> + #pragma warning(pop) + // + #if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG) # include <assert.h> --- ChangesLog.txt DELETED --- --- ScintillaDefaults.cpp DELETED --- --- ScintillaDefaults.h DELETED --- --- lineparse.h DELETED --- --- script.cpp DELETED --- --- script.h DELETED --- --- tokens.cpp DELETED --- --- tokens.h DELETED --- |
