Menu
▾
▴
[Anyedit-cvs]AnyEditv2 AnyEdit.dsp,1.15,1.16 AnyEdit.rc,1.18,1.19 AnyEditDoc.cpp,1.9,1.10 AnyEditView.cpp,1.26,1.27 AnyEditView.h,1.14,1.15 ChangeLog.txt,1.23,1.24 GeneralPref.cpp,1.6,1.7 GeneralPref.h,1.4,1.5 MainFrm.cpp,1.21,1.22 ScintillaDefaults.cpp,1.9,1.10 ScintillaDefaults.h,1.3,1.4 ToDo.txt,1.13,1.14 resource.h,1.12,1.13
|
From: <td...@us...> - 2003-07-06 18:49:50
|
Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1:/tmp/cvs-serv12636
Modified Files:
AnyEdit.dsp AnyEdit.rc AnyEditDoc.cpp AnyEditView.cpp
AnyEditView.h ChangeLog.txt GeneralPref.cpp GeneralPref.h
MainFrm.cpp ScintillaDefaults.cpp ScintillaDefaults.h ToDo.txt
resource.h
Log Message:
AnyEdit now works properly for all users. Even if the admin setsup the program.
AnyEdit saves file only if it has to...
Added MiniToolbar feature.
Index: AnyEdit.dsp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AnyEdit.dsp 2 Jul 2003 12:20:32 -0000 1.15
--- AnyEdit.dsp 6 Jul 2003 18:49:47 -0000 1.16
***************
*** 1240,1243 ****
--- 1240,1247 ----
# Begin Source File
+ SOURCE=.\res\bmp00021.bmp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\res\cur00001.cur
# End Source File
Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AnyEdit.rc 3 Jul 2003 12:58:39 -0000 1.18
--- AnyEdit.rc 6 Jul 2003 18:49:47 -0000 1.19
***************
*** 443,446 ****
--- 443,461 ----
END
+ POPUP "Current Document"
+ BEGIN
+ MENUITEM "Word Wrap", ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP
+
+ MENUITEM "View Endof Line", ID_CONFIGURE_CURRENTDOCUMENT_VIEWENDOFLINE
+
+ MENUITEM "Syntax Highlighting", ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING
+
+ MENUITEM "Line Numbers", ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS
+
+ MENUITEM "BookMark Margin", ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN
+
+ MENUITEM "Fold Margin", ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN
+
+ END
MENUITEM SEPARATOR
MENUITEM "&Customize...", ID_VIEW_CUSTOMIZE
***************
*** 984,987 ****
--- 999,1003 ----
IDB_CLASS_VIEW BITMAP DISCARDABLE "res\\bmp00019.bmp"
IDR_FULLSCREEN BITMAP DISCARDABLE "res\\bmp00020.bmp"
+ IDR_VIEW BITMAP DISCARDABLE "res\\bmp00021.bmp"
/////////////////////////////////////////////////////////////////////////////
***************
*** 1145,1148 ****
--- 1161,1174 ----
END
+ IDR_VIEW TOOLBAR DISCARDABLE 12, 11
+ BEGIN
+ BUTTON ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING
+ BUTTON ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP
+ BUTTON ID_VIEW_TABSANDSPACES
+ BUTTON ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS
+ BUTTON ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN
+ BUTTON ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN
+ END
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 1253,1256 ****
--- 1279,1284 ----
CONTROL "Check File Modification",IDC_CHECK14,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,110,134,9
+ CONTROL "Show Document Mini Toolbar",IDC_CHECK7,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,124,152,13
END
***************
*** 1510,1514 ****
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Input"
! FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,141,49,50,14
--- 1538,1542 ----
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Input"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,141,49,50,14
***************
*** 1578,1582 ****
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Clip Text Editor"
! FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,185,212,50,14
--- 1606,1610 ----
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Clip Text Editor"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,185,212,50,14
***************
*** 2529,2532 ****
--- 2557,2565 ----
BEGIN
ID_SEARCH_QUICKJUMP "Quick jump to function definitions"
+ ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP "Word wrap\nWord wrap"
+ ID_CONFIGURE_CURRENTDOCUMENT_VIEWENDOFLINE
+ "View Line Endings\nView end of line"
+ ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING
+ "Enable document coloring\nToggle syntax highlighting"
END
Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AnyEditDoc.cpp 8 May 2003 12:00:56 -0000 1.9
--- AnyEditDoc.cpp 6 Jul 2003 18:49:47 -0000 1.10
***************
*** 98,101 ****
--- 98,102 ----
BOOL CAnyEditDoc::OnSaveDocument(LPCTSTR lpszPathName)
{
+ if(!this->IsModified()) return TRUE;
BOOL saved = m_pScintilla->SaveFile(lpszPathName);
if(saved)
Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AnyEditView.cpp 8 May 2003 12:00:56 -0000 1.26
--- AnyEditView.cpp 6 Jul 2003 18:49:47 -0000 1.27
***************
*** 40,51 ****
ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdateEditPaste)
! ON_COMMAND(ID_EDIT_UNDO, OnEditUndo
! )
! ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo
! )
! ON_COMMAND(ID_EDIT_REDO, OnEditRedo
! )
! ON_UPDATE_COMMAND_UI(ID_EDIT_REDO, OnUpdateEditRedo
! )
ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectall)
ON_COMMAND(ID_SEARCH_BM_TOGGLE, OnSearchBookmarksTogglebookmark)
--- 40,47 ----
ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdateEditPaste)
! ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
! ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
! ON_COMMAND(ID_EDIT_REDO, OnEditRedo)
! ON_UPDATE_COMMAND_UI(ID_EDIT_REDO, OnUpdateEditRedo)
ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectall)
ON_COMMAND(ID_SEARCH_BM_TOGGLE, OnSearchBookmarksTogglebookmark)
***************
*** 100,104 ****
ON_COMMAND(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnToolsHighlightcurrentline)
ON_UPDATE_COMMAND_UI(ID_TOOLS_HIGHLIGHTCURRENTLINE, OnUpdateToolsHighlightcurrentline)
! //}}AFX_MSG_MAP
ON_WM_CONTEXTMENU()
// Standard printing commands
--- 96,110 ----
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)
! //}}AFX_MSG_MAP
ON_WM_CONTEXTMENU()
// Standard printing commands
***************
*** 238,241 ****
--- 244,274 ----
pDoc->m_pScintilla=&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;
}
***************
*** 375,383 ****
}
! void CAnyEditView::OnEditUndo
! ()
{
! m_Scintilla.Undo
! ();
}
--- 408,414 ----
}
! void CAnyEditView::OnEditUndo()
{
! m_Scintilla.Undo();
}
***************
*** 390,405 ****
}
! void CAnyEditView::OnEditRedo
! ()
{
! m_Scintilla.Redo
! ();
}
! void CAnyEditView::OnUpdateEditRedo
! (CCmdUI* pCmdUI)
{
! pCmdUI->Enable(m_Scintilla.CanRedo
! ());
}
--- 421,432 ----
}
! void CAnyEditView::OnEditRedo()
{
! m_Scintilla.Redo();
}
! void CAnyEditView::OnUpdateEditRedo(CCmdUI* pCmdUI)
{
! pCmdUI->Enable(m_Scintilla.CanRedo());
}
***************
*** 1833,1835 ****
--- 1860,1956 ----
{
pCmdUI->SetCheck(m_Scintilla.GetCaretLineVisible());
+ }
+
+ void CAnyEditView::OnConfigureCurrentdocumentWordwrap()
+ {
+ m_Scintilla.SetWrapMode(!m_Scintilla.GetWrapMode());
+ }
+
+ void CAnyEditView::OnUpdateConfigureCurrentdocumentWordwrap(CCmdUI* pCmdUI)
+ {
+ pCmdUI->SetCheck(m_Scintilla.GetWrapMode());
+ }
+
+ void CAnyEditView::OnConfigureCurrentdocumentSyntaxhighlighting()
+ {
+
+ }
+
+ void CAnyEditView::OnUpdateConfigureCurrentdocumentSyntaxhighlighting(CCmdUI* pCmdUI)
+ {
+ // TODO: Add your command update UI handler code here
+
+ }
+
+ void CAnyEditView::OnConfigureCurrentdocumentLinenumbers()
+ {
+ if(m_Scintilla.GetMarginWidthN(0)==0)
+ {
+ m_Scintilla.SetMarginWidthN(0,36);
+ m_Scintilla.SetMarginTypeN(0,SC_MARGIN_NUMBER);
+ }
+ else
+ {
+ m_Scintilla.SetMarginWidthN(0,0);
+ m_Scintilla.SetMarginTypeN(0,SC_MARGIN_NUMBER);
+ }
+ }
+
+ void CAnyEditView::OnUpdateConfigureCurrentdocumentLinenumbers(CCmdUI* pCmdUI)
+ {
+ if(m_Scintilla.GetMarginWidthN(0)==0)
+ pCmdUI->SetCheck(0);
+ else pCmdUI->SetCheck(1);
+ }
+
+ void CAnyEditView::OnConfigureCurrentdocumentBookmarkmargin()
+ {
+ if(m_Scintilla.GetMarginWidthN(1)==0)
+ {
+ m_Scintilla.SetMarginWidthN(1,16); // 0 to not show - should be 16
+ m_Scintilla.SetMarginTypeN(1,SC_MARGIN_SYMBOL);
+ m_Scintilla.SetMarginMaskN(1,~SC_MASK_FOLDERS);
+ }
+ else
+ {
+ m_Scintilla.SetMarginWidthN(1,0); // 0 to not show - should be 16
+ m_Scintilla.SetMarginTypeN(1,SC_MARGIN_SYMBOL);
+ m_Scintilla.SetMarginMaskN(1,~SC_MASK_FOLDERS);
+
+ }
+ }
+
+ void CAnyEditView::OnUpdateConfigureCurrentdocumentBookmarkmargin(CCmdUI* pCmdUI)
+ {
+ if(m_Scintilla.GetMarginWidthN(1)==0)
+ pCmdUI->SetCheck(0);
+ else pCmdUI->SetCheck(1);
+ }
+
+ void CAnyEditView::OnConfigureCurrentdocumentFoldmargin()
+ {
+
+ if(m_Scintilla.GetMarginWidthN(2)==0)
+ {
+ m_Scintilla.SetMarginTypeN(2,SC_MARGIN_SYMBOL);
+ m_Scintilla.SetMarginWidthN(2,14);
+ m_Scintilla.SetMarginMaskN(2,SC_MASK_FOLDERS);
+ m_Scintilla.SetMarginSensitiveN(2,TRUE);
+ m_Scintilla.SetFoldingMargins(efsVSNet);
+ }
+ else
+ {
+ m_Scintilla.SetMarginTypeN(2,SC_MARGIN_SYMBOL);
+ m_Scintilla.SetMarginWidthN(2,0);
+ m_Scintilla.SetMarginMaskN(2,SC_MASK_FOLDERS);
+ m_Scintilla.SetMarginSensitiveN(2,TRUE);
+ m_Scintilla.SetFoldingMargins(efsVSNet);
+ }
+ }
+
+ void CAnyEditView::OnUpdateConfigureCurrentdocumentFoldmargin(CCmdUI* pCmdUI)
+ {
+ if(m_Scintilla.GetMarginWidthN(2)==0)
+ pCmdUI->SetCheck(0);
+ else pCmdUI->SetCheck(1);
}
Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AnyEditView.h 8 May 2003 12:00:56 -0000 1.14
--- AnyEditView.h 6 Jul 2003 18:49:47 -0000 1.15
***************
*** 33,36 ****
--- 33,38 ----
CTime last_access_time;
+ CToolBar m_wndTool;
+
// Attributes
public:
***************
*** 102,113 ****
afx_msg void OnEditPaste();
afx_msg void OnUpdateEditPaste(CCmdUI* pCmdUI);
! afx_msg void OnEditUndo
! ();
! afx_msg void OnUpdateEditUndo
! (CCmdUI* pCmdUI);
! afx_msg void OnEditRedo
! ();
! afx_msg void OnUpdateEditRedo
! (CCmdUI* pCmdUI);
afx_msg void OnEditSelectall();
afx_msg void OnSearchBookmarksTogglebookmark();
--- 104,111 ----
afx_msg void OnEditPaste();
afx_msg void OnUpdateEditPaste(CCmdUI* pCmdUI);
! afx_msg void OnEditUndo();
! afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI);
! afx_msg void OnEditRedo();
! afx_msg void OnUpdateEditRedo(CCmdUI* pCmdUI);
afx_msg void OnEditSelectall();
afx_msg void OnSearchBookmarksTogglebookmark();
***************
*** 162,166 ****
afx_msg void OnToolsHighlightcurrentline();
afx_msg void OnUpdateToolsHighlightcurrentline(CCmdUI* pCmdUI);
! //}}AFX_MSG
afx_msg void OnEditFind();
afx_msg void OnComboFunction();
--- 160,174 ----
afx_msg void OnToolsHighlightcurrentline();
afx_msg void OnUpdateToolsHighlightcurrentline(CCmdUI* pCmdUI);
! afx_msg void OnConfigureCurrentdocumentWordwrap();
! afx_msg void OnUpdateConfigureCurrentdocumentWordwrap(CCmdUI* pCmdUI);
! afx_msg void OnConfigureCurrentdocumentSyntaxhighlighting();
! afx_msg void OnUpdateConfigureCurrentdocumentSyntaxhighlighting(CCmdUI* pCmdUI);
! afx_msg void OnConfigureCurrentdocumentLinenumbers();
! afx_msg void OnUpdateConfigureCurrentdocumentLinenumbers(CCmdUI* pCmdUI);
! afx_msg void OnConfigureCurrentdocumentBookmarkmargin();
! afx_msg void OnUpdateConfigureCurrentdocumentBookmarkmargin(CCmdUI* pCmdUI);
! afx_msg void OnConfigureCurrentdocumentFoldmargin();
! afx_msg void OnUpdateConfigureCurrentdocumentFoldmargin(CCmdUI* pCmdUI);
! //}}AFX_MSG
afx_msg void OnEditFind();
afx_msg void OnComboFunction();
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog.txt 3 Jul 2003 12:58:39 -0000 1.23
--- ChangeLog.txt 6 Jul 2003 18:49:47 -0000 1.24
***************
*** 18,22 ****
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.
Beta 1.0
--- 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
Index: GeneralPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GeneralPref.cpp 8 May 2003 12:00:56 -0000 1.6
--- GeneralPref.cpp 6 Jul 2003 18:49:47 -0000 1.7
***************
*** 54,58 ****
m_startpage = m_reg.GetProfileInt(_T("Preferences"),_T("StartPage"),1);
m_checkmod = m_reg.GetProfileInt(_T("Preferences"),_T("CheckModification"),1);
! //}}AFX_DATA_INIT
}
--- 54,59 ----
m_startpage = m_reg.GetProfileInt(_T("Preferences"),_T("StartPage"),1);
m_checkmod = m_reg.GetProfileInt(_T("Preferences"),_T("CheckModification"),1);
! m_minitoolbar = m_reg.GetProfileInt(_T("Preferences"),_T("MiniToolbar"),1);
! //}}AFX_DATA_INIT
}
***************
*** 72,76 ****
DDX_Check(pDX, IDC_CHECK10, m_startpage);
DDX_Check(pDX, IDC_CHECK14, m_checkmod);
! //}}AFX_DATA_MAP
}
--- 73,78 ----
DDX_Check(pDX, IDC_CHECK10, m_startpage);
DDX_Check(pDX, IDC_CHECK14, m_checkmod);
! DDX_Check(pDX, IDC_CHECK7, m_minitoolbar);
! //}}AFX_DATA_MAP
}
Index: GeneralPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GeneralPref.h 8 May 2003 12:00:56 -0000 1.4
--- GeneralPref.h 6 Jul 2003 18:49:47 -0000 1.5
***************
*** 21,25 ****
// Dialog Data
//{{AFX_DATA(CGeneralPref)
! enum { IDD = IDD_PREF_GENERAL };
BOOL m_SaveDocs;
BOOL m_MaxMain;
--- 21,25 ----
// Dialog Data
//{{AFX_DATA(CGeneralPref)
! enum { IDD = IDD_PREF_GENERAL };
BOOL m_SaveDocs;
BOOL m_MaxMain;
***************
*** 33,37 ****
BOOL m_startpage;
BOOL m_checkmod;
! //}}AFX_DATA
--- 33,38 ----
BOOL m_startpage;
BOOL m_checkmod;
! BOOL m_minitoolbar;
! //}}AFX_DATA
Index: MainFrm.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MainFrm.cpp 2 Jul 2003 12:20:32 -0000 1.21
--- MainFrm.cpp 6 Jul 2003 18:49:47 -0000 1.22
***************
*** 999,1002 ****
--- 999,1003 ----
m_reg.WriteProfileInt(_T("Preferences"),_T("StartPage"),dlgGeneral.m_startpage);
m_reg.WriteProfileInt(_T("Preferences"),_T("CheckModification"),dlgGeneral.m_checkmod);
+ m_reg.WriteProfileInt(_T("Preferences"),_T("MiniToolbar"),dlgGeneral.m_minitoolbar);
theApp.ResetAllProperties();
Index: ScintillaDefaults.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaDefaults.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ScintillaDefaults.cpp 8 May 2003 12:00:56 -0000 1.9
--- ScintillaDefaults.cpp 6 Jul 2003 18:49:47 -0000 1.10
***************
*** 36,39 ****
--- 36,40 ----
{
LoadInitialColors();
+ LoadInitialSettings();
}
***************
*** 68,71 ****
--- 69,102 ----
}
+ void CScintillaDefaults::AddLanguageToRegistry(int langcount,LPCSTR langstr,LPCSTR syntax,LPCSTR extension,LPCSTR acp)
+ {
+ char lang[10];
+ sprintf(lang,"%d",langcount);
+
+ m_reg.WriteProfileString(SEC_LANG,lang,langstr);
+ CString regstr = SEC_LANG;
+ regstr+= "\\";
+ regstr+= langstr;
+
+ m_reg.WriteProfileString(regstr,"SyntaxFile",syntax);
+ m_reg.WriteProfileString(regstr,"Extension",extension);
+
+ if(!acp)
+ m_reg.WriteProfileString(regstr,"ACPFile",acp);
+
+ }
+
+ void CScintillaDefaults::LoadInitialSettings()
+ {
+ m_reg.WriteProfileInt(SEC_LANG,_T("Count"),7);
+ AddLanguageToRegistry(1,"Java","java.syn","java,jav","java.acmp");
+ AddLanguageToRegistry(2,"HTML","html.syn","html,htm,php,asp,php3,shtml,phtml","html.acmp");
+ AddLanguageToRegistry(3,"Cpp","cpp.syn","c,cc,cpp,cxx,h,hh,hxx,hpp","cpp.acmp");
+ AddLanguageToRegistry(4,"JavaScript","javascript.syn","js");
+ AddLanguageToRegistry(5,"CSS","css.syn","css");
+ AddLanguageToRegistry(6,"XML","xml.syn","xml,xsl,svg,xul,xsd,dtd,xslt");
+ AddLanguageToRegistry(7,"Perl","perl.syn","pl,pm,cgi,pod");
+ }
+
void CScintillaDefaults::ApplyDefaults(CScintilla * m_Scintilla)
{
***************
*** 83,87 ****
m_Scintilla->StyleSetFore(STYLE_LINENUMBER,fore_line_number);
m_Scintilla->StyleSetBack(STYLE_LINENUMBER,back_line_number);
-
m_Scintilla->StyleSetFore(STYLE_BRACELIGHT,fore_bm);
--- 114,117 ----
Index: ScintillaDefaults.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaDefaults.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScintillaDefaults.h 8 May 2003 12:00:56 -0000 1.3
--- ScintillaDefaults.h 6 Jul 2003 18:49:47 -0000 1.4
***************
*** 27,30 ****
--- 27,32 ----
void ReadColor(CString text,COLORREF &fore,COLORREF &back);
void LoadInitialColors();
+ void LoadInitialSettings();
+ void AddLanguageToRegistry(int langcount,LPCSTR langstr,LPCSTR syntax,LPCSTR extension,LPCSTR acp=NULL);
CRegProfile m_reg;
Index: ToDo.txt
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ToDo.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ToDo.txt 2 Jul 2003 12:20:32 -0000 1.13
--- ToDo.txt 6 Jul 2003 18:49:47 -0000 1.14
***************
*** 53,57 ****
window.
! >>>
colors, function
Why I can't set background colour to black?? There is
--- 53,57 ----
window.
!
colors, function
Why I can't set background colour to black?? There is
***************
*** 144,147 ****
--- 144,148 ----
- Tabs to spaces does not work ?
+
- Long file names are displayed is their unreadable short form (e.g., "Document and Settings" -> "DOCUM~1" in title bar, recent files and Window menu
Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** resource.h 8 May 2003 12:00:56 -0000 1.12
--- resource.h 6 Jul 2003 18:49:47 -0000 1.13
***************
*** 99,102 ****
--- 99,103 ----
#define IDR_ERRPARSESPECIALS 245
#define IDD_QUICKJUMP 246
+ #define IDR_VIEW 247
#define IDD_WIN2K_FILEDIALOG 446
#define IDB_FILEOPEN 447
***************
*** 411,414 ****
--- 412,421 ----
#define ID_SEARCH_QUICKJUMP 33028
#define ID_TOOLS_STOPRECORDING 33030
+ #define ID_CONFIGURE_CURRENTDOCUMENT_WORDWRAP 33035
+ #define ID_CONFIGURE_CURRENTDOCUMENT_VIEWENDOFLINE 33036
+ #define ID_CONFIGURE_CURRENTDOCUMENT_SYNTAXHIGHLIGHTING 33037
+ #define ID_CONFIGURE_CURRENTDOCUMENT_LINENUMBERS 33039
+ #define ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN 33041
+ #define ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN 33044
#define ID_OUTPUT_CLEAR 57632
#define ID_OUTPUT_COPY 57634
***************
*** 421,430 ****
// Next default values for new objects
! //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
! #define _APS_NEXT_RESOURCE_VALUE 247
! #define _APS_NEXT_COMMAND_VALUE 33031
#define _APS_NEXT_CONTROL_VALUE 1088
#define _APS_NEXT_SYMED_VALUE 105
--- 428,437 ----
// Next default values for new objects
! //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
! #define _APS_NEXT_RESOURCE_VALUE 249
! #define _APS_NEXT_COMMAND_VALUE 33045
#define _APS_NEXT_CONTROL_VALUE 1088
#define _APS_NEXT_SYMED_VALUE 105
|
