[ 687039 ] View whitespaces on editor

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 97eeb45..f3be9a7 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -90,6 +90,9 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_COMMAND(ID_HELP_CONTENTS, OnHelpContents)
        ON_UPDATE_COMMAND_UI(ID_HELP_CONTENTS, OnUpdateHelpContents)
        ON_WM_CLOSE()
+       ON_COMMAND(ID_VIEW_WHITESPACE, OnViewWhitespace)
+       ON_UPDATE_COMMAND_UI(ID_VIEW_WHITESPACE, OnUpdateViewWhitespace)
+
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -124,6 +127,7 @@ CMainFrame::CMainFrame()
        m_bShowIdent = theApp.GetProfileInt(_T("Settings"), _T("ShowIdentical"), TRUE)!=0;
        m_bShowBinaries = theApp.GetProfileInt(_T("Settings"), _T("ShowBinaries"), TRUE)!=0;
        m_bBackup = theApp.GetProfileInt(_T("Settings"), _T("BackupFile"), TRUE)!=0;
+       m_bViewWhitespace = theApp.GetProfileInt(_T("Settings"), _T("ViewWhitespace"), FALSE)!=0;
        m_bScrollToFirst = theApp.GetProfileInt(_T("Settings"), _T("ScrollToFirst"), FALSE)!=0;
        m_nIgnoreWhitespace = theApp.GetProfileInt(_T("Settings"), _T("IgnoreSpace"), 1);
        m_bHideBak = theApp.GetProfileInt(_T("Settings"), _T("HideBak"), TRUE)!=0;
@@ -298,6 +302,8 @@ void CMainFrame::ShowMergeDoc(LPCTSTR szLeft, LPCTSTR szRight)
                        // SetTextType will revert to language dependent defaults for tab
                        m_pLeft->SetTabSize(mf->m_nTabSize);
                        m_pRight->SetTabSize(mf->m_nTabSize);
+                       m_pLeft->SetViewTabs(mf->m_bViewWhitespace);
+                       m_pRight->SetViewTabs(mf->m_bViewWhitespace);
                        
                        // set the frame window header
                        CChildFrame *pf = static_cast<CChildFrame *>(m_pMergeDoc->m_pView->GetParentFrame());
@@ -1335,6 +1341,24 @@ void CMainFrame::addToMru(LPCSTR szItem, LPCSTR szRegSubKey, UINT nMaxItems)
        AfxGetApp()->WriteProfileInt(szRegSubKey, "Count", cnt);
 }
 
+void CMainFrame::OnViewWhitespace() 
+{
+       m_bViewWhitespace = !m_bViewWhitespace;
+       theApp.WriteProfileInt(_T("Settings"), _T("ViewWhitespace"), m_bViewWhitespace);
+
+       if (m_pLeft)
+               m_pLeft->SetViewTabs(mf->m_bViewWhitespace);
+
+       if (m_pRight)
+               m_pRight->SetViewTabs(mf->m_bViewWhitespace);
+}
+
+void CMainFrame::OnUpdateViewWhitespace(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bViewWhitespace);
+}
+
+
 void CMainFrame::ConvertPathToSlashes(LPTSTR path)
 {
        TCHAR *ptr = path;

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index e233f1a..8abe3f6 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -106,6 +106,7 @@ public:
        CMergeDoc *m_pMergeDoc;
        CDirDoc *m_pDirDoc;
        UINT m_nTabType;
+       BOOL m_bViewWhitespace;
 
 // Implementation data
 protected:
@@ -154,6 +155,9 @@ protected:
        afx_msg void OnHelpContents();
        afx_msg void OnUpdateHelpContents(CCmdUI* pCmdUI);
        afx_msg void OnClose();
+       afx_msg void OnViewWhitespace();
+       afx_msg void OnUpdateViewWhitespace(CCmdUI* pCmdUI);
+
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 733aac4..891c720 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -128,12 +128,14 @@ BEGIN
         MENUITEM "Show &Different Files",       ID_OPTIONS_SHOWDIFFERENT
         MENUITEM "Show Le&ft Unique Files",     ID_OPTIONS_SHOWUNIQUELEFT
         MENUITEM "Show Ri&ght Unique Files",    ID_OPTIONS_SHOWUNIQUERIGHT
-        MENUITEM "Show &Binary Files",          ID_OPTIONS_SHOWBINARIES
+        MENUITEM "S&how Binary Files",          ID_OPTIONS_SHOWBINARIES
         MENUITEM "Hide *.&BAK Files",           ID_HIDE_BACKUP_FILES
         MENUITEM SEPARATOR
         MENUITEM "Select &Font...",             ID_VIEW_SELECTFONT
         MENUITEM "Use Default F&ont",           ID_VIEW_USEDEFAULTFONT
         MENUITEM SEPARATOR
+        MENUITEM "&View Whitespace",            ID_VIEW_WHITESPACE
+        MENUITEM SEPARATOR
         MENUITEM "&Toolbar",                    ID_VIEW_TOOLBAR
         MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR
         MENUITEM SEPARATOR
@@ -1029,6 +1031,7 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_BIN_FILES_SAME      "Binary files are identical"
     ID_OPTIONS_SHOWBINARIES "Displays binary files"
+       ID_VIEW_WHITESPACE      "Shows whitespace characters"
 END
 
 STRINGTABLE DISCARDABLE 

diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp
index 8deedf9..9c665bd 100644 (file)
--- a/Src/editlib/ccrystaltextview.cpp
+++ b/Src/editlib/ccrystaltextview.cpp
@@ -103,8 +103,11 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+
+// These maybe should be converted with some winapi function to make sure
+// they are printable and not garbage on different fonts...
 #define TAB_CHARACTER               _T('\xBB')
-#define SPACE_CHARACTER             _T('\x95')
+#define SPACE_CHARACTER             _T('\xB7') // _T('\x95')
 #define DEFAULT_PRINT_MARGIN        1000    //  10 millimeters
 
 const UINT     MAX_TAB_LEN     = 64; 
@@ -1606,7 +1609,6 @@ ResetView ()
   m_bBookmarkExist = FALSE;     // More bookmarks
 
   m_bMultipleSearch = FALSE;    // More search
-  m_bViewTabs = FALSE;
 
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 2163944..dfc0edb 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-02-18 Kimmo
+  [ 687039 ] View whitespaces on editor
+  MainFrm.h MainFrm.cpp Merge.rc resource.h ccrystaltextview.cpp
+
 2003-02-15 Kimmo
   [ 686699 ] Check & return file saving success
   Merge.rc MergeDoc.h Mergedoc.cpp resource.h

diff --git a/Src/resource.h b/Src/resource.h
index 7aa0e4c..a85099c 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -322,6 +322,7 @@
 #define ID_DIR_OPEN_RIGHT               32815
 #define ID_DIR_OPEN_RIGHT_WITH          32816
 #define ID_OPTIONS_SHOWBINARIES         32817
+#define ID_VIEW_WHITESPACE              32818
 
 // Next default values for new objects
 // 
@@ -329,7 +330,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
-#define _APS_NEXT_COMMAND_VALUE         32818
+#define _APS_NEXT_COMMAND_VALUE         32819
 #define _APS_NEXT_CONTROL_VALUE         1037
 #define _APS_NEXT_SYMED_VALUE           108
 #endif