From: boca4711 <boc...@us...> - 2005-10-16 12:13:39
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20904 Modified Files: FileTypeManager.cpp Log Message: - Added EOLfilled mode - Added case of keywords - Added calltips/API - Added autocompletion - Added smart insert ( becomes () - Added smart tab - Modified fold flags - Added caret sticky - Added visual line wrapping Index: FileTypeManager.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** FileTypeManager.cpp 14 Apr 2005 12:01:42 -0000 1.29 --- FileTypeManager.cpp 16 Oct 2005 12:13:31 -0000 1.30 *************** *** 312,315 **** --- 312,316 ---- if( NULL == pSyntaxFile ) return; + pScintilla->ClearDocumentStyle(); // Clear the Scintilla object // Before we can clear the object first make sure the default style is set. *************** *** 324,327 **** --- 325,330 ---- pScintilla->StyleSetFore( STYLE_DEFAULT, pSyntaxFile->GetStyleColorForeground( STYLE_DEFAULT ) ); pScintilla->StyleSetBack( STYLE_DEFAULT, pSyntaxFile->GetStyleColorBackground( STYLE_DEFAULT ) ); + pScintilla->StyleSetEOLFilled( STYLE_DEFAULT, pSyntaxFile->GetStyleEolFilled( STYLE_DEFAULT ) ); + pScintilla->StyleSetCase( STYLE_DEFAULT, pSyntaxFile->GetStyleCase( STYLE_DEFAULT ) ) ; pScintilla->StyleClearAll(); *************** *** 431,434 **** --- 434,440 ---- pScintilla->StyleSetFore( iCount, pSyntaxFile->GetStyleColorForeground( iCount ) ); pScintilla->StyleSetBack( iCount, pSyntaxFile->GetStyleColorBackground( iCount ) ); + + pScintilla->StyleSetEOLFilled( iCount, pSyntaxFile->GetStyleEolFilled( iCount ) ); + pScintilla->StyleSetCase( iCount, pSyntaxFile->GetStyleCase( iCount ) ) ; } *************** *** 457,460 **** --- 463,469 ---- pScintilla->StyleSetBack( iCount, pSyntaxFile->GetStyleColorBackground( iCount ) ); + pScintilla->StyleSetEOLFilled( iCount, pSyntaxFile->GetStyleEolFilled( iCount ) ); + pScintilla->StyleSetCase( iCount, pSyntaxFile->GetStyleCase( iCount ) ) ; + // With no syntax highlighting we can skip 1 to STYLE_DEFAULT // STYLE_DEFAULT has already been set when we cleared all. *************** *** 463,466 **** --- 472,491 ---- } } + pScintilla->SetVisibleLineNumber(pSyntaxFile->GetMarginLineNumber()); + + pScintilla->SetCalltipIgnoreCase(pSyntaxFile->GetCalltipIgnorecase()); + pScintilla->SetCalltipWordCharacters(pSyntaxFile->GetCalltipWordCharacters()); + pScintilla->SetCalltipParametersStart(pSyntaxFile->GetCalltipParameterStart()); + pScintilla->SetCalltipParametersEnd(pSyntaxFile->GetCalltipParameterEnd()); + pScintilla->SetCalltipParametersSeparator(pSyntaxFile->GetCalltipParameterSeparator()); + pScintilla->SetCalltipEndDefinition(pSyntaxFile->GetCalltipEndDefinition()); + + pScintilla->SetApi(pSyntaxFile->GetApi()); + + pScintilla->SetAutocompIgnoreCase(pSyntaxFile->GetAutocompleteIgnoreCase()); + pScintilla->SetAutocompStartCharacters(pSyntaxFile->GetAutocompleteStartCharacters()); + + pScintilla->SetSmartInsert(pConfigFile->GetSmartInsert()); + pScintilla->SetSmartTab(pConfigFile->GetSmartTab()); // Ok now restyle the document. *************** *** 537,540 **** --- 562,569 ---- pScintilla->DefineMarker(SC_BOOKMARK, 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)); + pScintilla->SetFoldFlags(16 + 4); + pScintilla->SetCaretSticky(true); + pScintilla->SetWrapVisualFlags(SC_WRAPVISUALFLAG_END); + pScintilla->SetWrapVisualFlagsLocation(SC_WRAPVISUALFLAGLOC_END_BY_TEXT); // Set Caret and Visibility Policy |