Menu
▾
▴
[Anyedit-cvs]AnyEditv2 AnyEdit.dsp,1.16,1.17 AnyEdit.rc,1.19,1.20 AnyEditView.cpp,1.27,1.28 AnyEditView.h,1.15,1.16 ChangeLog.txt,1.24,1.25 resource.h,1.13,1.14
|
From: <td...@us...> - 2003-07-09 07:17:58
|
Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv12297
Modified Files:
AnyEdit.dsp AnyEdit.rc AnyEditView.cpp AnyEditView.h
ChangeLog.txt resource.h
Log Message:
Backup
Index: AnyEdit.dsp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AnyEdit.dsp 6 Jul 2003 18:49:47 -0000 1.16
--- AnyEdit.dsp 9 Jul 2003 07:17:55 -0000 1.17
***************
*** 1248,1251 ****
--- 1248,1255 ----
# Begin Source File
+ SOURCE=.\res\cur00002.cur
+ # End Source File
+ # Begin Source File
+
SOURCE=.\res\cursor1.cur
# End Source File
***************
*** 1281,1284 ****
--- 1285,1292 ----
SOURCE=.\res\ico00005.ico
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\res\ico00006.ico
# End Source File
# Begin Source File
Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AnyEdit.rc 6 Jul 2003 18:49:47 -0000 1.19
--- AnyEdit.rc 9 Jul 2003 07:17:55 -0000 1.20
***************
*** 969,972 ****
--- 969,973 ----
IDI_ADDICON6 ICON DISCARDABLE "res\\ico00004.ico"
IDR_BROWSERTYPE ICON DISCARDABLE "res\\ico00005.ico"
+ IDI_ICON1 ICON DISCARDABLE "res\\ico00006.ico"
/////////////////////////////////////////////////////////////////////////////
***************
*** 1200,1203 ****
--- 1201,1210 ----
"J", ID_SEARCH_QUICKJUMP, VIRTKEY, CONTROL, NOINVERT
"V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
+ VK_F2, ID_SEARCH_BOOKMARK_NEXTBOOKMARK, VIRTKEY, NOINVERT
+ VK_F2, ID_SEARCH_BM_TOGGLE, VIRTKEY, CONTROL, NOINVERT
+ VK_F2, ID_SEARCH_BOOKMARK_PREVIOUSBOOKMARK, VIRTKEY, SHIFT,
+ NOINVERT
+ VK_F2, ID_SEARCH_BOOKMARK_CLEARALLBOOKMARKS, VIRTKEY, SHIFT,
+ CONTROL, NOINVERT
VK_F3, ID_SEARCH_FINDNEXT, VIRTKEY, NOINVERT
VK_F3, ID_SEARCH_FINDNEXTWORD, VIRTKEY, CONTROL, NOINVERT
***************
*** 1797,1800 ****
--- 1804,1825 ----
END
+ IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Dialog"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ DEFPUSHBUTTON "OK",IDOK,129,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
+ END
+
+ IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 186, 95
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Dialog"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ DEFPUSHBUTTON "OK",IDOK,129,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
+ END
+
#ifndef _MAC
***************
*** 2072,2075 ****
--- 2097,2116 ----
BOTTOMMARGIN, 182
END
+
+ IDD_DIALOG1, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 88
+ END
+
+ IDD_DIALOG2, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 88
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 2121,2124 ****
--- 2162,2166 ----
IDR_TREEFILECTRL_NO_DROPMOVE CURSOR DISCARDABLE "res\\cur00001.cur"
IDR_TREEFILECTRL_NO_DROPCOPY CURSOR DISCARDABLE "res\\cursor2.cur"
+ IDC_CURSOR1 CURSOR DISCARDABLE "res\\cur00002.cur"
/////////////////////////////////////////////////////////////////////////////
Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** AnyEditView.cpp 6 Jul 2003 18:49:47 -0000 1.27
--- AnyEditView.cpp 9 Jul 2003 07:17:55 -0000 1.28
***************
*** 21,24 ****
--- 21,25 ----
#define BOOKMARK SC_MARK_ARROW
#define SELLINE SC_MARK_SHORTARROW
+ #define BOOKMARK1 2
/////////////////////////////////////////////////////////////////////////////
// CAnyEditView
***************
*** 145,148 ****
--- 146,150 ----
ParseTimeLimit = m_reg.GetProfileInt(_T("Preferences"),_T("ParserDelay"),1500);
outoffocus = FALSE;
+ isHighlightingOn = TRUE;
}
***************
*** 302,306 ****
m_Scintilla.DefineMarker(BOOKMARK,BOOKMARK,RGB(0,0,255),RGB(231,231,255));
m_Scintilla.DefineMarker(SELLINE,SELLINE,RGB(107,27,18),RGB(251,252,226));
!
}
--- 304,308 ----
m_Scintilla.DefineMarker(BOOKMARK,BOOKMARK,RGB(0,0,255),RGB(231,231,255));
m_Scintilla.DefineMarker(SELLINE,SELLINE,RGB(107,27,18),RGB(251,252,226));
! m_Scintilla.DefineMarker(BOOKMARK1,SC_MARK_CHARACTER+49,RGB(255,255,255),RGB(74,87,149));
}
***************
*** 460,463 ****
--- 462,471 ----
if(!(nextline < 0))
m_Scintilla.GotoLine(nextline);
+ else
+ {
+ nextline = m_Scintilla.MarkerNext(1,1 << BOOKMARK);
+ if(!(nextline < 0))
+ m_Scintilla.GotoLine(nextline);
+ }
}
***************
*** 467,470 ****
--- 475,484 ----
if(!(nextline < 0))
m_Scintilla.GotoLine(nextline);
+ else
+ {
+ nextline = m_Scintilla.MarkerNext(m_Scintilla.GetLineCount(),1 << BOOKMARK);
+ if(!(nextline < 0))
+ m_Scintilla.GotoLine(nextline);
+ }
}
***************
*** 1874,1877 ****
--- 1888,1908 ----
void CAnyEditView::OnConfigureCurrentdocumentSyntaxhighlighting()
{
+ if(isHighlightingOn)
+ {
+ isHighlightingOn = FALSE;
+ m_Scintilla.SetLexer(0);
+ m_Scintilla.ClearDocumentStyle();
+ m_Scintilla.Colourise(0, -1);
+ m_Scintilla.StyleClearAll();
+
+ }
+ else
+ {
+ isHighlightingOn = TRUE;
+ if(!DocExt.IsEmpty())
+ {
+ theApp.SetScintillaLanguage(DocExt,&m_Scintilla);
+ }
+ }
}
***************
*** 1880,1884 ****
{
// TODO: Add your command update UI handler code here
!
}
--- 1911,1915 ----
{
// TODO: Add your command update UI handler code here
! pCmdUI->SetCheck(isHighlightingOn);
}
Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AnyEditView.h 6 Jul 2003 18:49:47 -0000 1.15
--- AnyEditView.h 9 Jul 2003 07:17:55 -0000 1.16
***************
*** 27,31 ****
BOOL EnableParsing;
int ParseTimeLimit;
!
CString DocExt;
CString CurDocPath;
--- 27,31 ----
BOOL EnableParsing;
int ParseTimeLimit;
! BOOL isHighlightingOn;
CString DocExt;
CString CurDocPath;
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog.txt 6 Jul 2003 18:49:47 -0000 1.24
--- ChangeLog.txt 9 Jul 2003 07:17:55 -0000 1.25
***************
*** 18,26 ****
11) Changed all 'bool''s to BOOL which removes many performance warnings [Source change]
12) Output window automatically is shown when a tool is run with the output window hidden
! 13) Fixed input entry length restriction bug.
! 14) AnyEdit now works properly for all users. Even if the admin setsup the program.
! 15) AnyEdit saves file only if it has to...
! 16) Added MiniToolbar feature.
!
Beta 1.0
--- 18,28 ----
11) Changed all 'bool''s to BOOL which removes many performance warnings [Source change]
12) Output window automatically is shown when a tool is run with the output window hidden
! 13) Fixed input entry length restriction bug.
! 14) Fixed accelerators for Bookmarking and changed behaviour
! 15) Fixed input entry length restriction bug.
! 16) AnyEdit now works properly for all users. Even if the admin setsup the program.
! 17) AnyEdit saves file only if it has to...
! 18) Added MiniToolbar feature.
!
Beta 1.0
Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** resource.h 6 Jul 2003 18:49:47 -0000 1.13
--- resource.h 9 Jul 2003 07:17:55 -0000 1.14
***************
*** 99,103 ****
#define IDR_ERRPARSESPECIALS 245
#define IDD_QUICKJUMP 246
! #define IDR_VIEW 247
#define IDD_WIN2K_FILEDIALOG 446
#define IDB_FILEOPEN 447
--- 99,107 ----
#define IDR_ERRPARSESPECIALS 245
#define IDD_QUICKJUMP 246
! #define IDD_DIALOG1 247
! #define IDC_CURSOR1 249
! #define IDI_ICON1 250
! #define IDD_DIALOG2 251
! #define IDR_VIEW 252
#define IDD_WIN2K_FILEDIALOG 446
#define IDB_FILEOPEN 447
|
