anyedit-cvs Mailing List for AnyEdit (Page 11)

Status: Beta

Brought to you by: moonshyne, tdhdeep

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

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 32 > >> (Page 11 of 32)

[Anyedit-cvs]AnyEditv2 AnyEdit.cpp,1.99,1.100 SortDlg.cpp,1.3,1.4

From: Leon W. <moo...@us...> - 2004-09-29 08:07:42

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4230

Modified Files:
	AnyEdit.cpp SortDlg.cpp 
Log Message:
Saving of the config file has been moved to ExitInstance.

Index: AnyEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** AnyEdit.cpp	29 Sep 2004 07:57:46 -0000	1.99
--- AnyEdit.cpp	29 Sep 2004 08:07:33 -0000	1.100
***************
*** 516,519 ****
--- 516,522 ----
  	CTagsUninitialize();
  
+ 	// Save the config file.
+ 	m_ConfigFile.Save();
+ 
      //Delete all the files in the temp folder
      CString pat = GetAppPath();

Index: SortDlg.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SortDlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SortDlg.cpp	19 Sep 2004 13:32:41 -0000	1.3
--- SortDlg.cpp	29 Sep 2004 08:07:33 -0000	1.4
***************
*** 104,110 ****
  	}
  
- 	// Save the changed settings
- 	pConfigFile->Save();
- 
  	m_pScintilla->SortLines(m_nSortDirection == 0, // bAscending,
  						  m_bCase == FALSE, // bIgnoreCase,
--- 104,107 ----

[Anyedit-cvs]AnyEditBin/Config/Default AnyEdit.cfg,1.19,1.20

From: Leon W. <moo...@us...> - 2004-09-29 08:06:22

Update of /cvsroot/anyedit/AnyEditBin/Config/Default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4024/Config/Default

Modified Files:
	AnyEdit.cfg 
Log Message:
Insert Text Dialog settings are now saved in the config file.

Index: AnyEdit.cfg
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/AnyEdit.cfg,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AnyEdit.cfg	28 Sep 2004 12:51:48 -0000	1.19
--- AnyEdit.cfg	29 Sep 2004 08:06:12 -0000	1.20
***************
*** 111,113 ****
--- 111,122 ----
          <GroupByType>0</GroupByType>
      </ClassView>
+     <InsertText>
+     	<Type>0</Type>
+     	<Position>0</Position>
+     	<FirstNumber>1</FirstNumber>
+     	<Length>1</Length>
+     	<Step>1</Step>
+     	<Separator>.</Separator>
+     	<InsertWords />
+     </InsertText>
  </Config>

[Anyedit-cvs]AnyEditv2 ConfigFile.cpp,1.18,1.19 ConfigFile.h,1.17,1.18 inserttextdlg.cpp,1.1,1.2

From: Leon W. <moo...@us...> - 2004-09-29 08:04:58

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3728

Modified Files:
	ConfigFile.cpp ConfigFile.h inserttextdlg.cpp 
Log Message:
Insert Text Dialog settings are now saved in the config file.

Index: inserttextdlg.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/inserttextdlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inserttextdlg.cpp	19 Sep 2004 13:20:28 -0000	1.1
--- inserttextdlg.cpp	29 Sep 2004 08:04:47 -0000	1.2
***************
*** 83,86 ****
--- 83,88 ----
  BOOL CInsertTextDlg::OnInitDialog() 
  {
+ 	CConfigFile* pConfigFile = theApp.GetConfigFile();
+ 
  	CDialog::OnInitDialog();
  
***************
*** 89,100 ****
  	m_wndStep.Init(1.0, 0, true);
  
  	m_spinPosition.SetRange(0, 9999);
! 	m_spinPosition.SetPos(0);
  	m_spinFirstNumber.SetRange32(0, 9999999);
! 	m_spinFirstNumber.SetPos(1);
  	m_spinStep.SetRange(-99, 99);
! 	m_spinStep.SetPos(1);
  	m_spinLength.SetRange(1, 99);
! 	m_spinLength.SetPos(1);
  
  	UpdateControls();
--- 91,106 ----
  	m_wndStep.Init(1.0, 0, true);
  
+ 	m_nInsert = pConfigFile->GetInsertTextType();
  	m_spinPosition.SetRange(0, 9999);
! 	m_spinPosition.SetPos( pConfigFile->GetInsertTextPosition() );
  	m_spinFirstNumber.SetRange32(0, 9999999);
! 	m_spinFirstNumber.SetPos( pConfigFile->GetInsertTextFirstNumber() );
  	m_spinStep.SetRange(-99, 99);
! 	m_spinStep.SetPos( pConfigFile->GetInsertTextStep() );
  	m_spinLength.SetRange(1, 99);
! 	m_spinLength.SetPos( pConfigFile->GetInsertTextLength() );
! 	m_strSeperator = pConfigFile->GetInsertTextSeparator();
! 
! 	UpdateData( FALSE );
  
  	UpdateControls();
***************
*** 106,109 ****
--- 112,118 ----
  void CInsertTextDlg::OnOK() 
  {
+ 	int iCount;
+ 	CString szWord;
+ 
  	UpdateData();
  
***************
*** 134,145 ****
  
  	CConfigFile* pConfigFile = theApp.GetConfigFile();
! /*
! 	CString str;
! 	for (int i = 0; i < m_cbText.GetSize(); i++)
  	{
! 		m_cbText.GetLBText(i, str);
! 		???
  	}
- */
  
  	CDialog::OnOK();
--- 143,165 ----
  
  	CConfigFile* pConfigFile = theApp.GetConfigFile();
! 	pConfigFile->SetInsertTextType( m_nInsert );
! 	pConfigFile->SetInsertTextPosition( m_nPosition );
! 	pConfigFile->SetInsertTextFirstNumber( m_nFirstNumber );
! 	pConfigFile->SetInsertTextLength( m_nLength );
! 	pConfigFile->SetInsertTextStep( m_nStep );
! 	pConfigFile->SetInsertTextSeparator( m_strSeperator );
! 
! 	// First make sure the last entered text is added to the list
! 	AddText( m_strText );
! 
! 	// Remove the list of words from the config file.
! 	pConfigFile->RemoveInsertTextWords();
! 
! 	// Add the current list of words to the config file.
! 	for( iCount = 0; iCount < m_cbText.GetCount(); ++ iCount )
  	{
! 		m_cbText.GetLBText( iCount, szWord );
! 		pConfigFile->AddInsertTextWord( szWord );
  	}
  
  	CDialog::OnOK();
***************
*** 192,207 ****
  void CInsertTextDlg::FillTextComboBox()
  {
! 	CString str;
  
  	m_cbText.ResetContent();
  
  	CConfigFile* pConfigFile = theApp.GetConfigFile();
! /*
! 	for (int i = 0; i < ???; i++)
  	{
! 		str = ???;
! 		m_cbText.InsertString(i, str);
  	}
- */
  }
  
--- 212,228 ----
  void CInsertTextDlg::FillTextComboBox()
  {
! 	unsigned int uiCount;
! 	CString szWord;
  
  	m_cbText.ResetContent();
  
  	CConfigFile* pConfigFile = theApp.GetConfigFile();
! 
! 	for( uiCount = 0; uiCount < nMaxSize; ++ uiCount )
  	{
! 		szWord = pConfigFile->GetInsertTextWord( uiCount );
! 		if( szWord.IsEmpty() ) break;
! 		m_cbText.InsertString( uiCount, szWord );
  	}
  }
  
***************
*** 212,215 ****
--- 233,240 ----
  void CInsertTextDlg::AddText(CString strText)
  {
+ 	// Check if we don't have an empty string.
+ 	if (strText.IsEmpty())
+ 		return;
+ 
  	// Find existing entry. When found remove entry.
  	int nPos = m_cbText.FindStringExact(0, strText);

Index: ConfigFile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ConfigFile.h	27 Sep 2004 10:09:11 -0000	1.17
--- ConfigFile.h	29 Sep 2004 08:04:47 -0000	1.18
***************
*** 24,27 ****
--- 24,28 ----
  #define TAG_SORT						"Sort"
  #define TAG_CLASSVIEW					"ClassView"
+ #define TAG_INSERTTEXT					"InsertText"
  
  // General tags
***************
*** 98,101 ****
--- 99,112 ----
  #define TAG_CLASSVIEW_GROUPBYTYPE		"GroupByType"
  
+ // Insert Text Dialog
+ #define TAG_INSERTTEXT_TYPE				"Type"
+ #define TAG_INSERTTEXT_POSITION			"Position"
+ #define TAG_INSERTTEXT_FIRSTNUMBER		"FirstNumber"
+ #define TAG_INSERTTEXT_LENGTH			"Length"
+ #define TAG_INSERTTEXT_STEP				"Step"
+ #define TAG_INSERTTEXT_SEPARATOR		"Separator"
+ #define TAG_INSERTTEXT_INSERTWORDS		"InsertWords"
+ #define TAG_INSERTTEXT_WORD				"Word"
+ 
  /** \class CConfigFile
   *  \brief A class with the interface to the AnyEdit config file in XML, derived from CXMLFile
***************
*** 407,410 ****
--- 418,466 ----
  	/// Set the Group by Type of the Class View.
  	bool SetClassViewGroupByType( bool bGroupByType );
+ 
+ 	/// Get the type of insert text.
+ 	int GetInsertTextType();
+ 
+ 	/// Set the type of insert text.
+ 	bool SetInsertTextType( int iType );
+ 
+ 	/// Get the Position of the insert text.
+ 	int GetInsertTextPosition();
+ 
+ 	/// Set the Position of the insert text.
+ 	bool SetInsertTextPosition( int iPos );
+ 
+ 	/// Get the First Number of the insert text.
+ 	int GetInsertTextFirstNumber();
+ 
+ 	/// Set the First Number of the insert text.
+ 	bool SetInsertTextFirstNumber( int iNumber );
+ 
+ 	/// Get the Length of the insert text.
+ 	int GetInsertTextLength();
+ 
+ 	/// Set the Length of the insert text.
+ 	bool SetInsertTextLength( int iLength );
+ 
+ 	/// Get the Step of the insert text.
+ 	int GetInsertTextStep();
+ 
+ 	/// Set the Step of the insert text.
+ 	bool SetInsertTextStep( int iStep );
+ 
+ 	/// Get the Separator of the insert text.
+ 	CString GetInsertTextSeparator();
+ 
+ 	/// Set the Separator of the insert text.
+ 	bool SetInsertTextSeparator( const CString& szSeparator );
+ 
+ 	/// Get an insert text word.
+ 	CString GetInsertTextWord( unsigned int uiIndex );
+ 
+ 	/// Add an insert text word.
+ 	bool AddInsertTextWord( const CString& szWord );
+ 
+ 	/// Remove all insert text words.
+ 	bool RemoveInsertTextWords();
  };
  

Index: ConfigFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ConfigFile.cpp	27 Sep 2004 10:09:11 -0000	1.18
--- ConfigFile.cpp	29 Sep 2004 08:04:47 -0000	1.19
***************
*** 913,914 ****
--- 913,1044 ----
  	return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_GROUPBYTYPE, bGroupByType );
  }
+ 
+ // Get the type of insert text.
+ int CConfigFile::GetInsertTextType()
+ {
+ 	return GetIntFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_TYPE );
+ }
+ 
+ // Set the type of insert text.
+ bool CConfigFile::SetInsertTextType( int iType )
+ {
+ 	return SetIntToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_TYPE, iType );
+ }
+ 
+ // Get the Position of the insert text.
+ int CConfigFile::GetInsertTextPosition()
+ {
+ 	return GetIntFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_POSITION );
+ }
+ 
+ // Set the Position of the insert text.
+ bool CConfigFile::SetInsertTextPosition( int iPos )
+ {
+ 	return SetIntToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_POSITION, iPos );
+ }
+ 
+ // Get the First Number of the insert text.
+ int CConfigFile::GetInsertTextFirstNumber()
+ {
+ 	return GetIntFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_FIRSTNUMBER );
+ }
+ 
+ // Set the First Number of the insert text.
+ bool CConfigFile::SetInsertTextFirstNumber( int iNumber )
+ {
+ 	return SetIntToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_FIRSTNUMBER, iNumber );
+ }
+ 
+ // Get the Length of the insert text.
+ int CConfigFile::GetInsertTextLength()
+ {
+ 	return GetIntFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_LENGTH );
+ }
+ 
+ // Set the Length of the insert text.
+ bool CConfigFile::SetInsertTextLength( int iLength )
+ {
+ 	return SetIntToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_LENGTH, iLength );
+ }
+ 
+ // Get the Step of the insert text.
+ int CConfigFile::GetInsertTextStep()
+ {
+ 	return GetIntFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_STEP );
+ }
+ 
+ // Set the Step of the insert text.
+ bool CConfigFile::SetInsertTextStep( int iStep )
+ {
+ 	return SetIntToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_STEP, iStep );
+ }
+ 
+ // Get the Separator of the insert text.
+ CString CConfigFile::GetInsertTextSeparator()
+ {
+ 	return GetStringFromXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_SEPARATOR );
+ }
+ 
+ // Set the Separator of the insert text.
+ bool CConfigFile::SetInsertTextSeparator( const CString& szSeparator )
+ {
+ 	return SetStringToXMLFile( TAG_INSERTTEXT, TAG_INSERTTEXT_SEPARATOR, szSeparator, true );
+ }
+ 
+ // Get an insert text word.
+ CString CConfigFile::GetInsertTextWord( unsigned int uiIndex )
+ {
+ 	pug::xml_node xnode( m_xml_parser.document().first_element_by_name( TAG_INSERTTEXT ) );
+ 	if( xnode.empty() ) return _T("");
+ 	
+ 	xnode = xnode.first_element_by_name( TAG_INSERTTEXT_INSERTWORDS );
+ 	if( xnode.empty() || !xnode.has_child_nodes() ) return _T("");
+ 
+ 	if( xnode.children() <= uiIndex ) return _T("");
+ 
+ 	xnode = xnode.child( uiIndex );
+ 	if( !xnode.has_name( TAG_INSERTTEXT_WORD ) ) return _T("");
+ 
+ 	if( !xnode.children() ) return _T("");
+ 
+ 	return xnode.child(0).value();
+ }
+ 
+ // Add an insert text word.
+ bool CConfigFile::AddInsertTextWord( const CString& szWord )
+ {
+ 	pug::xml_node xnode( m_xml_parser.document().first_element_by_name( TAG_INSERTTEXT ) );
+ 	if( xnode.empty() ) return false;
+ 	
+ 	xnode = xnode.first_element_by_name( TAG_INSERTTEXT_INSERTWORDS );
+ 	if( xnode.empty() ) return false;
+ 
+ 	xnode = xnode.append_child( pug::node_element );
+ 	if( xnode.empty() ) return false;
+ 
+ 	if( !xnode.name( TAG_INSERTTEXT_WORD ) ) return false;
+ 
+ 	xnode = xnode.append_child( pug::node_pcdata );
+ 	if( xnode.empty() ) return false;
+ 
+ 	if( !xnode.value( szWord ) ) return false;
+ 
+ 	return m_bModified = true;
+ }
+ 
+ // Remove all insert text words.
+ bool CConfigFile::RemoveInsertTextWords()
+ {
+ 	pug::xml_node xnode( m_xml_parser.document().first_element_by_name( TAG_INSERTTEXT ) );
+ 	if( xnode.empty() ) return false;
+ 	
+ 	xnode = xnode.first_element_by_name( TAG_INSERTTEXT_INSERTWORDS );
+ 	if( xnode.empty() ) return false;
+ 	
+ 	while( xnode.has_child_nodes() )
+ 	{
+ 		xnode.remove_child( 0 );
+ 	}
+ 
+ 	return m_bModified = true;
+ }

[Anyedit-cvs]AnyEditv2 AnyEdit.cpp,1.98,1.99 TabCtrlSSL.cpp,1.5,1.6

From: Leon W. <moo...@us...> - 2004-09-29 07:57:56

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2435

Modified Files:
	AnyEdit.cpp TabCtrlSSL.cpp 
Log Message:
Fixed afximpl.h VC.NET 7 & 8 compatibilty.

Index: AnyEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** AnyEdit.cpp	28 Sep 2004 16:50:54 -0000	1.98
--- AnyEdit.cpp	29 Sep 2004 07:57:46 -0000	1.99
***************
*** 61,65 ****
  // for AfxComparePath
  #if _MSC_VER > 1200
! #include <afximpl.h>
  #else
  #include <../src/afximpl.h>
--- 61,65 ----
  // for AfxComparePath
  #if _MSC_VER > 1200
! #include <../src/mfc/afximpl.h>
  #else
  #include <../src/afximpl.h>
***************
*** 181,185 ****
  #endif
  
! 	// The DumpHandleApp will only handle things after the initialization, so we need to 
  	//  catch things around here and throw it to be handled:
  #ifdef _CATCHDUMP
--- 181,185 ----
  #endif
  
! 	// The DumpHandleApp will only handle things after the initialization, so we need to
  	//  catch things around here and throw it to be handled:
  #ifdef _CATCHDUMP
***************
*** 208,212 ****
  			}
  		}
! 		
  		// Initialize Tag Parsing Thread.
  		CTagsInitialize();
--- 208,212 ----
  			}
  		}
! 
  		// Initialize Tag Parsing Thread.
  		CTagsInitialize();
***************
*** 740,744 ****
  		if (!CloseWorkspace())
  			return NULL;
! 		
  		if (LoadWorkspace(sFilename))
  			m_pMainWnd->PostMessage(WM_COMMAND, ID_AE_REFRESH_STARTUPPAGE);	// Will refresh the page!
--- 740,744 ----
  		if (!CloseWorkspace())
  			return NULL;
! 
  		if (LoadWorkspace(sFilename))
  			m_pMainWnd->PostMessage(WM_COMMAND, ID_AE_REFRESH_STARTUPPAGE);	// Will refresh the page!
***************
*** 799,804 ****
      CString strFiles;
  
!     if(DoPromptFileName(strFiles, _T("Open Document In AnyEdit"), 
! 		OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, TRUE, 
  		GetFileTypeManager()->GetFileDialogFilter(),
  		GetFileTypeManager()->GetLanguageNrFromExtension(GetCurrentExt())))
--- 799,804 ----
      CString strFiles;
  
!     if(DoPromptFileName(strFiles, _T("Open Document In AnyEdit"),
! 		OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, TRUE,
  		GetFileTypeManager()->GetFileDialogFilter(),
  		GetFileTypeManager()->GetLanguageNrFromExtension(GetCurrentExt())))
***************
*** 948,952 ****
  
  	CString szFontName = m_ConfigFile.GetOutputBarFontName();
! 	((CMainFrame*)AfxGetMainWnd())->GetOutputBar()->SetFont(szFontName,m_ConfigFile.GetOutputBarFontSize());	
  }
  
--- 948,952 ----
  
  	CString szFontName = m_ConfigFile.GetOutputBarFontName();
! 	((CMainFrame*)AfxGetMainWnd())->GetOutputBar()->SetFont(szFontName,m_ConfigFile.GetOutputBarFontSize());
  }
  
***************
*** 1760,1764 ****
  }
  
! /** GetMainFrameWnd() is similar to GetMainWnd(). This function does a type cast 
   * to class CMainFrame.
   */
--- 1760,1764 ----
  }
  
! /** GetMainFrameWnd() is similar to GetMainWnd(). This function does a type cast
   * to class CMainFrame.
   */
***************
*** 1768,1772 ****
  }
  
! BOOL CAnyEditApp::OnIdle(LONG lCount) 
  {
  	// Test to see if we have any documents that has been changed and not yet parsed...
--- 1768,1772 ----
  }
  
! BOOL CAnyEditApp::OnIdle(LONG lCount)
  {
  	// Test to see if we have any documents that has been changed and not yet parsed...
***************
*** 1786,1790 ****
  	for (iterator iNotify = begin(); iNotify != end(); iNotify++)
  		bRet |= (*iNotify)->OnIdleNotify(lCount);
! 	
  	for (std::map<AETagMap*, AETagMapUpdater*>::iterator i = m_mTagMapUpdaters.begin(); i != m_mTagMapUpdaters.end(); i++)
  	{
--- 1786,1790 ----
  	for (iterator iNotify = begin(); iNotify != end(); iNotify++)
  		bRet |= (*iNotify)->OnIdleNotify(lCount);
! 
  	for (std::map<AETagMap*, AETagMapUpdater*>::iterator i = m_mTagMapUpdaters.begin(); i != m_mTagMapUpdaters.end(); i++)
  	{
***************
*** 1795,1799 ****
  		}
  	}
! 	
  	return bRet;
  }
--- 1795,1799 ----
  		}
  	}
! 
  	return bRet;
  }
***************
*** 2032,2041 ****
  }
  
! void CAnyEditApp::OnUpdateFileOpenstartuppage(CCmdUI* pCmdUI) 
  {
  	pCmdUI->Enable(GetStartupPage() != NULL);
  }
  
! void CAnyEditApp::AddToRecentFileList(LPCTSTR lpszPathName) 
  {
  	if (!m_bDontAddToFileList)
--- 2032,2041 ----
  }
  
! void CAnyEditApp::OnUpdateFileOpenstartuppage(CCmdUI* pCmdUI)
  {
  	pCmdUI->Enable(GetStartupPage() != NULL);
  }
  
! void CAnyEditApp::AddToRecentFileList(LPCTSTR lpszPathName)
  {
  	if (!m_bDontAddToFileList)
***************
*** 2105,2114 ****
  }
  
! void CAnyEditApp::OnViewSyncfile() 
  {
  	m_bSyncToFileView = !m_bSyncToFileView;
  }
  
! void CAnyEditApp::OnUpdateViewSyncfile(CCmdUI* pCmdUI) 
  {
  	pCmdUI->SetCheck(m_bSyncToFileView ? 1 : 0);
--- 2105,2114 ----
  }
  
! void CAnyEditApp::OnViewSyncfile()
  {
  	m_bSyncToFileView = !m_bSyncToFileView;
  }
  
! void CAnyEditApp::OnUpdateViewSyncfile(CCmdUI* pCmdUI)
  {
  	pCmdUI->SetCheck(m_bSyncToFileView ? 1 : 0);

Index: TabCtrlSSL.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TabCtrlSSL.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TabCtrlSSL.cpp	28 Sep 2004 16:50:55 -0000	1.5
--- TabCtrlSSL.cpp	29 Sep 2004 07:57:46 -0000	1.6
***************
*** 7,11 ****
  #ifdef _DEBUG
  #if _MSC_VER > 1200
! #include <afximpl.h>
  #else
  #include <../src/afximpl.h>
--- 7,11 ----
  #ifdef _DEBUG
  #if _MSC_VER > 1200
! #include <../src/mfc/afximpl.h>
  #else
  #include <../src/afximpl.h>

[Anyedit-cvs]AnyEditv2 ScintillaEx.cpp,1.15,1.16

From: Leon W. <moo...@us...> - 2004-09-28 20:07:21

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv833

Modified Files:
	ScintillaEx.cpp 
Log Message:
Bugfix: In some case last selected line was not commented or uncommented.

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ScintillaEx.cpp	26 Sep 2004 13:38:05 -0000	1.15
--- ScintillaEx.cpp	28 Sep 2004 20:07:02 -0000	1.16
***************
*** 1266,1270 ****
  		lLine = LineFromPosition( lSelStart );
  		long lLastLine = LineFromPosition( lSelEnd );
! 		while( lLine < lLastLine )
  		{
  			InsertChar( PositionFromLine( lLine ), ' ' );
--- 1266,1271 ----
  		lLine = LineFromPosition( lSelStart );
  		long lLastLine = LineFromPosition( lSelEnd );
! 		if( PositionFromLine( lLastLine ) == lSelEnd ) -- lLastLine;
! 		while( lLine <= lLastLine )
  		{
  			InsertChar( PositionFromLine( lLine ), ' ' );
***************
*** 1272,1277 ****
  			++ lLine;
  		}
  		// Set the cursor behind text
! 		SetSel( -1, PositionFromLine( lLastLine ) );
  
  		// End the undo recording
--- 1273,1279 ----
  			++ lLine;
  		}
+ 
  		// Set the cursor behind text
! 		SetSel( -1, PositionFromLine( lLine ) );
  
  		// End the undo recording
***************
*** 1304,1308 ****
  		lLine = LineFromPosition( lSelStart );
  		long lLastLine = LineFromPosition( lSelEnd );
! 		while( lLine < lLastLine )
  		{
  			CString szTemp;
--- 1306,1311 ----
  		lLine = LineFromPosition( lSelStart );
  		long lLastLine = LineFromPosition( lSelEnd );
! 		if( PositionFromLine( lLastLine ) == lSelEnd ) -- lLastLine;
! 		while( lLine <= lLastLine )
  		{
  			CString szTemp;
***************
*** 1321,1326 ****
  		}
  
! 		// Set current position behind the changed text.
! 		SetSel( -1, PositionFromLine( lLastLine ) );
  
  		// End the undo recording
--- 1324,1329 ----
  		}
  
! 		// Set the cursor behind text
! 		SetSel( -1, PositionFromLine( lLine ) );
  
  		// End the undo recording

[Anyedit-cvs]AnyEditv2 AnyEdit.cpp,1.97,1.98 TabCtrlSSL.cpp,1.4,1.5

From: Guy H <da...@us...> - 2004-09-28 16:51:05

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20580/AnyEditv2

Modified Files:
	AnyEdit.cpp TabCtrlSSL.cpp 
Log Message:
Changed to remove necessity to change include directory settings in VC6 (or VC7)

Index: AnyEdit.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** AnyEdit.cpp	25 Sep 2004 13:10:07 -0000	1.97
--- AnyEdit.cpp	28 Sep 2004 16:50:54 -0000	1.98
***************
*** 60,64 ****
--- 60,68 ----
  
  // for AfxComparePath
+ #if _MSC_VER > 1200
  #include <afximpl.h>
+ #else
+ #include <../src/afximpl.h>
+ #endif
  
  #ifdef _DEBUG

Index: TabCtrlSSL.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TabCtrlSSL.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TabCtrlSSL.cpp	25 Sep 2004 13:10:08 -0000	1.4
--- TabCtrlSSL.cpp	28 Sep 2004 16:50:55 -0000	1.5
***************
*** 6,10 ****
--- 6,14 ----
  
  #ifdef _DEBUG
+ #if _MSC_VER > 1200
  #include <afximpl.h>
+ #else
+ #include <../src/afximpl.h>
+ #endif
  #endif // _DEBUG

[Anyedit-cvs]AnyEditv2 TagManager.cpp,1.10,1.11

From: Guy H <da...@us...> - 2004-09-28 16:49:07

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19664/AnyEditv2

Modified Files:
	TagManager.cpp 
Log Message:
Fixed FixSignature() to remove an extra space after the first paranthesis

Index: TagManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/TagManager.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TagManager.cpp	25 Sep 2004 13:10:08 -0000	1.10
--- TagManager.cpp	28 Sep 2004 16:48:46 -0000	1.11
***************
*** 447,459 ****
  //////////////////////////////////////////////////////////////
  // AEFunctionTag
  std::string FixSignature(const std::string& sSignature)
  {
  	std::string sRet;
! 	int nPos = 0, nLen = sSignature.size();
! 	bool bSlashed = false;
! 	int nQuotes = 0;
! 	bool bEqualed = false;
! 	bool bSpaced = false;
! 	int nParans = 0;
  	char c;
  	while (nPos < nLen)
--- 447,472 ----
  //////////////////////////////////////////////////////////////
  // AEFunctionTag
+ /*********************************************************************\
+ **				
+ ** Function:	FixSignature()
+ **				
+ ** Arguments:	sSignature - The function signature to fix
+ **				
+ ** Returns:		The fixed signature
+ **				
+ ** Description:	This function removes the unwanted stuff from the
+ **				signature. The unwanted signature stuff includes:
+ **				1) Unnecessary spaces (more then one in a row, and between
+ **				   variables and the paranthesis)
+ **				2) Default values
+ **				For example, ( int b = 5   ) will be translated into
+ **				(int b)
+ **				
+ \*********************************************************************/ 
  std::string FixSignature(const std::string& sSignature)
  {
  	std::string sRet;
! 	int nPos = 0, nLen = sSignature.size(), nQuotes = 0, nParans = 0;
! 	bool bSlashed = false, bEqualed = false, bSpaced = false, bInitial = false;
  	char c;
  	while (nPos < nLen)
***************
*** 463,472 ****
--- 476,493 ----
  		{
  			case '(':
+ 				// Paranthesis are only valid outside of strings:
  				if (nQuotes == 0)
+ 				{
+ 					// Count paranthesis so we'll know when they end
  					nParans++;
+ 					// Set flag so spaces won't show
+ 					bInitial = true;
+ 				}
  				break;
  			case '=':
+ 				// Equal sign (default value start) is only valid outside of strings
  				if (nQuotes == 0)
  				{
+ 					// Set start of default value, and don't show space if there was one
  					bEqualed = true;
  					bSpaced = false;
***************
*** 474,479 ****
--- 495,502 ----
  				break;
  			case ',':
+ 				// Comma sign (variable start) is only valid outside of strings:
  				if (nQuotes == 0)
  				{
+ 					// Set end of default value (if there was one), and don't show space if there was one
  					bEqualed = false;
  					bSpaced = false;
***************
*** 481,494 ****
--- 504,523 ----
  				break;
  			case '"':
+ 				// Start/End of string?
  				if (!bSlashed)
  				{
+ 					// Set the type of quotes starting/ending.
+ 					// Note that double quotes doesn't end strings that are inside a single quote
  					switch (nQuotes)
  					{
  					case 0:
+ 						// Start string
  						nQuotes = 2;
  						break;
  					case 1:
+ 						// Inside single-quotes, do nothing
  						break;
  					case 2:
+ 						// End string
  						nQuotes = 0;
  						break;
***************
*** 497,511 ****
--- 526,546 ----
  				break;
  			case '\'':
+ 				// Start/End of string?
  				if (!bSlashed)
  				{
+ 					// Set the type of quotes starting/ending.
+ 					// Note that single quote doesn't end strings that are inside a double quotes
  					switch (nQuotes)
  					{
  					case 0:
+ 						// Start string
  						nQuotes = 1;
  						break;
  					case 1:
+ 						// End string
  						nQuotes = 0;
  						break;
  					case 2:
+ 						// Inside double-quotes, do nothing
  						break;
  					}
***************
*** 513,526 ****
--- 548,568 ----
  				break;
  			case '\\':
+ 				// Slash indicates that the next character is not to be string-stopping - only inside strings!
  				if (bSlashed)
+ 					// Slash slash is nothing for us
  					bSlashed = false;
  				else if (nQuotes > 0)
+ 					// Slash inside a string - note it for future reference
  					bSlashed = true;
  				break;
  			case ')':
+ 				// End of paranthesis is only valid outside of strings
  				if (nQuotes == 0)
  				{
+ 					// Stops the default value
  					bEqualed = false;
+ 					// Don't add spaces if found before this
  					bSpaced = false;
+ 					// One less paranthesis count
  					nParans--;
  				}
***************
*** 528,559 ****
  			case ' ':
  				if (nQuotes == 0)
  					bSpaced = true;
  				break;
  		}
  		if (!bEqualed)
  		{
  			bool bAddChar = true;
  			if (nQuotes == 0)
  			{
  				switch (c)
  				{
  				case ' ':
  					bAddChar = false;
  					break;
  				case '(':
  					bAddChar = (nParans < 2);
  					break;
  				case ')':
  					bAddChar = (nParans == 0);
  					break;
  				}
! 				if (bSpaced && bAddChar)
  				{
  					sRet += ' ';
  					bSpaced = false;
  				}
  			}
  			if (bAddChar)
  				sRet += c;
  		}
  		nPos++;
--- 570,619 ----
  			case ' ':
  				if (nQuotes == 0)
+ 					// Space outside of strings is condenced
  					bSpaced = true;
  				break;
  		}
+ 		// No adding to signature if this is the default value
  		if (!bEqualed)
  		{
+ 			// Basically we'll add everything
  			bool bAddChar = true;
  			if (nQuotes == 0)
  			{
+ 				// If we not are inside a string, we may want to jump over stuff:
  				switch (c)
  				{
  				case ' ':
+ 					// Don't add spaces - they'll be added automatically (and singley) later
  					bAddChar = false;
  					break;
  				case '(':
+ 					// Only add paranthesis if they are not inside others
  					bAddChar = (nParans < 2);
  					break;
  				case ')':
+ 					// Only add paranthesis if they are not inside others
  					bAddChar = (nParans == 0);
+ 					// Also we don't need to stop spaces anymore
+ 					bInitial = false;
  					break;
  				}
! 				// Add a space if: 1) Found one; 2) We'll add a char after it and 3) We've added stuff BEFORE it
! 				if (bSpaced && bAddChar && !bInitial)
  				{
  					sRet += ' ';
+ 					// Single space only!
  					bSpaced = false;
  				}
  			}
+ 			// Add the next char?
  			if (bAddChar)
+ 			{
+ 				// Do it
  				sRet += c;
+ 				if (bInitial && (c != '('))
+ 					// A character was added, spaces are valid now
+ 					bInitial = false;
+ 			}
  		}
  		nPos++;

[Anyedit-cvs]AnyEditBin/Config/Default AnyEdit.cfg,1.18,1.19

From: Leon W. <moo...@us...> - 2004-09-28 12:52:03

Update of /cvsroot/anyedit/AnyEditBin/Config/Default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31082/Config/Default

Modified Files:
	AnyEdit.cfg 
Log Message:
Bugfix: </RightEdge> changed to </RightEdgeColor>

Index: AnyEdit.cfg
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/AnyEdit.cfg,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AnyEdit.cfg	27 Sep 2004 10:09:48 -0000	1.18
--- AnyEdit.cfg	28 Sep 2004 12:51:48 -0000	1.19
***************
*** 22,26 ****
          <RightEdge>1</RightEdge>
          <RightEdgeColumn>80</RightEdgeColumn>
!         <RightEdgeColor>14342911</RightEdge>
      </Editor>
      <Font>
--- 22,26 ----
          <RightEdge>1</RightEdge>
          <RightEdgeColumn>80</RightEdgeColumn>
!         <RightEdgeColor>14342911</RightEdgeColor>
      </Editor>
      <Font>

[Anyedit-cvs]AnyEditv2 MainColorFontPref.cpp,1.4,1.5

From: boca4711 <boc...@us...> - 2004-09-27 18:44:34

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13223

Modified Files:
	MainColorFontPref.cpp 
Log Message:
Bugfix: OnClickCheckSelForColor has disabled m_colbSelTextBack instead of m_colbSelTextFore

Index: MainColorFontPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainColorFontPref.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MainColorFontPref.cpp	27 Sep 2004 10:12:15 -0000	1.4
--- MainColorFontPref.cpp	27 Sep 2004 18:44:25 -0000	1.5
***************
*** 211,215 ****
  	else
  	{
! 		m_colbSelTextBack.EnableWindow( FALSE );
  	}
  	NotifyParentOfChange();
--- 211,215 ----
  	else
  	{
! 		m_colbSelTextFore.EnableWindow( FALSE );
  	}
  	NotifyParentOfChange();

[Anyedit-cvs]AnyEditBin/Config/Default/Syntax asm.syn,1.3,1.4 cpp.syn,1.10,1.11 css.syn,1.8,1.9 default.syn,1.8,1.9 html.syn,1.8,1.9 java.syn,1.11,1.12 javascript.syn,1.9,1.10 pascal.syn,1.7,1.8 perl.syn,1.9,1.10 python.syn,1.9,1.10 sql.syn,1.3,1.4 xml.syn,1.7,1.8

From: Leon W. <moo...@us...> - 2004-09-27 12:38:52

Update of /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23502/Config/Default/Syntax

Modified Files:
	asm.syn cpp.syn css.syn default.syn html.syn java.syn 
	javascript.syn pascal.syn perl.syn python.syn sql.syn xml.syn 
Log Message:
Removed settings that have been moved to the Configfile.

Index: default.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/default.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** default.syn	26 Sep 2004 17:31:34 -0000	1.8
--- default.syn	27 Sep 2004 12:38:37 -0000	1.9
***************
*** 6,13 ****
  		<TabWidth>8</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>0</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<LanguageDefines>
  		<Braces>
  			<![CDATA[{([<>])}]]>
--- 6,12 ----
  		<TabWidth>8</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
  	</View>
  	<LanguageDefines>
+ 		<ClassViewLanguage />
  		<Braces>
  			<![CDATA[{([<>])}]]>
***************
*** 21,25 ****
  	<CodeHighlight>
  		<SyntaxHighlighting>0</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>0</BraceMatching>
  	</CodeHighlight>
--- 20,23 ----
***************
*** 34,43 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>0</ClassViewOn>
- 		<Language />
- 		<SortClassView>0</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>0</Indent>
--- 32,35 ----

Index: cpp.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/cpp.syn,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cpp.syn	26 Sep 2004 17:31:34 -0000	1.10
--- cpp.syn	27 Sep 2004 12:38:37 -0000	1.11
***************
*** 9,12 ****
--- 9,13 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>C++</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 26,35 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 27,33 ----
***************
*** 44,53 ****
  		<TrimTrailingSpaces>1</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>C++</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 42,45 ----

Index: sql.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/sql.syn,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sql.syn	26 Sep 2004 17:31:34 -0000	1.3
--- sql.syn	27 Sep 2004 12:38:38 -0000	1.4
***************
*** 5,8 ****
--- 5,9 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>SQL</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 22,31 ****
  		<TabWidth>2</TabWidth>
  		<TabsToSpaces>1</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 23,29 ----
***************
*** 40,49 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>SQL</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 38,41 ----

Index: pascal.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/pascal.syn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pascal.syn	26 Sep 2004 17:31:34 -0000	1.7
--- pascal.syn	27 Sep 2004 12:38:38 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>Pascal</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 25,34 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 26,32 ----
***************
*** 43,52 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>Pascal</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 41,44 ----

Index: python.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/python.syn,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** python.syn	26 Sep 2004 17:31:34 -0000	1.9
--- python.syn	27 Sep 2004 12:38:38 -0000	1.10
***************
*** 8,11 ****
--- 8,12 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>Python</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 23,32 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 24,30 ----
***************
*** 41,50 ****
  		<TrimTrailingSpaces>1</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>Python</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 39,42 ----

Index: html.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/html.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** html.syn	26 Sep 2004 17:31:34 -0000	1.8
--- html.syn	27 Sep 2004 12:38:37 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>HTML</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([<>])}]]>
***************
*** 25,34 ****
  		<TabWidth>8</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 26,32 ----
***************
*** 43,52 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>HTML</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 41,44 ----

Index: perl.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/perl.syn,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** perl.syn	26 Sep 2004 17:31:34 -0000	1.9
--- perl.syn	27 Sep 2004 12:38:38 -0000	1.10
***************
*** 7,10 ****
--- 7,11 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>Perl</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 22,31 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 23,29 ----
***************
*** 40,49 ****
  		<TrimTrailingSpaces>1</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>Perl</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 38,41 ----

Index: java.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/java.syn,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** java.syn	26 Sep 2004 17:31:34 -0000	1.11
--- java.syn	27 Sep 2004 12:38:38 -0000	1.12
***************
*** 9,12 ****
--- 9,13 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>Java</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 26,35 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 27,33 ----
***************
*** 44,53 ****
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>Java</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 42,45 ----

Index: xml.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/xml.syn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xml.syn	26 Sep 2004 17:31:34 -0000	1.7
--- xml.syn	27 Sep 2004 12:38:38 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage />
  		<Braces>
  			<![CDATA[{([<>])}]]>
***************
*** 23,32 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 24,30 ----
***************
*** 41,50 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>0</ClassViewOn>
- 		<Language />
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 39,42 ----

Index: css.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/css.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** css.syn	26 Sep 2004 17:31:34 -0000	1.8
--- css.syn	27 Sep 2004 12:38:37 -0000	1.9
***************
*** 7,10 ****
--- 7,11 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage />
  		<Braces>
  			<![CDATA[{([<>])}]]>
***************
*** 22,31 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 23,29 ----
***************
*** 40,49 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>0</ClassViewOn>
- 		<Language />
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 38,41 ----

Index: javascript.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/javascript.syn,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** javascript.syn	26 Sep 2004 17:31:34 -0000	1.9
--- javascript.syn	27 Sep 2004 12:38:38 -0000	1.10
***************
*** 9,12 ****
--- 9,13 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>JavaScript</ClassViewLanguage>
  		<Braces>
  			<![CDATA[{([])}]]>
***************
*** 26,35 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
--- 27,33 ----
***************
*** 44,53 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>1</ClassViewOn>
- 		<Language>JavaScript</Language>
- 		<SortClassView>1</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 42,45 ----

Index: asm.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/asm.syn,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** asm.syn	26 Sep 2004 17:31:34 -0000	1.3
--- asm.syn	27 Sep 2004 12:38:37 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  	</Lexer>
  	<LanguageDefines>
+ 		<ClassViewLanguage>Asm</ClassViewLanguage>
  		<Braces>
  			<![CDATA[([])]]>
***************
*** 19,28 ****
  		<TabWidth>4</TabWidth>
  		<TabsToSpaces>0</TabsToSpaces>
- 		<RightEdge>1</RightEdge>
- 		<RightEdgeColumn>80</RightEdgeColumn>
  	</View>
  	<CodeHighlight>
  		<SyntaxHighlighting>1</SyntaxHighlighting>
- 		<HighlightCurrentLine>1</HighlightCurrentLine>
  		<BraceMatching>0</BraceMatching>
  	</CodeHighlight>
--- 20,26 ----
***************
*** 37,46 ****
  		<TrimTrailingSpaces>0</TrimTrailingSpaces>
  	</OnSave>
- 	<ClassView>
- 		<ClassViewOn>0</ClassViewOn>
- 		<Language>Asm</Language>
- 		<SortClassView>0</SortClassView>
- 		<ParserDelay>1500</ParserDelay>
- 	</ClassView>
  	<Indent>
  		<Indent>1</Indent>
--- 35,38 ----

[Anyedit-cvs]AnyEditv2 AnyEdit.rc,1.102,1.103 CodingPref.cpp,1.12,1.13 CodingPref.h,1.7,1.8 EditorPref.cpp,1.10,1.11 EditorPref.h,1.7,1.8

From: Leon W. <moo...@us...> - 2004-09-27 12:36:22

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23117

Modified Files:
	AnyEdit.rc CodingPref.cpp CodingPref.h EditorPref.cpp 
	EditorPref.h 
Log Message:
Removed obsolete settings that moved to the Configfile from the dialogs.

Index: CodingPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CodingPref.h	26 Sep 2004 17:33:32 -0000	1.7
--- CodingPref.h	27 Sep 2004 12:36:07 -0000	1.8
***************
*** 24,35 ****
      //{{AFX_DATA(CCodingPref)
  	enum { IDD = IDD_PREF_CODE };
- 	CSliderCtrl	m_ctrlSlider;
- 	CEdit	m_ctrlSliderEdit;
  	BOOL	m_bAutoComp;
  	BOOL	m_bBraceMatch;
- 	BOOL	m_bClassView;
  	BOOL	m_bCodeComp;
- 	BOOL	m_bCVSorted;
- 	BOOL	m_bHighlightLine;
  	BOOL	m_bSyntaxHighlighting;
  	int		m_iAutoCompKey;
--- 24,30 ----
***************
*** 54,58 ****
      virtual BOOL OnInitDialog();
  	afx_msg void OnControlChanged();
- 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
  	//}}AFX_MSG
      DECLARE_MESSAGE_MAP()
--- 49,52 ----

Index: EditorPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/EditorPref.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EditorPref.h	26 Feb 2004 08:44:16 -0000	1.7
--- EditorPref.h	27 Sep 2004 12:36:07 -0000	1.8
***************
*** 28,37 ****
  	BOOL	m_bIndent;
  	BOOL	m_bMarginLineNumbers;
- 	BOOL	m_bRightEdge;
  	BOOL	m_bTabsToSpaces;
  	BOOL	m_bViewWhiteSpace;
  	BOOL	m_bViewWordWrap;
  	CString	m_szIndentSize;
- 	CString	m_szRightEdgeSize;
  	CString	m_szTabSize;
  	int		m_iAutoIndent;
--- 28,35 ----

Index: EditorPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/EditorPref.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EditorPref.cpp	22 Apr 2004 20:29:12 -0000	1.10
--- EditorPref.cpp	27 Sep 2004 12:36:07 -0000	1.11
***************
*** 59,68 ****
  	DDX_Check(pDX, IDC_CHECK_INDENTS, m_bIndent);
  	DDX_Check(pDX, IDC_CHECK_LINENUMBERS, m_bMarginLineNumbers);
- 	DDX_Check(pDX, IDC_CHECK_RIGHTEDGE, m_bRightEdge);
  	DDX_Check(pDX, IDC_CHECK_TABSTOSPACES, m_bTabsToSpaces);
  	DDX_Check(pDX, IDC_CHECK_WHITESPACE, m_bViewWhiteSpace);
  	DDX_Check(pDX, IDC_CHECK_WORDWRAP, m_bViewWordWrap);
  	DDX_Text(pDX, IDC_EDIT_INDENT, m_szIndentSize);
- 	DDX_Text(pDX, IDC_EDIT_RIGHTEDGE, m_szRightEdgeSize);
  	DDX_Text(pDX, IDC_EDIT_TAB, m_szTabSize);
  	DDX_Radio(pDX, IDC_RADIO_AUTOINDENT1, m_iAutoIndent);
--- 59,66 ----
***************
*** 79,88 ****
  	ON_BN_CLICKED(IDC_CHECK_INDENTS, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_LINENUMBERS, OnControlChanged)
- 	ON_BN_CLICKED(IDC_CHECK_RIGHTEDGE, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_TABSTOSPACES, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_WORDWRAP, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_WHITESPACE, OnControlChanged)
  	ON_EN_CHANGE(IDC_EDIT_INDENT, OnControlChanged)
- 	ON_EN_CHANGE(IDC_EDIT_RIGHTEDGE, OnControlChanged)
  	ON_EN_CHANGE(IDC_EDIT_TAB, OnControlChanged)
  	ON_BN_CLICKED(IDC_RADIO_AUTOINDENT1, OnControlChanged)
--- 77,84 ----
***************
*** 116,121 ****
  	m_szTabSize.Format( "%i", m_pSyntaxFile->GetTabWidth() );
  	m_bTabsToSpaces = m_pSyntaxFile->GetTabsToSpaces();
- 	m_bRightEdge = m_pSyntaxFile->GetRightEdge();
- 	m_szRightEdgeSize.Format( "%i", m_pSyntaxFile->GetRightEdgeColumn() );
  
  	UpdateData( FALSE );
--- 112,115 ----
***************
*** 185,198 ****
  		bChanged = true;
  	}
- 	if( m_bRightEdge != ( m_pSyntaxFile->GetRightEdge() ? TRUE : FALSE ) )
- 	{
- 		m_pSyntaxFile->SetRightEdge( m_bRightEdge ? true : false );
- 		bChanged = true;
- 	}
- 	if( atoi( m_szRightEdgeSize ) != m_pSyntaxFile->GetRightEdgeColumn() )
- 	{
- 		m_pSyntaxFile->SetRightEdgeColumn( atoi( m_szRightEdgeSize ) );
- 		bChanged = true;
- 	}
  	if( m_iAutoIndent != m_pSyntaxFile->GetAutoIndent() )
  	{
--- 179,182 ----

Index: CodingPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CodingPref.cpp	26 Sep 2004 17:33:32 -0000	1.12
--- CodingPref.cpp	27 Sep 2004 12:36:07 -0000	1.13
***************
*** 46,53 ****
  	m_bAutoComp = FALSE;
  	m_bBraceMatch = FALSE;
- 	m_bClassView = FALSE;
  	m_bCodeComp = FALSE;
- 	m_bCVSorted = FALSE;
- 	m_bHighlightLine = FALSE;
  	m_bSyntaxHighlighting = FALSE;
  	m_iAutoCompKey = -1;
--- 46,50 ----
***************
*** 63,74 ****
      CSAPrefsSubDlg::DoDataExchange(pDX);
      //{{AFX_DATA_MAP(CCodingPref)
- 	DDX_Control(pDX, IDC_SLIDER_CVPARSEDELAY, m_ctrlSlider);
- 	DDX_Control(pDX, IDC_EDIT_CVPARSERDELAY, m_ctrlSliderEdit);
  	DDX_Check(pDX, IDC_CHECK_AUTOCOMP, m_bAutoComp);
  	DDX_Check(pDX, IDC_CHECK_BRACEMATCH, m_bBraceMatch);
- 	DDX_Check(pDX, IDC_CHECK_CLASSVIEW, m_bClassView);
  	DDX_Check(pDX, IDC_CHECK_CODECOMP, m_bCodeComp);
- 	DDX_Check(pDX, IDC_CHECK_CVSORTALPH, m_bCVSorted);
- 	DDX_Check(pDX, IDC_CHECK_HIGHLIGHTLINE, m_bHighlightLine);
  	DDX_Check(pDX, IDC_CHECK_SYNTAXHIGHLIGHTING, m_bSyntaxHighlighting);
  	DDX_Radio(pDX, IDC_RADIO_ACKEY1, m_iAutoCompKey);
--- 60,66 ----
***************
*** 83,92 ****
  //{{AFX_MSG_MAP(CCodingPref)
  	ON_BN_CLICKED(IDC_CHECK_AUTOCOMP, OnControlChanged)
- 	ON_WM_HSCROLL()
  	ON_BN_CLICKED(IDC_CHECK_BRACEMATCH, OnControlChanged)
- 	ON_BN_CLICKED(IDC_CHECK_CLASSVIEW, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_CODECOMP, OnControlChanged)
- 	ON_BN_CLICKED(IDC_CHECK_CVSORTALPH, OnControlChanged)
- 	ON_BN_CLICKED(IDC_CHECK_HIGHLIGHTLINE, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_SYNTAXHIGHLIGHTING, OnControlChanged)
  	ON_BN_CLICKED(IDC_RADIO_ACKEY1, OnControlChanged)
--- 75,80 ----
***************
*** 113,117 ****
  	// Code Highlighting
  	m_bSyntaxHighlighting = pSyntaxFile->GetSyntaxHighlighting();
- 	m_bHighlightLine = pSyntaxFile->GetHighlightCurrentLine();
  	m_bBraceMatch = pSyntaxFile->GetBraceMatch();
  	
--- 101,104 ----
***************
*** 126,137 ****
  	m_bTrimTrailingSpaces = pSyntaxFile->GetTrimTrailingSpaces();
  
- 	// Class View
- 	m_bClassView = pSyntaxFile->GetClassView();
- 	m_bCVSorted = pSyntaxFile->GetSortClassView();
- 	m_ctrlSlider.SetRange( 1000, 5000 );
- 	m_ctrlSlider.SetPos( pSyntaxFile->GetParserDelay() );
- 	szParserDelay.Format( "%i ms", m_ctrlSlider.GetPos() );
- 	m_ctrlSliderEdit.SetWindowText( szParserDelay );
- 
  	UpdateData( FALSE );
  
--- 113,116 ----
***************
*** 156,164 ****
  		bChanged = true;
  	}
! 	if(	m_bHighlightLine != ( pSyntaxFile->GetHighlightCurrentLine() ? TRUE : FALSE ) )
! 	{
! 		pSyntaxFile->SetHighlightCurrentLine( m_bHighlightLine ? true : false );
! 		bChanged = true;
! 	}
  	if(	m_bBraceMatch != ( pSyntaxFile->GetBraceMatch() ? TRUE : FALSE ) )
  	{
--- 135,139 ----
  		bChanged = true;
  	}
! 
  	if(	m_bBraceMatch != ( pSyntaxFile->GetBraceMatch() ? TRUE : FALSE ) )
  	{
***************
*** 197,217 ****
  	}
  
- 	// Class View
- 	if( m_bClassView != ( pSyntaxFile->GetClassView() ? TRUE : FALSE ) )
- 	{
- 		pSyntaxFile->SetClassView( m_bClassView ? true : false );
- 		bChanged = true;
- 	}
- 	if( m_bCVSorted != ( pSyntaxFile->GetSortClassView() ? TRUE : FALSE ) )
- 	{
- 		pSyntaxFile->SetSortClassView( m_bCVSorted ? true : false );
- 		bChanged = true;
- 	}
- 	if( m_ctrlSlider.GetPos() != pSyntaxFile->GetParserDelay() )
- 	{
- 		pSyntaxFile->SetParserDelay( m_ctrlSlider.GetPos() );
- 		bChanged = true;
- 	}
- 
  	return bChanged;
  }
--- 172,175 ----
***************
*** 220,239 ****
  {
  	NotifyParentOfChange();
- 	BOOL bEnable = ((CButton*)GetDlgItem(IDC_CHECK_CLASSVIEW))->GetCheck() == 1;
- 	GetDlgItem(IDC_CHECK_CVSORTALPH)->EnableWindow(bEnable);
- 	GetDlgItem(IDC_SLIDER_CVPARSEDELAY)->EnableWindow(bEnable);
- 	GetDlgItem(IDC_STATIC_PARSERDELAY)->EnableWindow(bEnable);
- 	GetDlgItem(IDC_EDIT_CVPARSERDELAY)->EnableWindow(bEnable);
- }
- 
- void CCodingPref::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
- {
- 	if( &m_ctrlSlider == (CSliderCtrl*)pScrollBar )
- 	{
- 		CString szParserDelay;
- 		szParserDelay.Format( "%i ms", m_ctrlSlider.GetPos() );
- 		m_ctrlSliderEdit.SetWindowText( szParserDelay );
- 		NotifyParentOfChange();	
- 	}
- 	CSAPrefsSubDlg::OnHScroll(nSBCode, nPos, pScrollBar);
  }
--- 178,180 ----

Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** AnyEdit.rc	27 Sep 2004 10:12:15 -0000	1.102
--- AnyEdit.rc	27 Sep 2004 12:36:07 -0000	1.103
***************
*** 1465,1473 ****
      CONTROL         "Pressing Tab inserts Spaces",IDC_CHECK_TABSTOSPACES,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,146,126,9
-     GROUPBOX        "Right Edge",IDC_STATIC,147,118,137,42
-     LTEXT           "Right Edge Position",IDC_STATIC,156,134,72,12
-     CONTROL         "Enable Right Edge Warning",IDC_CHECK_RIGHTEDGE,"Button",
-                     BS_AUTOCHECKBOX | WS_TABSTOP,156,145,126,12
-     EDITTEXT        IDC_EDIT_RIGHTEDGE,232,130,38,12,ES_AUTOHSCROLL
      GROUPBOX        "Indent",IDC_STATIC,7,64,137,52
      LTEXT           "Indent Size",IDC_STATIC,14,76,35,11
--- 1465,1468 ----
***************
*** 1615,1652 ****
  FONT 8, "MS Sans Serif"
  BEGIN
!     GROUPBOX        "Code Highlighting",IDC_STATIC,7,7,123,52
      CONTROL         "Syntax &Highlighting",IDC_CHECK_SYNTAXHIGHLIGHTING,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,76,10
-     CONTROL         "Highlight Current &Line",IDC_CHECK_HIGHLIGHTLINE,"Button",
-                     BS_AUTOCHECKBOX | WS_TABSTOP,13,31,83,10
      CONTROL         "&Brace Matching",IDC_CHECK_BRACEMATCH,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,43,66,10
!     GROUPBOX        "Class View",IDC_STATIC,136,7,144,75
!     CONTROL         "&Class View Display",IDC_CHECK_CLASSVIEW,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,142,17,75,10
!     CONTROL         "Sort Class &View",IDC_CHECK_CVSORTALPH,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,142,30,65,10
!     LTEXT           "Parser &Delay",IDC_STATIC_PARSERDELAY,142,43,41,8
!     CONTROL         "Slider2",IDC_SLIDER_CVPARSEDELAY,"msctls_trackbar32",
!                     TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,144,
!                     55,128,12
!     EDITTEXT        IDC_EDIT_CVPARSERDELAY,188,68,28,12,ES_AUTOHSCROLL | 
!                     ES_READONLY | NOT WS_BORDER
!     GROUPBOX        "Auto Completion",IDC_STATIC,7,64,123,59,WS_GROUP
      CONTROL         "&Auto Completion",IDC_CHECK_AUTOCOMP,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,73,67,10
      CONTROL         "C&ode Completion",IDC_CHECK_CODECOMP,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,85,69,10
      CONTROL         "&Tab Key",IDC_RADIO_ACKEY1,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,13,96,43,10
      CONTROL         "Space Bar &Key",IDC_RADIO_ACKEY2,"Button",
!                     BS_AUTORADIOBUTTON,13,107,63,10
!     GROUPBOX        "OnSave",IDC_STATIC,7,128,123,48
      CONTROL         "Ensure Final New Line",IDC_CHECK_ENSUREFINALNEWLINE,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,139,87,10
      CONTROL         "Convert Tabs To Spaces",IDC_CHECK_CONVERTTABSTOSPACES,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,151,95,10
      CONTROL         "Trim Trailing Spaces",IDC_CHECK_TRIMTRAILINGSPACES,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,163,80,10
  END
  
--- 1610,1634 ----
  FONT 8, "MS Sans Serif"
  BEGIN
!     GROUPBOX        "Code Highlighting",IDC_STATIC,7,7,123,40
      CONTROL         "Syntax &Highlighting",IDC_CHECK_SYNTAXHIGHLIGHTING,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,76,10
      CONTROL         "&Brace Matching",IDC_CHECK_BRACEMATCH,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,31,66,10
!     GROUPBOX        "Auto Completion",IDC_STATIC,144,7,123,59,WS_GROUP
      CONTROL         "&Auto Completion",IDC_CHECK_AUTOCOMP,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,150,16,67,10
      CONTROL         "C&ode Completion",IDC_CHECK_CODECOMP,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,150,28,69,10
      CONTROL         "&Tab Key",IDC_RADIO_ACKEY1,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,150,39,43,10
      CONTROL         "Space Bar &Key",IDC_RADIO_ACKEY2,"Button",
!                     BS_AUTORADIOBUTTON,150,50,63,10
!     GROUPBOX        "OnSave",IDC_STATIC,7,52,123,48
      CONTROL         "Ensure Final New Line",IDC_CHECK_ENSUREFINALNEWLINE,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,63,87,10
      CONTROL         "Convert Tabs To Spaces",IDC_CHECK_CONVERTTABSTOSPACES,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,75,95,10
      CONTROL         "Trim Trailing Spaces",IDC_CHECK_TRIMTRAILINGSPACES,
!                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,87,80,10
  END

[Anyedit-cvs]AnyEditv2 SyntaxFile.cpp,1.22,1.23 SyntaxFile.h,1.15,1.16

From: Leon W. <moo...@us...> - 2004-09-27 12:34:10

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22845

Modified Files:
	SyntaxFile.cpp SyntaxFile.h 
Log Message:
Removed settings that have been moved to the Configfile.

Index: SyntaxFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** SyntaxFile.cpp	26 Sep 2004 17:30:28 -0000	1.22
--- SyntaxFile.cpp	27 Sep 2004 12:34:00 -0000	1.23
***************
*** 370,374 ****
  }
  
- 
  // Get the tab/indentation width
  int CSyntaxFile::GetTabWidth()
--- 370,373 ----
***************
*** 395,423 ****
  }
  
- // Returns if the RightEdge is on.
- bool CSyntaxFile::GetRightEdge()
- {
- 	return GetBoolFromXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE );
- }
- 
- // Set the RightEdge to true or false.
- bool CSyntaxFile::SetRightEdge( bool bRightEdge )
- {
- 	return SetBoolToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGE, bRightEdge );
- }
- 
- // Gets the RightEdgeColumn
- int CSyntaxFile::GetRightEdgeColumn()
- {
- 	return GetIntFromXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGECOLUMN );
- }
- 
- 
- // Sets the RightEdgeColumn to iREColumn.
- bool CSyntaxFile::SetRightEdgeColumn( int iREColumn )
- {
- 	return SetIntToXMLFile( TAG_VIEW, TAG_VIEW_RIGHTEDGECOLUMN, iREColumn );
- }
- 
  // Returns if SyntaxHighlighting is on.
  bool CSyntaxFile::GetSyntaxHighlighting()
--- 394,397 ----
***************
*** 432,447 ****
  }
  
- // Returns if the CurrentLine must be highlighted.
- bool CSyntaxFile::GetHighlightCurrentLine()
- {
- 	return GetBoolFromXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE );
- }
- 
- // Sets CurrentLine Highlighting.
- bool CSyntaxFile::SetHighlightCurrentLine( bool bHighlightCurrentLine )
- {
- 	return SetBoolToXMLFile( TAG_CODE, TAG_CODE_HIGHLIGHTCURRENTLINE, bHighlightCurrentLine );
- }
- 
  // Get Brace Matching
  bool CSyntaxFile::GetBraceMatch()
--- 406,409 ----
***************
*** 528,579 ****
  }
  
- // Is the Class View enabled?
- bool CSyntaxFile::GetClassView()
- {
- 	return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON );
- }
- 
- // Enable or Disable the Class View.
- bool CSyntaxFile::SetClassView( bool bClassView )
- {
- 	return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_CLASSVIEWON, bClassView );
- }
- 
- // Get the language to be used in the class view
- CString CSyntaxFile::GetClassViewLanguage()
- {
- 	return GetStringFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_LANGUAGE );
- }
- 
- // Set the language to be used in the class view
- bool CSyntaxFile::SetClassViewLanguage( const CString& szLanguage )
- {
- 	return SetStringToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_LANGUAGE, szLanguage );
- }
- 
- // Returns if the Class View should be sorted.
- bool CSyntaxFile::GetSortClassView()
- {
- 	return GetBoolFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT );
- }
- 
- // Set if the Class View should be sorted.
- bool CSyntaxFile::SetSortClassView( bool bSortClassView )
- {
- 	return SetBoolToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_SORT, bSortClassView );
- }
- 
- // Returns the Class View Parser Delay time.
- int CSyntaxFile::GetParserDelay()
- {
- 	return GetIntFromXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_PARSEDELAY );
- }
- 
- // Sets the Class View Parser Delay time.
- bool CSyntaxFile::SetParserDelay( int iParserDelay )
- {
- 	return SetIntToXMLFile( TAG_CLASSVIEW, TAG_CLASSVIEW_PARSEDELAY, iParserDelay );
- }
- 
  // Returns if the Indent is on.
  bool CSyntaxFile::GetIndent()
--- 490,493 ----
***************
*** 962,965 ****
--- 876,891 ----
  }
  
+ // Get the language to be used in the class view
+ CString CSyntaxFile::GetClassViewLanguage()
+ {
+ 	return GetStringFromXMLFile( TAG_LANGUAGEDEFINES, TAG_LANGDEFS_CLASSVIEWLANGUAGE );
+ }
+ 
+ // Set the language to be used in the class view
+ bool CSyntaxFile::SetClassViewLanguage( const CString& szLanguage )
+ {
+ 	return SetStringToXMLFile( TAG_LANGUAGEDEFINES, TAG_LANGDEFS_CLASSVIEWLANGUAGE, szLanguage );
+ }
+ 
  // Get the Language Braces
  CString CSyntaxFile::GetBraces()

Index: SyntaxFile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SyntaxFile.h	26 Sep 2004 17:30:28 -0000	1.15
--- SyntaxFile.h	27 Sep 2004 12:34:00 -0000	1.16
***************
*** 26,30 ****
  #define TAG_AUTOCOMP					"AutoComp"
  #define TAG_ONSAVE						"OnSave"
- #define TAG_CLASSVIEW					"ClassView"
  #define TAG_INDENT						"Indent"
  #define TAG_MARGINS						"Margins"
--- 26,29 ----
***************
*** 51,60 ****
  #define TAG_VIEW_TABWIDTH				"TabWidth"
  #define TAG_VIEW_TABSTOSPACES			"TabsToSpaces"
- #define TAG_VIEW_RIGHTEDGE				"RightEdge"
- #define TAG_VIEW_RIGHTEDGECOLUMN		"RightEdgeColumn"
  
  // Code Highlighting sub tags
  #define TAG_CODE_SYNTAXHIGHLIGHTING		"SyntaxHighlighting"
- #define TAG_CODE_HIGHLIGHTCURRENTLINE	"HighlightCurrentLine"
  #define TAG_CODE_BRACEMATCHING			"BraceMatching"
  
--- 50,56 ----
***************
*** 69,78 ****
  #define TAG_ONSAVE_TRIMTRAILINGSPACES	"TrimTrailingSpaces"
  
- // Class View sub tags
- #define TAG_CLASSVIEW_LANGUAGE			"Language"
- #define TAG_CLASSVIEW_CLASSVIEWON		"ClassViewOn"
- #define TAG_CLASSVIEW_SORT				"SortClasView"
- #define	TAG_CLASSVIEW_PARSEDELAY		"ParserDelay"
- 
  // Indentation sub tags
  #define TAG_INDENT_INDENT				"Indent"
--- 65,68 ----
***************
*** 115,118 ****
--- 105,109 ----
  
  // Language Defines tags
+ #define TAG_LANGDEFS_CLASSVIEWLANGUAGE	"ClassViewLanguage"
  #define TAG_LANGDEFS_BRACES				"Braces"
  #define TAG_LANGDEFS_WORDCHARS			"WordCharacters"
***************
*** 212,227 ****
  	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();
--- 203,206 ----
***************
*** 230,239 ****
  	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();
--- 209,212 ----
***************
*** 278,305 ****
  	bool SetTrimTrailingSpaces( bool bTrim );
  
- 	/// Is the Class View enabled?
- 	bool GetClassView();
- 
- 	/// Enable or Disable the Class View.
- 	bool SetClassView( bool bClassView );
- 
- 	/// Get the language to be used in the class view
- 	CString GetClassViewLanguage();
- 
- 	/// Set the language to be used in the class view
- 	bool SetClassViewLanguage( const CString& szLanguage );
- 
- 	/// 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();
--- 251,254 ----
***************
*** 398,401 ****
--- 347,356 ----
  	bool SetStyleColorBackground( int iStyle, int iColor );
  
+ 	/// Get the language to be used in the class view
+ 	CString GetClassViewLanguage();
+ 
+ 	/// Set the language to be used in the class view
+ 	bool SetClassViewLanguage( const CString& szLanguage );
+ 
  	/// Get the Language Braces
  	CString GetBraces();

[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.44,1.45

From: Leon W. <moo...@us...> - 2004-09-27 12:22:34

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20261

Modified Files:
	AnyEditDoc.cpp 
Log Message:
ClassView settings are read from the ConfigFile in CheckLastAccessTime.

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** AnyEditDoc.cpp	26 Sep 2004 13:34:12 -0000	1.44
--- AnyEditDoc.cpp	27 Sep 2004 12:22:23 -0000	1.45
***************
*** 614,618 ****
  		return FALSE;
  
! 	CSyntaxFile* pFile = theApp.GetFileTypeManager()->GetSyntaxFile(m_iLanguage);
  	if (pFile == NULL)
  		return FALSE;
--- 614,618 ----
  		return FALSE;
  
! 	CConfigFile* pFile = theApp.GetConfigFile();
  	if (pFile == NULL)
  		return FALSE;

[Anyedit-cvs]AnyEditv2 AnyEdit.rc,1.101,1.102 MainColorFontPref.cpp,1.3,1.4 MainColorFontPref.h,1.2,1.3 resource.h,1.68,1.69

From: Leon W. <moo...@us...> - 2004-09-27 10:12:27

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14608

Modified Files:
	AnyEdit.rc MainColorFontPref.cpp MainColorFontPref.h 
	resource.h 
Log Message:
Caret Color setting added to Preferences.

Index: MainColorFontPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainColorFontPref.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MainColorFontPref.cpp	20 Sep 2004 13:18:04 -0000	1.3
--- MainColorFontPref.cpp	27 Sep 2004 10:12:15 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  	CDialog::DoDataExchange(pDX);
  	//{{AFX_DATA_MAP(CMainColorFontPref)
+ 	DDX_Control(pDX, IDC_PREFMCF_CARETCOLOR, m_colbCaretColor);
  	DDX_Control(pDX, IDC_CHECK_PREFMCF_SELBACKCOLOR, m_cbSelBackColor);
  	DDX_Control(pDX, IDC_CHECK_PREFMCF_SELFORECOLOR, m_cbSelForeColor);
***************
*** 54,57 ****
--- 55,59 ----
  	ON_BN_CLICKED(IDC_CHECK_PREFMCF_SELFORECOLOR, OnClickCheckSelForColor)
  	ON_BN_CLICKED(IDC_CHECK_PREFMCF_SELBACKCOLOR, OnClickCheckSelBackColor)
+ 	ON_BN_CLICKED(IDC_PREFMCF_CARETCOLOR, OnClickCaretColor)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 104,107 ****
--- 106,110 ----
  
  	// Set the controls to the configured values.
+ 	m_colbCaretColor.SetColor( pConfigFile->GetCaretColor() );
  	m_cbSelForeColor.SetCheck( pConfigFile->UseSelectionForegroundColor() ? TRUE : FALSE );
  	if( !pConfigFile->UseSelectionForegroundColor() ) m_colbSelTextFore.EnableWindow( FALSE );
***************
*** 129,133 ****
  BOOL CMainColorFontPref::SaveChanges()
  {
- 	BOOL bChanged;
  	CString szTemp;
  	CConfigFile* pConfigFile = (CConfigFile*)m_pDataFile;
--- 132,135 ----
***************
*** 135,144 ****
  	if( NULL == GetSafeHwnd() ) return FALSE;
  	
! 	bChanged = FALSE;
  
  	if( pConfigFile->UseSelectionForegroundColor() != ( m_cbSelForeColor.GetCheck() ? true : false ) )
  	{
  		pConfigFile->SetUseSelectionForegroundColor( m_cbSelForeColor.GetCheck() ? true : false );
- 		bChanged = TRUE;
  	}
  
--- 137,148 ----
  	if( NULL == GetSafeHwnd() ) return FALSE;
  	
! 	if( pConfigFile->GetCaretColor() != m_colbCaretColor.GetColor() )
! 	{
! 		pConfigFile->SetCaretColor( m_colbCaretColor.GetColor() );
! 	}
  
  	if( pConfigFile->UseSelectionForegroundColor() != ( m_cbSelForeColor.GetCheck() ? true : false ) )
  	{
  		pConfigFile->SetUseSelectionForegroundColor( m_cbSelForeColor.GetCheck() ? true : false );
  	}
  
***************
*** 146,150 ****
  	{
  		pConfigFile->SetSelectionForegroundColor( m_colbSelTextFore.GetColor() );
- 		bChanged = TRUE;
  	}
  
--- 150,153 ----
***************
*** 152,156 ****
  	{
  		pConfigFile->SetUseSelectionBackgroundColor( m_cbSelBackColor.GetCheck() ? true : false );
- 		bChanged = TRUE;
  	}
  
--- 155,158 ----
***************
*** 158,162 ****
  	{
  		pConfigFile->SetSelectionBackgroundColor( m_colbSelTextBack.GetColor() );
- 		bChanged = TRUE;
  	}
  
--- 160,163 ----
***************
*** 164,168 ****
  	{
  		pConfigFile->SetHighlightCurrentLine( m_cbHighlightLine.GetCheck() ? true : false );
- 		bChanged = TRUE;
  	}
  
--- 165,168 ----
***************
*** 170,174 ****
  	{
  		pConfigFile->SetHighlightCurrentLineColor( m_colbHighlightLineColor.GetColor() );
- 		bChanged = TRUE;
  	}
  
--- 170,173 ----
***************
*** 176,180 ****
  	{
  		pConfigFile->SetRightEdge( m_cbRightEdge.GetCheck() ? true : false );
- 		bChanged = TRUE;
  	}
  
--- 175,178 ----
***************
*** 182,186 ****
  	{
  		pConfigFile->SetRightEdgeColor( m_colbRightEdgeColor.GetColor() );
- 		bChanged = TRUE;
  	}
  
--- 180,183 ----
***************
*** 189,193 ****
  	{
  		pConfigFile->SetRightEdgeColumn( atoi( szTemp ) );
- 		bChanged = TRUE;
  	}
  
--- 186,189 ----
***************
*** 196,200 ****
  	{
  		pConfigFile->SetOutputBarFontName( szTemp );
- 		bChanged = TRUE;
  	}
  
--- 192,195 ----
***************
*** 203,210 ****
  	{
  		pConfigFile->SetOutputBarFontSize( atoi( szTemp ) );
- 		bChanged = TRUE;
  	}
  
! 	return bChanged;
  }
  
--- 198,204 ----
  	{
  		pConfigFile->SetOutputBarFontSize( atoi( szTemp ) );
  	}
  
! 	return TRUE;
  }
  
***************
*** 279,280 ****
--- 273,279 ----
  	NotifyParentOfChange();	
  }
+ 
+ void CMainColorFontPref::OnClickCaretColor() 
+ {
+ 	NotifyParentOfChange();		
+ }

Index: MainColorFontPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/MainColorFontPref.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MainColorFontPref.h	18 Sep 2004 15:12:27 -0000	1.2
--- MainColorFontPref.h	27 Sep 2004 10:12:15 -0000	1.3
***************
*** 24,27 ****
--- 24,28 ----
  	//{{AFX_DATA(CMainColorFontPref)
  	enum { IDD = IDD_PREF_MAINCOLORFONT };
+ 	CColorButton	m_colbCaretColor;
  	CButton	m_cbSelBackColor;
  	CButton	m_cbSelForeColor;
***************
*** 59,62 ****
--- 60,64 ----
  	afx_msg void OnClickCheckSelForColor();
  	afx_msg void OnClickCheckSelBackColor();
+ 	afx_msg void OnClickCaretColor();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()

Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** resource.h	26 Sep 2004 17:33:32 -0000	1.68
--- resource.h	27 Sep 2004 10:12:15 -0000	1.69
***************
*** 365,368 ****
--- 365,369 ----
  #define IDC_CHECK_CONVERTTABSTOSPACES   1250
  #define IDC_CHECK_TRIMTRAILINGSPACES    1251
+ #define IDC_PREFMCF_CARETCOLOR          1252
  #define ID_AE_REFRESH_STARTUPPAGE       1340
  #define ID_EDIT_FIRST                   32768
***************
*** 647,651 ****
  #define _APS_NEXT_RESOURCE_VALUE        110
  #define _APS_NEXT_COMMAND_VALUE         33042
! #define _APS_NEXT_CONTROL_VALUE         1252
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif
--- 648,652 ----
  #define _APS_NEXT_RESOURCE_VALUE        110
  #define _APS_NEXT_COMMAND_VALUE         33042
! #define _APS_NEXT_CONTROL_VALUE         1253
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif

Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** AnyEdit.rc	26 Sep 2004 17:33:32 -0000	1.101
--- AnyEdit.rc	27 Sep 2004 10:12:15 -0000	1.102
***************
*** 1442,1452 ****
      CONTROL         "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,167,119,86,10
- 
- 
- 
- 
- 
- 
- 
  END
  
--- 1442,1445 ----
***************
*** 2081,2107 ****
  FONT 8, "MS Sans Serif"
  BEGIN
!     LTEXT           "Right Edge Position",IDC_STATIC,13,87,66,12
      CONTROL         "Enable Right Edge Warning",IDC_CHECK_RIGHTEDGE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,70,126,12
!     EDITTEXT        IDC_EDIT_RIGHTEDGE,81,87,38,12,ES_AUTOHSCROLL
      CONTROL         "Highlight Current &Line",IDC_CHECK_HIGHLIGHTLINE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,53,83,10
!     PUSHBUTTON      "Button1",IDC_PREFMCF_SELFORECOLOR,142,19,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_SELBACKCOLOR,142,36,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_HIGHLIGHTLINECOLOR,142,53,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_RIGHTEDGECOLOR,142,70,127,13
!     GROUPBOX        "Color",IDC_STATIC,7,7,276,99
!     GROUPBOX        "Font",IDC_STATIC,7,111,276,32
!     COMBOBOX        IDC_COMBO_OUTPUTBAR_FONTNAME,81,122,127,56,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     LTEXT           "OutputBar Font",IDC_STATIC,13,123,49,8
!     COMBOBOX        IDC_COMBO_OUTPUTBAR_FONTSIZE,211,122,35,56,CBS_DROPDOWN | 
                      WS_VSCROLL | WS_TABSTOP
      CONTROL         "Selected Text Foreground Color",
                      IDC_CHECK_PREFMCF_SELFORECOLOR,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,13,19,116,10
      CONTROL         "Selected Text Background Color",
                      IDC_CHECK_PREFMCF_SELBACKCOLOR,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,13,36,119,10
  END
  
--- 2074,2102 ----
  FONT 8, "MS Sans Serif"
  BEGIN
!     LTEXT           "Right Edge Position",IDC_STATIC,13,106,66,12
      CONTROL         "Enable Right Edge Warning",IDC_CHECK_RIGHTEDGE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,89,126,12
!     EDITTEXT        IDC_EDIT_RIGHTEDGE,81,106,38,12,ES_AUTOHSCROLL
      CONTROL         "Highlight Current &Line",IDC_CHECK_HIGHLIGHTLINE,"Button",
!                     BS_AUTOCHECKBOX | WS_TABSTOP,13,72,83,10
!     PUSHBUTTON      "Button1",IDC_PREFMCF_SELFORECOLOR,142,38,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_SELBACKCOLOR,142,55,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_HIGHLIGHTLINECOLOR,142,72,127,13
!     PUSHBUTTON      "Button1",IDC_PREFMCF_RIGHTEDGECOLOR,142,89,127,13
!     GROUPBOX        "Color",IDC_STATIC,7,7,276,118
!     GROUPBOX        "Font",IDC_STATIC,7,130,276,32
!     COMBOBOX        IDC_COMBO_OUTPUTBAR_FONTNAME,81,141,127,56,
                      CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     LTEXT           "OutputBar Font",IDC_STATIC,13,142,49,8
!     COMBOBOX        IDC_COMBO_OUTPUTBAR_FONTSIZE,211,141,35,56,CBS_DROPDOWN | 
                      WS_VSCROLL | WS_TABSTOP
      CONTROL         "Selected Text Foreground Color",
                      IDC_CHECK_PREFMCF_SELFORECOLOR,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,13,38,116,10
      CONTROL         "Selected Text Background Color",
                      IDC_CHECK_PREFMCF_SELBACKCOLOR,"Button",BS_AUTOCHECKBOX | 
!                     WS_TABSTOP,13,55,119,10
!     LTEXT           "Caret Color",IDC_STATIC,25,21,36,8
!     PUSHBUTTON      "Button1",IDC_PREFMCF_CARETCOLOR,142,21,127,13
  END

[Anyedit-cvs]AnyEditv2 FileTypeManager.cpp,1.23,1.24

From: Leon W. <moo...@us...> - 2004-09-27 10:10:48

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14361

Modified Files:
	FileTypeManager.cpp 
Log Message:
Caret Color is read from config file.

Index: FileTypeManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FileTypeManager.cpp	26 Sep 2004 17:32:31 -0000	1.23
--- FileTypeManager.cpp	27 Sep 2004 10:10:39 -0000	1.24
***************
*** 250,253 ****
--- 250,255 ----
      pScintilla->UsePopUp( false );
  
+ 	pScintilla->SetCaretFore( pConfigFile->GetCaretColor() );
+ 
      pScintilla->SetSelFore( pConfigFile->UseSelectionForegroundColor(), pConfigFile->GetSelectionForegroundColor() );
      pScintilla->SetSelBack( pConfigFile->UseSelectionBackgroundColor(), pConfigFile->GetSelectionBackgroundColor() );

[Anyedit-cvs]AnyEditBin/Config/Default AnyEdit.cfg,1.17,1.18

From: Leon W. <moo...@us...> - 2004-09-27 10:09:58

Update of /cvsroot/anyedit/AnyEditBin/Config/Default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14107/Config/Default

Modified Files:
	AnyEdit.cfg 
Log Message:
Caret Color added to config file.

Index: AnyEdit.cfg
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/AnyEdit.cfg,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AnyEdit.cfg	26 Sep 2004 16:46:55 -0000	1.17
--- AnyEdit.cfg	27 Sep 2004 10:09:48 -0000	1.18
***************
*** 15,18 ****
--- 15,19 ----
      </General>
      <Editor>
+ 	<CaretColor>0</CaretColor>
  	<SelectionForeColor use="1">16777215</SelectionForeColor>
  	<SelectionBackColor use="1">12415347</SelectionBackColor>

[Anyedit-cvs]AnyEditv2 ConfigFile.cpp,1.17,1.18 ConfigFile.h,1.16,1.17

From: Leon W. <moo...@us...> - 2004-09-27 10:09:22

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13875

Modified Files:
	ConfigFile.cpp ConfigFile.h 
Log Message:
Caret Color added to config file.

Index: ConfigFile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ConfigFile.h	21 Sep 2004 08:21:47 -0000	1.16
--- ConfigFile.h	27 Sep 2004 10:09:11 -0000	1.17
***************
*** 55,58 ****
--- 55,59 ----
  
  // Editor tags
+ #define TAG_EDITOR_CARETCOLOR			"CaretColor"
  #define TAG_EDITOR_SELFORECOLOR			"SelectionForeColor"
  #define TAG_EDITOR_SELBACKCOLOR			"SelectionBackColor"
***************
*** 221,224 ****
--- 222,231 ----
  	bool RemoveLanguage( int iNumber );
  
+ 	/// Get the color of the caret/cursor.
+ 	COLORREF GetCaretColor();
+ 
+ 	/// Set the color ot the caret/cursor.
+ 	bool SetCaretColor( COLORREF clrCaret );
+ 
  	/// Use selection foreground color?
  	bool UseSelectionForegroundColor();

Index: ConfigFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ConfigFile.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ConfigFile.cpp	21 Sep 2004 08:21:47 -0000	1.17
--- ConfigFile.cpp	27 Sep 2004 10:09:11 -0000	1.18
***************
*** 416,419 ****
--- 416,431 ----
  }
  
+ /// Get the color of the caret/cursor.
+ COLORREF CConfigFile::GetCaretColor()
+ {
+ 	return GetIntFromXMLFile( TAG_EDITOR, TAG_EDITOR_CARETCOLOR );
+ }
+ 
+ /// Set the color ot the caret/cursor.
+ bool CConfigFile::SetCaretColor( COLORREF clrCaret )
+ {
+ 	return SetIntToXMLFile( TAG_EDITOR, TAG_EDITOR_CARETCOLOR, clrCaret );
+ }
+ 
  // Use selection foreground color?
  bool CConfigFile::UseSelectionForegroundColor()

[Anyedit-cvs]AnyEditv2 AnyEdit.rc,1.100,1.101 CodingPref.cpp,1.11,1.12 CodingPref.h,1.6,1.7 resource.h,1.67,1.68

From: Leon W. <moo...@us...> - 2004-09-26 17:34:01

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11255

Modified Files:
	AnyEdit.rc CodingPref.cpp CodingPref.h resource.h 
Log Message:
Added new On Save options to the Language Code Dialog:
- Ensure Final New Line
- Convert Spaces To Tab
- Trim Trailing Spaces

Index: CodingPref.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CodingPref.cpp	10 Jul 2004 19:05:42 -0000	1.11
--- CodingPref.cpp	26 Sep 2004 17:33:32 -0000	1.12
***************
*** 52,55 ****
--- 52,58 ----
  	m_bSyntaxHighlighting = FALSE;
  	m_iAutoCompKey = -1;
+ 	m_bConvertTabsToSpaces = FALSE;
+ 	m_bEnsureFinalNewLine = FALSE;
+ 	m_bTrimTrailingSpaces = FALSE;
  	//}}AFX_DATA_INIT
  }
***************
*** 70,73 ****
--- 73,79 ----
  	DDX_Check(pDX, IDC_CHECK_SYNTAXHIGHLIGHTING, m_bSyntaxHighlighting);
  	DDX_Radio(pDX, IDC_RADIO_ACKEY1, m_iAutoCompKey);
+ 	DDX_Check(pDX, IDC_CHECK_CONVERTTABSTOSPACES, m_bConvertTabsToSpaces);
+ 	DDX_Check(pDX, IDC_CHECK_ENSUREFINALNEWLINE, m_bEnsureFinalNewLine);
+ 	DDX_Check(pDX, IDC_CHECK_TRIMTRAILINGSPACES, m_bTrimTrailingSpaces);
  	//}}AFX_DATA_MAP
  }
***************
*** 77,80 ****
--- 83,87 ----
  //{{AFX_MSG_MAP(CCodingPref)
  	ON_BN_CLICKED(IDC_CHECK_AUTOCOMP, OnControlChanged)
+ 	ON_WM_HSCROLL()
  	ON_BN_CLICKED(IDC_CHECK_BRACEMATCH, OnControlChanged)
  	ON_BN_CLICKED(IDC_CHECK_CLASSVIEW, OnControlChanged)
***************
*** 85,89 ****
  	ON_BN_CLICKED(IDC_RADIO_ACKEY1, OnControlChanged)
  	ON_BN_CLICKED(IDC_RADIO_ACKEY2, OnControlChanged)
! 	ON_WM_HSCROLL()
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
--- 92,98 ----
  	ON_BN_CLICKED(IDC_RADIO_ACKEY1, OnControlChanged)
  	ON_BN_CLICKED(IDC_RADIO_ACKEY2, OnControlChanged)
! 	ON_BN_CLICKED(IDC_CHECK_ENSUREFINALNEWLINE, OnControlChanged)
! 	ON_BN_CLICKED(IDC_CHECK_TRIMTRAILINGSPACES, OnControlChanged)
! 	ON_BN_CLICKED(IDC_CHECK_CONVERTTABSTOSPACES, OnControlChanged)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 101,112 ****
--- 110,129 ----
  
  	// Read the values from the syntax file
+ 	
  	// Code Highlighting
  	m_bSyntaxHighlighting = pSyntaxFile->GetSyntaxHighlighting();
  	m_bHighlightLine = pSyntaxFile->GetHighlightCurrentLine();
  	m_bBraceMatch = pSyntaxFile->GetBraceMatch();
+ 	
  	// Auto Completion
  	m_bAutoComp = pSyntaxFile->GetAutoCompletion();
  	m_bCodeComp = pSyntaxFile->GetCodeCompletion();
  	m_iAutoCompKey = pSyntaxFile->GetACKey();
+ 	
+ 	// OnSave
+ 	m_bEnsureFinalNewLine = pSyntaxFile->GetEnsureFinalNewLine();
+ 	m_bConvertTabsToSpaces = pSyntaxFile->GetConvertTabsToSpaces();
+ 	m_bTrimTrailingSpaces = pSyntaxFile->GetTrimTrailingSpaces();
+ 
  	// Class View
  	m_bClassView = pSyntaxFile->GetClassView();
***************
*** 165,168 ****
--- 182,200 ----
  		bChanged = true;
  	}
+ 
+ 	// On Save
+ 	if( m_bEnsureFinalNewLine != ( pSyntaxFile->GetEnsureFinalNewLine() ? TRUE : FALSE ) )
+ 	{
+ 		pSyntaxFile->SetEnsureFinalNewLine( m_bEnsureFinalNewLine ? true : false );
+ 	}
+ 	if( m_bConvertTabsToSpaces != ( pSyntaxFile->GetConvertTabsToSpaces() ? TRUE : FALSE ) )
+ 	{
+ 		pSyntaxFile->SetConvertTabsToSpaces( m_bConvertTabsToSpaces ? true : false );
+ 	}
+ 	if( m_bTrimTrailingSpaces != ( pSyntaxFile->GetTrimTrailingSpaces() ? TRUE : FALSE ) )
+ 	{
+ 		pSyntaxFile->SetTrimTrailingSpaces( m_bTrimTrailingSpaces ? true : false );
+ 	}
+ 
  	// Class View
  	if( m_bClassView != ( pSyntaxFile->GetClassView() ? TRUE : FALSE ) )

Index: CodingPref.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/CodingPref.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CodingPref.h	3 Aug 2004 16:44:26 -0000	1.6
--- CodingPref.h	26 Sep 2004 17:33:32 -0000	1.7
***************
*** 34,37 ****
--- 34,40 ----
  	BOOL	m_bSyntaxHighlighting;
  	int		m_iAutoCompKey;
+ 	BOOL	m_bConvertTabsToSpaces;
+ 	BOOL	m_bEnsureFinalNewLine;
+ 	BOOL	m_bTrimTrailingSpaces;
  	//}}AFX_DATA
  

Index: resource.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** resource.h	26 Sep 2004 13:32:30 -0000	1.67
--- resource.h	26 Sep 2004 17:33:32 -0000	1.68
***************
*** 362,365 ****
--- 362,368 ----
  #define IDNONE                          1247
  #define IDC_CHECK_SYNCFILETAB           1248
+ #define IDC_CHECK_ENSUREFINALNEWLINE    1249
+ #define IDC_CHECK_CONVERTTABSTOSPACES   1250
+ #define IDC_CHECK_TRIMTRAILINGSPACES    1251
  #define ID_AE_REFRESH_STARTUPPAGE       1340
  #define ID_EDIT_FIRST                   32768
***************
*** 644,648 ****
  #define _APS_NEXT_RESOURCE_VALUE        110
  #define _APS_NEXT_COMMAND_VALUE         33042
! #define _APS_NEXT_CONTROL_VALUE         1249
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif
--- 647,651 ----
  #define _APS_NEXT_RESOURCE_VALUE        110
  #define _APS_NEXT_COMMAND_VALUE         33042
! #define _APS_NEXT_CONTROL_VALUE         1252
  #define _APS_NEXT_SYMED_VALUE           1341
  #endif

Index: AnyEdit.rc
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** AnyEdit.rc	26 Sep 2004 13:32:30 -0000	1.100
--- AnyEdit.rc	26 Sep 2004 17:33:32 -0000	1.101
***************
*** 1442,1445 ****
--- 1442,1452 ----
      CONTROL         "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button",
                      BS_AUTOCHECKBOX | WS_TABSTOP,167,119,86,10
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  END
  
***************
*** 1642,1645 ****
--- 1649,1659 ----
      CONTROL         "Space Bar &Key",IDC_RADIO_ACKEY2,"Button",
                      BS_AUTORADIOBUTTON,13,107,63,10
+     GROUPBOX        "OnSave",IDC_STATIC,7,128,123,48
+     CONTROL         "Ensure Final New Line",IDC_CHECK_ENSUREFINALNEWLINE,
+                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,139,87,10
+     CONTROL         "Convert Tabs To Spaces",IDC_CHECK_CONVERTTABSTOSPACES,
+                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,151,95,10
+     CONTROL         "Trim Trailing Spaces",IDC_CHECK_TRIMTRAILINGSPACES,
+                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,163,80,10
  END

[Anyedit-cvs]AnyEditv2 FileTypeManager.cpp,1.22,1.23

From: Leon W. <moo...@us...> - 2004-09-26 17:32:41

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10902

Modified Files:
	FileTypeManager.cpp 
Log Message:
Changed the On Save options to be read from the Syntax File.

Index: FileTypeManager.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/FileTypeManager.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FileTypeManager.cpp	23 Sep 2004 21:25:41 -0000	1.22
--- FileTypeManager.cpp	26 Sep 2004 17:32:31 -0000	1.23
***************
*** 421,432 ****
      pScintilla->SetUseTabs( pSyntaxFile->GetTabsToSpaces() ? false : true );
  
! 	/** \todo
  	pScintilla->SetEnsureFinalNewLine( pSyntaxFile->GetEnsureFinalNewLine() );
! 	pScintilla->SetSaveConvertTabToSpaces( pSyntaxFile->GetSaveConvertTabToSpaces() );
! 	pScintilla->SetSaveTrimTrailingSpaces( pSyntaxFile->GetSaveTrimTrailingSpaces() );
! 	*/
! 	pScintilla->SetEnsureFinalNewLine( true );
! 	pScintilla->SetSaveConvertTabToSpaces( true );
! 	pScintilla->SetSaveTrimTrailingSpaces( true );
  
      // Set margins.
--- 421,428 ----
      pScintilla->SetUseTabs( pSyntaxFile->GetTabsToSpaces() ? false : true );
  
! 	// Set the on save options
  	pScintilla->SetEnsureFinalNewLine( pSyntaxFile->GetEnsureFinalNewLine() );
! 	pScintilla->SetSaveConvertTabToSpaces( pSyntaxFile->GetConvertTabsToSpaces() );
! 	pScintilla->SetSaveTrimTrailingSpaces( pSyntaxFile->GetTrimTrailingSpaces() );
  
      // Set margins.

[Anyedit-cvs]AnyEditBin/Config/Default/Syntax asm.syn,1.2,1.3 cpp.syn,1.9,1.10 css.syn,1.7,1.8 default.syn,1.7,1.8 html.syn,1.7,1.8 java.syn,1.10,1.11 javascript.syn,1.8,1.9 pascal.syn,1.6,1.7 perl.syn,1.8,1.9 python.syn,1.8,1.9 sql.syn,1.2,1.3 xml.syn,1.6,1.7

From: Leon W. <moo...@us...> - 2004-09-26 17:31:47

Update of /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10374/Config/Default/Syntax

Modified Files:
	asm.syn cpp.syn css.syn default.syn html.syn java.syn 
	javascript.syn pascal.syn perl.syn python.syn sql.syn xml.syn 
Log Message:
Added new On Save options:
- Ensure Final New Line
- Convert Spaces To Tab
- Trim Trailing Spaces

Index: default.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/default.syn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** default.syn	7 Sep 2004 08:03:45 -0000	1.7
--- default.syn	26 Sep 2004 17:31:34 -0000	1.8
***************
*** 29,32 ****
--- 29,37 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>0</ClassViewOn>

Index: cpp.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/cpp.syn,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cpp.syn	7 Sep 2004 08:03:45 -0000	1.9
--- cpp.syn	26 Sep 2004 17:31:34 -0000	1.10
***************
*** 39,42 ****
--- 39,47 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>1</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>1</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>1</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: sql.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/sql.syn,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sql.syn	7 Sep 2004 08:03:45 -0000	1.2
--- sql.syn	26 Sep 2004 17:31:34 -0000	1.3
***************
*** 35,38 ****
--- 35,43 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: pascal.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/pascal.syn,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pascal.syn	7 Sep 2004 08:03:45 -0000	1.6
--- pascal.syn	26 Sep 2004 17:31:34 -0000	1.7
***************
*** 38,41 ****
--- 38,46 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: python.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/python.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** python.syn	7 Sep 2004 08:03:45 -0000	1.8
--- python.syn	26 Sep 2004 17:31:34 -0000	1.9
***************
*** 36,39 ****
--- 36,44 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>1</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>1</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>1</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: html.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/html.syn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** html.syn	7 Sep 2004 08:03:45 -0000	1.7
--- html.syn	26 Sep 2004 17:31:34 -0000	1.8
***************
*** 38,41 ****
--- 38,46 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: perl.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/perl.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** perl.syn	7 Sep 2004 08:03:45 -0000	1.8
--- perl.syn	26 Sep 2004 17:31:34 -0000	1.9
***************
*** 35,38 ****
--- 35,43 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>1</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>1</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>1</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: java.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/java.syn,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** java.syn	7 Sep 2004 08:03:45 -0000	1.10
--- java.syn	26 Sep 2004 17:31:34 -0000	1.11
***************
*** 34,37 ****
--- 34,42 ----
  		<BraceMatching>1</BraceMatching>
  	</CodeHighlight>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>1</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>1</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>1</TrimTrailingSpaces>
+ 	</OnSave>
  	<AutoComp>
  		<AutoCompletion>0</AutoCompletion>

Index: xml.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/xml.syn,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xml.syn	7 Sep 2004 08:03:45 -0000	1.6
--- xml.syn	26 Sep 2004 17:31:34 -0000	1.7
***************
*** 36,39 ****
--- 36,44 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>0</ClassViewOn>

Index: css.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/css.syn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** css.syn	7 Sep 2004 08:03:45 -0000	1.7
--- css.syn	26 Sep 2004 17:31:34 -0000	1.8
***************
*** 35,38 ****
--- 35,43 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>0</ClassViewOn>

Index: javascript.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/javascript.syn,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** javascript.syn	7 Sep 2004 08:03:45 -0000	1.8
--- javascript.syn	26 Sep 2004 17:31:34 -0000	1.9
***************
*** 39,42 ****
--- 39,47 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>1</ClassViewOn>

Index: asm.syn
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/Syntax/asm.syn,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** asm.syn	7 Sep 2004 08:03:45 -0000	1.2
--- asm.syn	26 Sep 2004 17:31:34 -0000	1.3
***************
*** 32,35 ****
--- 32,40 ----
  		<AutoCompKey>0</AutoCompKey>
  	</AutoComp>
+ 	<OnSave>
+ 		<EnsureFinalNewLine>0</EnsureFinalNewLine>
+ 		<ConvertTabsToSpaces>0</ConvertTabsToSpaces>
+ 		<TrimTrailingSpaces>0</TrimTrailingSpaces>
+ 	</OnSave>
  	<ClassView>
  		<ClassViewOn>0</ClassViewOn>

[Anyedit-cvs]AnyEditv2 SyntaxFile.cpp,1.21,1.22 SyntaxFile.h,1.14,1.15

From: Leon W. <moo...@us...> - 2004-09-26 17:30:49

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10056

Modified Files:
	SyntaxFile.cpp SyntaxFile.h 
Log Message:
Added new On Save options:
- Ensure Final New Line
- Convert Spaces To Tab
- Trim Trailing Spaces

Index: SyntaxFile.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SyntaxFile.cpp	7 Sep 2004 07:30:48 -0000	1.21
--- SyntaxFile.cpp	26 Sep 2004 17:30:28 -0000	1.22
***************
*** 492,495 ****
--- 492,531 ----
  }
  
+ // Do we want to make sure we have a final newline?
+ bool CSyntaxFile::GetEnsureFinalNewLine()
+ {
+ 	return GetBoolFromXMLFile( TAG_ONSAVE, TAG_ONSAVE_ENSUREFINALNEWLINE );
+ }
+ 
+ // Set if we want to make sure we have a final newline.
+ bool CSyntaxFile::SetEnsureFinalNewLine( bool bEnsure )
+ {
+ 	return SetBoolToXMLFile( TAG_ONSAVE, TAG_ONSAVE_ENSUREFINALNEWLINE, bEnsure );
+ }
+ 
+ // Do we want to convert tabs to spaces (on save)?
+ bool CSyntaxFile::GetConvertTabsToSpaces()
+ {
+ 	return GetBoolFromXMLFile( TAG_ONSAVE, TAG_ONSAVE_CONVERTTABSTOSPACES );
+ }
+ 
+ // Set if we want to convert tabs to spaces (on save).
+ bool CSyntaxFile::SetConvertTabsToSpaces( bool bConvert )
+ {
+ 	return SetBoolToXMLFile( TAG_ONSAVE, TAG_ONSAVE_CONVERTTABSTOSPACES, bConvert );
+ }
+ 
+ // Do we want to trim trailing spaces (on save)?
+ bool CSyntaxFile::GetTrimTrailingSpaces()
+ {
+ 	return GetBoolFromXMLFile( TAG_ONSAVE, TAG_ONSAVE_TRIMTRAILINGSPACES );
+ }
+ 
+ // Set it we want to trim trailng spaces (on save).
+ bool CSyntaxFile::SetTrimTrailingSpaces( bool bTrim )
+ {
+ 	return SetBoolToXMLFile( TAG_ONSAVE, TAG_ONSAVE_TRIMTRAILINGSPACES, bTrim );
+ }
+ 
  // Is the Class View enabled?
  bool CSyntaxFile::GetClassView()

Index: SyntaxFile.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SyntaxFile.h	7 Sep 2004 07:30:48 -0000	1.14
--- SyntaxFile.h	26 Sep 2004 17:30:28 -0000	1.15
***************
*** 25,28 ****
--- 25,29 ----
  #define TAG_CODE						"CodeHighlight"
  #define TAG_AUTOCOMP					"AutoComp"
+ #define TAG_ONSAVE						"OnSave"
  #define TAG_CLASSVIEW					"ClassView"
  #define TAG_INDENT						"Indent"
***************
*** 63,66 ****
--- 64,72 ----
  #define TAG_AUTOCOMP_AUTOCOMPKEY		"AutoCompKey"
  
+ // On save sub tags
+ #define TAG_ONSAVE_ENSUREFINALNEWLINE	"EnsureFinalNewLine"
+ #define TAG_ONSAVE_CONVERTTABSTOSPACES	"ConvertTabsToSpaces"
+ #define TAG_ONSAVE_TRIMTRAILINGSPACES	"TrimTrailingSpaces"
+ 
  // Class View sub tags
  #define TAG_CLASSVIEW_LANGUAGE			"Language"
***************
*** 254,257 ****
--- 260,281 ----
  	bool SetACKey( int iKey );
  
+ 	/// Do we want to make sure we have a final newline?
+ 	bool GetEnsureFinalNewLine();
+ 
+ 	/// Set if we want to make sure we have a final newline.
+ 	bool SetEnsureFinalNewLine( bool bEnsure );
+ 
+ 	/// Do we want to convert tabs to spaces (on save)?
+ 	bool GetConvertTabsToSpaces();
+ 
+ 	/// Set if we want to convert tabs to spaces (on save).
+ 	bool SetConvertTabsToSpaces( bool bConvert );
+ 
+ 	/// Do we want to trim trailing spaces (on save)?
+ 	bool GetTrimTrailingSpaces();
+ 
+ 	/// Set it we want to trim trailng spaces (on save).
+ 	bool SetTrimTrailingSpaces( bool bTrim );
+ 
  	/// Is the Class View enabled?
  	bool GetClassView();

[Anyedit-cvs]AnyEditBin/Config/Default AnyEdit.cfg,1.16,1.17

From: Leon W. <moo...@us...> - 2004-09-26 16:47:04

Update of /cvsroot/anyedit/AnyEditBin/Config/Default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29743/Config/Default

Modified Files:
	AnyEdit.cfg 
Log Message:
Fixed missing character in closing tag for TabbedDocumentSelector.

Index: AnyEdit.cfg
===================================================================
RCS file: /cvsroot/anyedit/AnyEditBin/Config/Default/AnyEdit.cfg,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AnyEdit.cfg	21 Sep 2004 08:23:23 -0000	1.16
--- AnyEdit.cfg	26 Sep 2004 16:46:55 -0000	1.17
***************
*** 11,15 ****
          <MiniToolbar>1</MiniToolbar>
          <SplashScreen>1</SplashScreen>
!         <TabbedDocumentSelector>2</TabbedDocumentSelecto>
  	<SyncFileTab>0</SyncFileTab>
      </General>
--- 11,15 ----
          <MiniToolbar>1</MiniToolbar>
          <SplashScreen>1</SplashScreen>
!         <TabbedDocumentSelector>2</TabbedDocumentSelector>
  	<SyncFileTab>0</SyncFileTab>
      </General>

[Anyedit-cvs]AnyEditv2 ScintillaEx.cpp,1.14,1.15

From: boca4711 <boc...@us...> - 2004-09-26 13:38:19

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17447

Modified Files:
	ScintillaEx.cpp 
Log Message:
HighlightBraces uses left most brace column for highlight guides.

Index: ScintillaEx.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/ScintillaEx.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ScintillaEx.cpp	23 Sep 2004 21:32:14 -0000	1.14
--- ScintillaEx.cpp	26 Sep 2004 13:38:05 -0000	1.15
***************
*** 250,254 ****
          BraceHighlight(nCode, match);
  		int nColumn = GetColumn(nCode);
! 		SetHighlightGuide(nColumn);
      }
  }
--- 250,254 ----
          BraceHighlight(nCode, match);
  		int nColumn = GetColumn(nCode);
! 		SetHighlightGuide(min(nColumn, GetColumn(match)));
      }
  }

[Anyedit-cvs]AnyEditv2 AnyEditView.cpp,1.81,1.82 AnyEditView.h,1.48,1.49

From: boca4711 <boc...@us...> - 2004-09-26 13:36:37

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16995

Modified Files:
	AnyEditView.cpp AnyEditView.h 
Log Message:
- Removed tools read only (moved to CAnyEditDoc)
- Removed file reload (moved to CAnyEditDoc)
- Added update UI handler for read only
- Added mouse wheel navigation with shift (page up/down)

Index: AnyEditView.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** AnyEditView.h	23 Sep 2004 21:24:05 -0000	1.48
--- AnyEditView.h	26 Sep 2004 13:36:23 -0000	1.49
***************
*** 240,250 ****
  	afx_msg void OnUpdateViewFullscreen(CCmdUI* pCmdUI);
  	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
- 	afx_msg void OnFileReload();
- 	afx_msg void OnUpdateFileReload(CCmdUI* pCmdUI);
  	afx_msg void OnToolsSort();
  	afx_msg void OnUpdateToolsSort(CCmdUI* pCmdUI);
  	afx_msg void OnEditAdvancedInsertTextIntoLines();
- 	afx_msg void OnToolsReadonly();
- 	afx_msg void OnUpdateToolsReadonly(CCmdUI* pCmdUI);
  	afx_msg void OnEditAdvancedSaveSelection();
  	afx_msg void OnUpdateEditAdvancedSaveSelection(CCmdUI* pCmdUI);
--- 240,246 ----
***************
*** 252,255 ****
--- 248,277 ----
  	afx_msg void OnSearchIncrementalReverse();
  	afx_msg void OnExtrasOpenFile();
+ 	afx_msg void OnEditDelete();
+ 	afx_msg void OnUpdateEditDelete(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditComments(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeleteline(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeletetoendofline(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeletetoendofword(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeletetostartofline(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeletetostartofword(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditDeleteDeleteword(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditFormatDecreaseindent(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditFormatIncreaseindent(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditFormatTabstospaces(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditFormatSpacestotabs(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditFormatTrimtrailingspaces(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditChangecaseWorduppercase(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditChangecaseWordlowercase(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditChangecaseCapitalize(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedTransposechar(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedTransposelines(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedTransposeword(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedDuplicateline(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateMacrohelperNumplus(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateMacrohelperNumminus(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedInsertfile(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditAdvancedInsertTextIntoLines(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateSearchFindreplace(CCmdUI* pCmdUI);
  	//}}AFX_MSG
      afx_msg void OnEditFind();

Index: AnyEditView.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** AnyEditView.cpp	25 Sep 2004 13:10:07 -0000	1.81
--- AnyEditView.cpp	26 Sep 2004 13:36:23 -0000	1.82
***************
*** 162,172 ****
  	ON_UPDATE_COMMAND_UI(ID_VIEW_FULLSCREEN, OnUpdateViewFullscreen)
  	ON_WM_MOUSEWHEEL()
- 	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
- 	ON_UPDATE_COMMAND_UI(ID_FILE_RELOAD, OnUpdateFileReload)
  	ON_COMMAND(ID_TOOLS_SORT, OnToolsSort)
  	ON_UPDATE_COMMAND_UI(ID_TOOLS_SORT, OnUpdateToolsSort)
  	ON_COMMAND(ID_EDIT_ADVANCED_INSERT_TEXT_INTO_LINES, OnEditAdvancedInsertTextIntoLines)
- 	ON_COMMAND(ID_TOOLS_READONLY, OnToolsReadonly)
- 	ON_UPDATE_COMMAND_UI(ID_TOOLS_READONLY, OnUpdateToolsReadonly)
  	ON_COMMAND(ID_EDIT_ADVANCED_SAVE_SELECTION, OnEditAdvancedSaveSelection)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_SAVE_SELECTION, OnUpdateEditAdvancedSaveSelection)
--- 162,168 ----
***************
*** 174,177 ****
--- 170,199 ----
  	ON_COMMAND(ID_SEARCH_INCREMENTAL_REVERSE, OnSearchIncrementalReverse)
  	ON_COMMAND(ID_EXTRAS_OPEN_FILE, OnExtrasOpenFile)
+ 	ON_COMMAND(ID_EDIT_DELETE, OnEditDelete)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE, OnUpdateEditDelete)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_COMMENTS, OnUpdateEditComments)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETELINE, OnUpdateEditDeleteDeleteline)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETETOENDOFLINE, OnUpdateEditDeleteDeletetoendofline)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETETOENDOFWORD, OnUpdateEditDeleteDeletetoendofword)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETETOSTARTOFLINE, OnUpdateEditDeleteDeletetostartofline)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETETOSTARTOFWORD, OnUpdateEditDeleteDeletetostartofword)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_DELETE_DELETEWORD, OnUpdateEditDeleteDeleteword)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_FORMAT_DECREASEINDENT, OnUpdateEditFormatDecreaseindent)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_FORMAT_INCREASEINDENT, OnUpdateEditFormatIncreaseindent)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_FORMAT_TABSTOSPACES, OnUpdateEditFormatTabstospaces)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_FORMAT_SPACESTOTABS, OnUpdateEditFormatSpacestotabs)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_FORMAT_TRIMTRAILINGSPACES, OnUpdateEditFormatTrimtrailingspaces)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_CHANGECASE_WORDUPPERCASE, OnUpdateEditChangecaseWorduppercase)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_CHANGECASE_WORDLOWERCASE, OnUpdateEditChangecaseWordlowercase)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_CHANGECASE_CAPITALIZE, OnUpdateEditChangecaseCapitalize)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_TRANSPOSECHAR, OnUpdateEditAdvancedTransposechar)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_TRANSPOSELINES, OnUpdateEditAdvancedTransposelines)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_TRANSPOSEWORD, OnUpdateEditAdvancedTransposeword)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_DUPLICATELINE, OnUpdateEditAdvancedDuplicateline)
+ 	ON_UPDATE_COMMAND_UI(ID_MACROHELPER_NUMPLUS, OnUpdateMacrohelperNumplus)
+ 	ON_UPDATE_COMMAND_UI(ID_MACROHELPER_NUMMINUS, OnUpdateMacrohelperNumminus)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_INSERTFILE, OnUpdateEditAdvancedInsertfile)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_ADVANCED_INSERT_TEXT_INTO_LINES, OnUpdateEditAdvancedInsertTextIntoLines)
+ 	ON_UPDATE_COMMAND_UI(ID_SEARCH_FINDREPLACE, OnUpdateSearchFindreplace)
  	//}}AFX_MSG_MAP
  	// Standard printing commands
***************
*** 1118,1121 ****
--- 1140,1145 ----
      else
          pCmdUI->SetRadio(FALSE);
+ 
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
  }
  
***************
*** 1127,1130 ****
--- 1151,1156 ----
      else
          pCmdUI->SetRadio(FALSE);
+ 
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
  }
  
***************
*** 1136,1139 ****
--- 1162,1167 ----
      else
          pCmdUI->SetRadio(FALSE);
+ 
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
  }
  
***************
*** 1299,1306 ****
  }
  
! /// Enable Comment selection only when there is any selection.
  void CAnyEditView::OnUpdateEditStreamcomment(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection());	
  }
  
--- 1327,1334 ----
  }
  
! /// Enable Comment selection only when there is any selection and document is not read only.
  void CAnyEditView::OnUpdateEditStreamcomment(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection() && ! m_Scintilla.GetReadOnly());
  }
  
***************
*** 1312,1319 ****
  }
  
! /// Enable UnComment selection only when there is any selection.
  void CAnyEditView::OnUpdateEditStreamuncomment(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection());	
  }
  
--- 1340,1347 ----
  }
  
! /// Enable UnComment selection only when there is any selection and document is not read only.
  void CAnyEditView::OnUpdateEditStreamuncomment(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection() && ! m_Scintilla.GetReadOnly());	
  }
  
***************
*** 1877,1890 ****
  }
  
! /// Enable Uppercase selection only when there is any selection.
  void CAnyEditView::OnUpdateEditChangecaseUppercase(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection());	
  }
  
! /// Enable Lowercase selection only when there is any selection.
  void CAnyEditView::OnUpdateEditChangecaseLowercase(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection());	
  }
  
--- 1905,1918 ----
  }
  
! /// Enable Uppercase selection only when there is any selection and document is not read only.
  void CAnyEditView::OnUpdateEditChangecaseUppercase(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection() && ! m_Scintilla.GetReadOnly());	
  }
  
! /// Enable Lowercase selection only when there is any selection and document is not read only.
  void CAnyEditView::OnUpdateEditChangecaseLowercase(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection() && ! m_Scintilla.GetReadOnly());
  }
  
***************
*** 2000,2005 ****
  
  	pCmdUI->Enable(TRUE);
- //	if (pCmdUI->m_pOther && IsWindow(pCmdUI->m_pOther->m_hWnd))
- //		UpdateStatusMessage();
  }
  
--- 2028,2031 ----
***************
*** 2135,2139 ****
  }
  
! /// Zooming with Ctrl and mouse wheel
  BOOL CAnyEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) 
  {
--- 2161,2165 ----
  }
  
! /// Zooming with Ctrl and mouse wheel, page up/down with Shift and mouse wheel
  BOOL CAnyEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) 
  {
***************
*** 2145,2172 ****
  		else
  			OnViewZoomlevelZoomin();
! 	}
  	
  	return CView::OnMouseWheel(nFlags, zDelta, pt);
  }
  
- /// Reload current open file
- void CAnyEditView::OnFileReload() 
- {
-     if (GetDocument()->GetPathName().IsEmpty())
- 		return;
- 
- 	CString sMessage = "Do you want to reload '" + GetDocument()->GetPathName() + "' ?";
- 	if (AfxMessageBox(sMessage, MB_ICONQUESTION | MB_YESNO) == IDYES)
- 	{
- 		GetDocument()->ReloadFile();
- 	}
- }
- 
- /// Reload works only on existing files which are modified
- void CAnyEditView::OnUpdateFileReload(CCmdUI* pCmdUI) 
- {
- 	pCmdUI->Enable(! GetDocument()->GetPathName().IsEmpty() && GetDocument()->IsModified());
- }
- 
  /// Sort selected lines
  void CAnyEditView::OnToolsSort() 
--- 2171,2185 ----
  		else
  			OnViewZoomlevelZoomin();
! 	} else if (nFlags & MK_SHIFT)
! 	{
! 		if (zDelta < 0)
! 			m_Scintilla.PageDown();
! 		else
! 			m_Scintilla.PageUp();
! 	} 
  	
  	return CView::OnMouseWheel(nFlags, zDelta, pt);
  }
  
  /// Sort selected lines
  void CAnyEditView::OnToolsSort() 
***************
*** 2176,2183 ****
  }
  
! /// Enable item Sort when there is any selection
  void CAnyEditView::OnUpdateToolsSort(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection());	
  }
  
--- 2189,2196 ----
  }
  
! /// Enable item Sort when there is any selection and document is not read only.
  void CAnyEditView::OnUpdateToolsSort(CCmdUI* pCmdUI) 
  {
! 	pCmdUI->Enable(m_Scintilla.IsSelection() && ! m_Scintilla.GetReadOnly());	
  }
  
***************
*** 2189,2214 ****
  }
  
- /// Toggle read only of a document.
- void CAnyEditView::OnToolsReadonly() 
- {
- 	m_Scintilla.SetReadOnly(! m_Scintilla.GetReadOnly());
- }
- 
- /** Enable read only when file is not read only. Set check mark when
-  * document is read only.
-  */
- void CAnyEditView::OnUpdateToolsReadonly(CCmdUI* pCmdUI) 
- {
- 	if (GetDocument()->IsFileReadOnly())
- 		pCmdUI->Enable(FALSE);
- 	else 
- 		pCmdUI->Enable(TRUE);
- 
- 	if (m_Scintilla.GetReadOnly())
- 		pCmdUI->SetCheck(1);
- 	else
- 		pCmdUI->SetCheck(0);
- }
- 
  /// Show file dialog to save current selection into a file
  void CAnyEditView::OnEditAdvancedSaveSelection() 
--- 2202,2205 ----
***************
*** 2711,2712 ****
--- 2702,2859 ----
  	return true;
  }
+ 
+ /// Delete current selected block in normal and block mode.
+ void CAnyEditView::OnEditDelete() 
+ {
+ 	m_Scintilla.Clear();
+ }
+ 
+ /// Delete is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDelete(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Comment block is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditComments(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete line is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeleteline(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete to end of line is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeletetoendofline(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete to end of word is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeletetoendofword(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete to start of line is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeletetostartofline(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete to start of word is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeletetostartofword(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Delete word is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditDeleteDeleteword(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Decrease indent is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditFormatDecreaseindent(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Increase indent is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditFormatIncreaseindent(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Conversion of tab to spaces is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditFormatTabstospaces(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Conversion of spaces to tab is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditFormatSpacestotabs(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Trimming of trailing spaces is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditFormatTrimtrailingspaces(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Change word to uppercase is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditChangecaseWorduppercase(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Change word to lowercase is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditChangecaseWordlowercase(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Capitalize is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditChangecaseCapitalize(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Transpose char is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedTransposechar(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Transpose line is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedTransposelines(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Transpose word is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedTransposeword(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Duplicate line is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedDuplicateline(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Num plus is available only, when document is not read only.
+ void CAnyEditView::OnUpdateMacrohelperNumplus(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Num minus is available only, when document is not read only.
+ void CAnyEditView::OnUpdateMacrohelperNumminus(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Insert file is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedInsertfile(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Insert text into lines is available only, when document is not read only.
+ void CAnyEditView::OnUpdateEditAdvancedInsertTextIntoLines(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }
+ 
+ /// Replace is available only, when document is not read only.
+ void CAnyEditView::OnUpdateSearchFindreplace(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! m_Scintilla.GetReadOnly());
+ }

[Anyedit-cvs]AnyEditv2 AnyEditDoc.cpp,1.43,1.44 AnyEditDoc.h,1.24,1.25

From: boca4711 <boc...@us...> - 2004-09-26 13:34:23

Update of /cvsroot/anyedit/AnyEditv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16429

Modified Files:
	AnyEditDoc.cpp AnyEditDoc.h 
Log Message:
- Added file read only and file reload
- CheckLastTimeAccess now detects change of read only attribute of file too

Index: AnyEditDoc.h
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** AnyEditDoc.h	23 Sep 2004 21:22:00 -0000	1.24
--- AnyEditDoc.h	26 Sep 2004 13:34:12 -0000	1.25
***************
*** 91,94 ****
--- 91,95 ----
  
  protected:
+ 	bool m_bLockCheckLastAccessTime;
  	bool m_bFileReadOnly;
  	virtual BOOL DoSave(LPCTSTR lpszPathName, BOOL bReplace = TRUE);
***************
*** 108,111 ****
--- 109,116 ----
  	afx_msg void OnFileMove();
  	afx_msg void OnUpdateFileMove(CCmdUI* pCmdUI);
+ 	afx_msg void OnFileReadonly();
+ 	afx_msg void OnUpdateFileReadonly(CCmdUI* pCmdUI);
+ 	afx_msg void OnFileReload();
+ 	afx_msg void OnUpdateFileReload(CCmdUI* pCmdUI);
  	//}}AFX_MSG
      DECLARE_MESSAGE_MAP()

Index: AnyEditDoc.cpp
===================================================================
RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** AnyEditDoc.cpp	23 Sep 2004 22:41:54 -0000	1.43
--- AnyEditDoc.cpp	26 Sep 2004 13:34:12 -0000	1.44
***************
*** 34,38 ****
  	ON_COMMAND(ID_FILE_MOVE, OnFileMove)
  	ON_UPDATE_COMMAND_UI(ID_FILE_MOVE, OnUpdateFileMove)
! //}}AFX_MSG_MAP
  	ON_COMMAND(ID_FILE_SEND_MAIL, OnFileSendMail)
  	ON_UPDATE_COMMAND_UI(ID_FILE_SEND_MAIL, OnUpdateFileSendMail)
--- 34,42 ----
  	ON_COMMAND(ID_FILE_MOVE, OnFileMove)
  	ON_UPDATE_COMMAND_UI(ID_FILE_MOVE, OnUpdateFileMove)
! 	ON_COMMAND(ID_FILE_READONLY, OnFileReadonly)
! 	ON_UPDATE_COMMAND_UI(ID_FILE_READONLY, OnUpdateFileReadonly)
! 	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
! 	ON_UPDATE_COMMAND_UI(ID_FILE_RELOAD, OnUpdateFileReload)
! 	//}}AFX_MSG_MAP
  	ON_COMMAND(ID_FILE_SEND_MAIL, OnFileSendMail)
  	ON_UPDATE_COMMAND_UI(ID_FILE_SEND_MAIL, OnUpdateFileSendMail)
***************
*** 65,69 ****
  	m_pProjectFile = NULL;
  	m_bOwnProjectFile = FALSE;
! 	m_bFileReadOnly = FALSE;
  }
  
--- 69,74 ----
  	m_pProjectFile = NULL;
  	m_bOwnProjectFile = FALSE;
! 	m_bFileReadOnly = false;
! 	m_bLockCheckLastAccessTime = false;
  }
  
***************
*** 311,314 ****
--- 316,322 ----
  void CAnyEditDoc::CheckLastAccessTime()
  {
+ 	if (m_bLockCheckLastAccessTime)
+ 		return;
+ 
  	// First check if we need to check the last access time.
      if (!theApp.CheckModification() || (m_tLastAccessTime == 0))
***************
*** 318,332 ****
  		return;
  
      CFileStatus status;
- 	CString sMessage;
      if(CFile::GetStatus(GetPathName(), status))
  	{
          if(status.m_mtime == m_tLastAccessTime)
  			return;
  
          m_tLastAccessTime = status.m_mtime;
!         sMessage = "'" + GetPathName() + "'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?";
! 		CAnyEditView* pFirstView = GetFirstEditView();
!         if (AfxMessageBox(sMessage, MB_ICONQUESTION | MB_YESNO) == IDYES)
  		{
  			ReloadFile();
--- 326,367 ----
  		return;
  
+ 	// Prevent this procedure to call more than one time.
+ 	m_bLockCheckLastAccessTime = true;
+ 
      CFileStatus status;
      if(CFile::GetStatus(GetPathName(), status))
  	{
+ 		CAnyEditView* pFirstView = GetFirstEditView();
+ 
          if(status.m_mtime == m_tLastAccessTime)
+ 		{
+ 			// The file has not changed, check read only flag
+ 			if ((status.m_attribute & CFile::Attribute::readOnly) != m_bFileReadOnly)
+ 			{
+ 				if (status.m_attribute & CFile::Attribute::readOnly)
+ 				{
+ 					if (! pFirstView->GetScintillaControl()->GetReadOnly())
+ 					{
+ 						if (AfxMessageBox(StrPrintf("File '%s' is now read only. Do you want to set document read only too?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
+ 						{
+ 							pFirstView->GetScintillaControl()->SetReadOnly(true);
+ 						}
+ 						else
+ 				            m_tLastAccessTime = 0;	// Don't check anymore...
+ 
+ 						m_bFileReadOnly = true;
+ 					}
+ 					else
+ 						m_bFileReadOnly = true;
+ 				}
+ 				else
+ 					m_bFileReadOnly = false;
+ 			}
+ 			m_bLockCheckLastAccessTime = false;
  			return;
+ 		}
  
          m_tLastAccessTime = status.m_mtime;
!         if (AfxMessageBox(StrPrintf("'%s'\nFile has been modified outside AnyEdit!\nDo you want to reload it ?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
  		{
  			ReloadFile();
***************
*** 343,348 ****
  		m_tLastAccessTime = 0;
  
!         sMessage = "'" + GetPathName() + "'\nFile has been deleted outside AnyEdit!\nDo you want to close the window?";
!         if( AfxMessageBox(sMessage, MB_ICONQUESTION|MB_YESNO) == IDYES)
          {
  			RemoveTempCopy();
--- 378,382 ----
  		m_tLastAccessTime = 0;
  
!         if( AfxMessageBox(StrPrintf("'%s'\nFile has been deleted outside AnyEdit!\nDo you want to close the window?", GetPathName()), MB_ICONQUESTION|MB_YESNO) == IDYES)
          {
  			RemoveTempCopy();
***************
*** 350,357 ****
--- 384,395 ----
  			CAnyEditView* pView = GetFirstEditView();
  			if (pView == NULL)
+ 			{
+ 				m_bLockCheckLastAccessTime = false;
  				return;
+ 			}
  			pView->GetParentFrame()->PostMessage(WM_CLOSE);
          }
      }
+ 	m_bLockCheckLastAccessTime = false;
  }
  
***************
*** 861,862 ****
--- 899,969 ----
  	pCmdUI->Enable(! GetPathName().IsEmpty());
  }
+ 
+ /// Toggle read only of a document.
+ void CAnyEditDoc::OnFileReadonly() 
+ {
+ 	CAnyEditView* pView = GetFirstEditView();
+ 	if (pView == NULL)
+ 		return;
+ 
+ 	pView->GetScintillaControl()->SetReadOnly(! pView->GetScintillaControl()->GetReadOnly());
+ 
+ 	if (GetPathName())
+ 	{
+ 		DWORD dwFileAttributes = ::GetFileAttributes(GetPathName());
+ 		if (((dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? true : false) != pView->GetScintillaControl()->GetReadOnly())
+ 		{
+ 			if (AfxMessageBox(StrPrintf("Do you want to set the file '%s' to read only too?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
+ 			{
+ 				DWORD dwFileAttributes = ::GetFileAttributes(GetPathName());
+ 				if (dwFileAttributes & FILE_ATTRIBUTE_READONLY)
+ 				{
+ 					dwFileAttributes &= ~ FILE_ATTRIBUTE_READONLY;
+ 					m_bFileReadOnly = false;
+ 				}
+ 				else
+ 				{
+ 					dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
+ 					m_bFileReadOnly = true;
+ 				}
+ 				::SetFileAttributes(GetPathName(), dwFileAttributes);
+ 			}
+ 		}
+ 	}
+ }
+ 
+ /** Enable read only when file is not read only. Set check mark when
+  * document is read only.
+  */
+ void CAnyEditDoc::OnUpdateFileReadonly(CCmdUI* pCmdUI) 
+ {
+ 	if (IsFileReadOnly())
+ 		pCmdUI->Enable(FALSE);
+ 	else 
+ 		pCmdUI->Enable(TRUE);
+ 
+ 	CAnyEditView* pView = GetFirstEditView();
+ 	if (pView == NULL)
+ 		return;
+ 
+ 	if (pView->GetScintillaControl()->GetReadOnly())
+ 		pCmdUI->SetCheck(1);
+ 	else
+ 		pCmdUI->SetCheck(0);
+ }
+ 
+ /// Reload current open file
+ void CAnyEditDoc::OnFileReload() 
+ {
+     if (GetPathName().IsEmpty())
+ 		return;
+ 
+ 	if (AfxMessageBox(StrPrintf("Do you want to reload '%s' ?", GetPathName()), MB_ICONQUESTION | MB_YESNO) == IDYES)
+ 		ReloadFile();
+ }
+ 
+ /// Reload works only on existing files which are modified
+ void CAnyEditDoc::OnUpdateFileReload(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable(! GetPathName().IsEmpty() && IsModified());
+ }

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 32 > >> (Page 11 of 32)

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