PATCH: [ 784302 ] Implement Read-only for files and dirs

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 9f38321..f36cee3 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -18,8 +18,14 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 /////////////////////////////////////////////////////////////////////////////
-// ChildFrm.cpp : implementation of the CChildFrame class
-//
+/** 
+ * @file  ChildFrm.cpp
+ *
+ * @brief Implementation file for CChildFrame
+ *
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
 
 #include "stdafx.h"
 #include "Merge.h"
@@ -36,6 +42,11 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+/**
+ * @brief RO status panel width
+ */
+static UINT RO_PANEL_WIDTH = 40;
+
 /////////////////////////////////////////////////////////////////////////////
 // CChildFrame
 
@@ -52,10 +63,15 @@ BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
+/**
+ * @brief Bottom statusbar panels and indicators
+ */
 static UINT indicatorsBottom[] =
 {
        ID_SEPARATOR,
-       ID_SEPARATOR
+       ID_SEPARATOR,
+       ID_SEPARATOR,
+       ID_SEPARATOR,
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -64,7 +80,7 @@ static UINT indicatorsBottom[] =
 CChildFrame::CChildFrame()
 #pragma warning(disable:4355) // 'this' : used in base member initializer list
 : m_leftStatus(this, 0)
-, m_rightStatus(this, 1)
+, m_rightStatus(this, 2)
 #pragma warning(default:4355)
 {
        m_bActivated = FALSE;
@@ -79,7 +95,6 @@ CChildFrame::~CChildFrame()
 BOOL CChildFrame::OnCreateClient( LPCREATESTRUCT /*lpcs*/,
        CCreateContext* pContext)
 {
-
        //lpcs->style |= WS_MAXIMIZE;
        // create a splitter with 1 row, 2 columns
        if (!m_wndSplitter.CreateStatic(this, 1, 2, WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL) )
@@ -253,9 +268,12 @@ int CChildFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
                return -1;      // fail to create
        }       
 
-       m_wndStatusBar.SetPaneStyle(0, SBPS_NORMAL);
-       m_wndStatusBar.SetPaneStyle(1, SBPS_NORMAL);
-
+       // Set text to read-only info panes
+       // Text is hidden if file is writable
+       CString sText;
+       VERIFY(sText.LoadString(IDS_STATUSBAR_READONLY));
+       m_wndStatusBar.SetPaneText(1, sText, TRUE); 
+       m_wndStatusBar.SetPaneText(3, sText, TRUE);
 
        SetTimer(0, 250, NULL); // used to update the title headers
        return 0;
@@ -348,18 +366,28 @@ void CChildFrame::UpdateHeaderSizes()
                if (w<1) w=1; // Perry 2003-01-22 (I don't know why this happens)
                if (w1<1) w1=1; // Perry 2003-01-22 (I don't know why this happens)
 
-               // for bottom status bar
-               m_wndStatusBar.SetPaneInfo(0, ID_SEPARATOR, SBPS_NORMAL, w-1);
-               m_wndStatusBar.SetPaneInfo(1, ID_SEPARATOR, SBPS_STRETCH, 0);
-
                // prepare file path bar to look as a status bar
                if (m_wndFilePathBar.LookLikeThisWnd(&m_wndStatusBar) == TRUE)
                        RecalcLayout();
 
                // resize controls in header dialog bar
                m_wndFilePathBar.Resize(w, w1);
-       }
 
+               // Set bottom statusbar panel widths
+               // Kimmo - I don't know why 4 seems to be right for me
+               int borderWidth = 4; // GetSystemMetrics(SM_CXEDGE);
+               int pane1Width = w - RO_PANEL_WIDTH - borderWidth;
+               if (pane1Width < borderWidth)
+                       pane1Width = borderWidth;
+               int pane2Width = w1 - RO_PANEL_WIDTH - borderWidth;
+               if (pane2Width < borderWidth)
+                       pane2Width = borderWidth;
+
+               m_wndStatusBar.SetPaneInfo(0, ID_STATUS_LEFTFILE_INFO, SBPS_NORMAL, pane1Width);
+               m_wndStatusBar.SetPaneInfo(1, ID_STATUS_LEFTFILE_RO, SBPS_NORMAL, RO_PANEL_WIDTH - borderWidth);
+               m_wndStatusBar.SetPaneInfo(2, ID_STATUS_RIGHTFILE_INFO, SBPS_STRETCH, pane2Width);
+               m_wndStatusBar.SetPaneInfo(3, ID_STATUS_RIGHTFILE_RO, SBPS_NORMAL, RO_PANEL_WIDTH - borderWidth);
+       }
 }
 
 BOOL CChildFrame::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) 

diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp
index 2b5eea8..f9080e1 100644 (file)
--- a/Src/DirFrame.cpp
+++ b/Src/DirFrame.cpp
@@ -18,8 +18,14 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 /////////////////////////////////////////////////////////////////////////////
-// DirFrame.cpp : implementation file
-//
+/** 
+ * @file  DirFrame.cpp
+ *
+ * @brief Implementation file for CDirFrame
+ *
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
 
 #include "stdafx.h"
 #include "Merge.h"
@@ -31,11 +37,21 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+/**
+ * @brief Bottom statusbar panels and indicators
+ */
 static UINT indicators[] =
 {
        ID_SEPARATOR,           // status line indicator
+       ID_SEPARATOR,
+       ID_SEPARATOR,
 };
 
+/**
+ * @brief RO status panel width
+ */
+static UINT RO_PANEL_WIDTH = 40;
+
 /////////////////////////////////////////////////////////////////////////////
 // CDirFrame
 
@@ -90,6 +106,12 @@ int CDirFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
                return -1;      // fail to create
        }       
        
+       CString sText;
+       VERIFY(sText.LoadString(IDS_STATUSBAR_READONLY));
+       m_wndStatusBar.SetPaneInfo(1, ID_STATUS_LEFTDIR_RO, 0, RO_PANEL_WIDTH);
+       m_wndStatusBar.SetPaneInfo(2, ID_STATUS_RIGHTDIR_RO, 0, RO_PANEL_WIDTH);
+       m_wndStatusBar.SetPaneText(1, sText, TRUE); 
+       m_wndStatusBar.SetPaneText(2, sText, TRUE);
        return 0;
 }
 

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 0a41d59..3742589 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -111,6 +111,12 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_WM_TIMER()
        ON_WM_MOUSEMOVE()
        ON_COMMAND(ID_EDIT_COLUMNS, OnEditColumns)
+       ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTDIR_RO, OnUpdateStatusRightRO)
+       ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTDIR_RO, OnUpdateStatusLeftRO)
+       ON_COMMAND(ID_FILE_LEFT_READONLY, OnLeftReadOnly)
+       ON_UPDATE_COMMAND_UI(ID_FILE_LEFT_READONLY, OnUpdateLeftReadOnly)
+       ON_COMMAND(ID_FILE_RIGHT_READONLY, OnRightReadOnly)
+       ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateRightReadOnly)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
@@ -1409,4 +1415,60 @@ void CDirView::OnCustomDraw(NMHDR* pNMHDR, LRESULT* pResult)
        default:
                *pResult = CDRF_DODEFAULT;
        }
-}
\ No newline at end of file
+}
+
+/**
+ * @brief Change left-side readonly-status
+ */
+void CDirView::OnLeftReadOnly()
+{
+       BOOL bReadOnly = GetDocument()->GetReadOnly(TRUE);
+       GetDocument()->SetReadOnly(TRUE, !bReadOnly);
+}
+
+/**
+ * @brief Update left-readonly menu item
+ */
+void CDirView::OnUpdateLeftReadOnly(CCmdUI* pCmdUI)
+{
+       BOOL bReadOnly = GetDocument()->GetReadOnly(TRUE);
+       pCmdUI->Enable(TRUE);
+       pCmdUI->SetCheck(bReadOnly);
+}
+
+/**
+ * @brief Change right-side readonly-status
+ */
+void CDirView::OnRightReadOnly()
+{
+       BOOL bReadOnly = GetDocument()->GetReadOnly(FALSE);
+       GetDocument()->SetReadOnly(FALSE, !bReadOnly);
+}
+
+/**
+ * @brief Update right-side readonly menuitem
+ */
+void CDirView::OnUpdateRightReadOnly(CCmdUI* pCmdUI)
+{
+       BOOL bReadOnly = GetDocument()->GetReadOnly(FALSE);
+       pCmdUI->Enable(TRUE);
+       pCmdUI->SetCheck(bReadOnly);
+}
+
+/**
+ * @brief Update left-side readonly statusbar item
+ */
+void CDirView::OnUpdateStatusLeftRO(CCmdUI* pCmdUI)
+{
+       BOOL bROLeft = GetDocument()->GetReadOnly(TRUE);
+       pCmdUI->Enable(bROLeft);
+}
+
+/**
+ * @brief Update right-side readonly statusbar item
+ */
+void CDirView::OnUpdateStatusRightRO(CCmdUI* pCmdUI)
+{
+       BOOL bRORight = GetDocument()->GetReadOnly(FALSE);
+       pCmdUI->Enable(bRORight);
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index 5d38d19..ad2f69b 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -250,6 +250,12 @@ protected:
        afx_msg void OnTimer(UINT nIDEvent);
        afx_msg void OnMouseMove(UINT nFlags, CPoint point);
        afx_msg void OnEditColumns();
+       afx_msg void OnLeftReadOnly();
+       afx_msg void OnUpdateLeftReadOnly(CCmdUI* pCmdUI);
+       afx_msg void OnRightReadOnly();
+       afx_msg void OnUpdateRightReadOnly(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateStatusLeftRO(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateStatusRightRO(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 9bb4ab1..e2f970a 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Abrir...\tCtrl+O",           ID_FILE_OPEN
         MENUITEM "Sal&var\tCtrl+S",             ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Sair",                       ID_APP_EXIT
     END
     POPUP "&Editar"
@@ -1041,6 +1044,8 @@ BEGIN
     ID_OPTIONS_SHOWBINARIES "Exibir arquivos binários"
     ID_VIEW_WHITESPACE      "Exibir caracteres de espaço em branco"
     ID_REFRESH              "Atualizar tela\nAtualizar (F5)"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -1054,6 +1059,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copiando da direita para esquerda"
     IDS_STATUS_COPYALL2L    "Copiando tudo para esquerda"
     IDS_STATUS_COPYALL2R    "Copiando tudo para direita"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 3e3a615..23581bf 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -97,6 +97,9 @@ BEGIN
         MENUITEM "´ò¿ª(&O)...\tCtrl+O",         ID_FILE_OPEN
         MENUITEM "±£´æ(&S)\tCtrl+S",            ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "Í˳ö(&X)\tEsc",               ID_APP_EXIT
     END
     POPUP "±à¼­(&E)"
@@ -924,6 +927,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE FIXED IMPURE
@@ -937,6 +942,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "ÕýÔÚ¸´ÖÆÓұߵ½×ó±ß"
     IDS_STATUS_COPYALL2L    "ÕýÔÚÈ«²¿¸´ÖƵ½×ó±ß"
     IDS_STATUS_COPYALL2R    "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ±ß"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index ebe4208..2c7e85c 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -98,6 +98,9 @@ BEGIN
         MENUITEM "¶}±Ò(&O)...\tCtrl+O",         ID_FILE_OPEN
         MENUITEM "Àx¦s(&S)\tCtrl+S",            ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "µ²§ô(&X)\tEsc",               ID_APP_EXIT
     END
     POPUP "½s¿è(&E)"
@@ -1020,6 +1023,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -1033,6 +1038,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "¥¿¦b½Æ»s¥kÃä¨ì¥ªÃä"
     IDS_STATUS_COPYALL2L    "¥¿¦b¥þ³¡½Æ»s¨ì¥ªÃä"
     IDS_STATUS_COPYALL2R    "¥¿¦b¥þ³¡½Æ»s¨ì¥kÃä"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index ad8a542..0aa1abd 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Otevøít...\tCtrl+O",         ID_FILE_OPEN
         MENUITEM "&Ulo\9eit\tCtrl+S",             ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Konec",                      ID_APP_EXIT
     END
     POPUP "Úpr&avy"
@@ -1027,6 +1030,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1040,6 +1045,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copying Right to Left"
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 6af89a5..48431c0 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Åben...\tCtrl+O",            ID_FILE_OPEN
         MENUITEM "&Gem\tCtrl+S",                ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Luk\tEsc",                   ID_APP_EXIT
     END
     POPUP "&Rediger"
@@ -1023,6 +1026,8 @@ BEGIN
     ID_OPTIONS_SHOWBINARIES "Viser binære filer"
     ID_VIEW_WHITESPACE      "Viser et tegn for mellemrum"
     ID_REFRESH              "Opdater display\nOpdater (F5)"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1036,6 +1041,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Kopierer højre til venstre"
     IDS_STATUS_COPYALL2L    "Kopierer alt til venstre"
     IDS_STATUS_COPYALL2R    "Kopierer alt til højre"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index ffa4e97..2098fd1 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Openen...\tCtrl+O",          ID_FILE_OPEN
         MENUITEM "Op&slaan\tCtrl+S",            ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Afsluiten",                  ID_APP_EXIT
     END
     POPUP "Be&werken"
@@ -1033,6 +1036,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1046,6 +1051,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copying Right to Left"
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 9c688dc..b80207a 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Ouvrir...\tCtrl+O",          ID_FILE_OPEN
         MENUITEM "&Sauvegarder\tCtrl+S",        ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Quitter",                    ID_APP_EXIT
     END
     POPUP "&Edition"
@@ -1029,6 +1032,8 @@ BEGIN
     ID_OPTIONS_SHOWBINARIES "Afficher les fichiers binaires"
     ID_VIEW_WHITESPACE      "Afficher les espaces"
     ID_REFRESH              "Actualiser l'affichage\nActualiser (F5)"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1042,6 +1047,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copie de droite à gauche"
     IDS_STATUS_COPYALL2L    "Copie de tout vers la gauche"
     IDS_STATUS_COPYALL2R    "Copie de tout vers la droite"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 69571dd..94cf5c3 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -103,6 +103,9 @@ BEGIN
         MENUITEM "Ö&ffnen...\tStrg+O",          ID_FILE_OPEN
         MENUITEM "&Speichern\tStrg+S",          ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Beenden",                    ID_APP_EXIT
     END
     POPUP "&Bearbeiten"
@@ -1044,6 +1047,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1057,6 +1062,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Kopiere rechts nach links"
     IDS_STATUS_COPYALL2L    "Kopiere alles nach links"
     IDS_STATUS_COPYALL2R    "Kopiere alles nach rechts"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 0d950ba..fdf79ca 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -101,6 +101,9 @@ BEGIN
         MENUITEM "&Apri...\tCtrl+A",            ID_FILE_OPEN
         MENUITEM "&Salva\tCtrl+S",              ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "&Esci",                       ID_APP_EXIT
     END
     POPUP "&Modifica"
@@ -1027,6 +1030,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1040,6 +1045,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copying Right to Left"
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 06f3d14..5ea015f 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -65,6 +65,9 @@ BEGIN
         MENUITEM "¿­±â(&O)...\tCtrl+O",         ID_FILE_OPEN
         MENUITEM "ÀúÀå(&S)\tCtrl+S",            ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "³¡³»±â(&X)\tEsc",             ID_APP_EXIT
     END
     POPUP "ÆíÁý(&E)"
@@ -1158,6 +1161,8 @@ BEGIN
     ID_OPTIONS_SHOWBINARIES "¹ÙÀ̳ʸ® ÆÄÀÏÀ» º¾´Ï´Ù."
     ID_VIEW_WHITESPACE      "°ø¹é¹®ÀÚ(whitespace character)¸¦ º¾´Ï´Ù."
     ID_REFRESH              "»õ·Î °íħ\n»õ·Î °íħ (F5)"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE
@@ -1171,6 +1176,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»çÁß"
     IDS_STATUS_COPYALL2L    "¿ÞÂÊÀ¸·Î ¸ðµÎ º¹»çÁß"
     IDS_STATUS_COPYALL2R    "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»çÁß"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 6b0b1d5..0f28f23 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -100,6 +100,9 @@ BEGIN
         MENUITEM "&Åpne...\tCtrl+O",            ID_FILE_OPEN
         MENUITEM "&Lagre\tCtrl+S",               ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "L&ukk\tEsc",                  ID_APP_EXIT
     END
     POPUP "&Rediger"
@@ -1006,6 +1009,8 @@ BEGIN
     ID_OPTIONS_SHOWBINARIES "Viser binære filer"
     ID_VIEW_WHITESPACE      "Viser et tegn for mellomrom"
     ID_REFRESH              "Oppdater visning\nOppdater (F5)"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1019,6 +1024,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Kopierer høyre til venstre"
     IDS_STATUS_COPYALL2L    "Kopierer alt til venstre"
     IDS_STATUS_COPYALL2R    "Kopierer alt til høyre"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 959f177..63e2c1a 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -102,6 +102,10 @@ BEGIN
         MENUITEM "&Otvori\9d...\tCtrl+O",         ID_FILE_OPEN
         MENUITEM "&Ulo\9ei\9d\tCtrl+S",             ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
+        MENUITEM SEPARATOR
         MENUITEM "&Koniec",                     ID_APP_EXIT
     END
     POPUP "Úpr&avy"
@@ -1028,6 +1032,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1041,6 +1047,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Kopírujem pravý do ¾avého"
     IDS_STATUS_COPYALL2L    "Kopírujem v\9aetko do ¾avého"
     IDS_STATUS_COPYALL2R    "Kopírujem v\9aetko do pravého"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 9984bce..1f007c6 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -102,6 +102,9 @@ BEGIN
         MENUITEM "&Comparar...\tCtrl+O",        ID_FILE_OPEN
         MENUITEM "&Guardar\tCtrl+S",            ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "Salir",                       ID_APP_EXIT
     END
     POPUP "&Editar"
@@ -1029,6 +1032,8 @@ BEGIN
     ID_SHOWLINEDIFF         "Highlight difference in current line"
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1042,6 +1047,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copying Right to Left"
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 01b8c1c..86b64bc 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,8 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -398,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32823
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 665fb8f..82a19cd 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,5 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
+// $Id$
+
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -100,6 +102,9 @@ BEGIN
         MENUITEM "&Open...\tCtrl+O",            ID_FILE_OPEN
         MENUITEM "&Save\tCtrl+S",               ID_FILE_SAVE
         MENUITEM SEPARATOR
+        MENUITEM "Left read-only",              ID_FILE_LEFT_READONLY
+        MENUITEM "Right read-only",             ID_FILE_RIGHT_READONLY
+        MENUITEM SEPARATOR
         MENUITEM "E&xit\tEsc",                  ID_APP_EXIT
     END
     POPUP "&Edit"
@@ -1207,6 +1212,8 @@ BEGIN
     ID_EDITOR_COPY_PATH     "Copy full Path"
     ID_EDITOR_COPY_FILENAME "Copy Filename"
     ID_VIEW_DETAIL_BAR      "Toggle Diff Pane"
+    ID_FILE_LEFT_READONLY   "Change left file/dir read-only status"
+    ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -1220,6 +1227,7 @@ BEGIN
     IDS_STATUS_COPYR2L      "Copying Right to Left"
     IDS_STATUS_COPYALL2L    "Copying All to Left"
     IDS_STATUS_COPYALL2R    "Copying All to Right"
+    IDS_STATUSBAR_READONLY  "RO"
     IDS_PROGRAMFILES        "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
     IDS_COLHDR_RSIZE        "Right Size"
     IDS_COLHDR_LTIMEC       "Left Creation Time"

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 746f52b..08ce8b0 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -41,7 +41,9 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-// Timer ID and timeout for delayed rescan
+/**
+ * @brief Timer ID and timeout for delayed rescan
+ */
 const UINT IDT_RESCAN = 2;
 const UINT RESCAN_TIMEOUT = 1000;
 
@@ -102,6 +104,13 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx)
        ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateFileSave)
        ON_COMMAND(ID_SHOWLINEDIFF, OnShowlinediff)
        ON_UPDATE_COMMAND_UI(ID_SHOWLINEDIFF, OnUpdateShowlinediff)
+       ON_UPDATE_COMMAND_UI(ID_EDIT_REPLACE, OnUpdateEditReplace)
+       ON_COMMAND(ID_FILE_LEFT_READONLY, OnLeftReadOnly)
+       ON_UPDATE_COMMAND_UI(ID_FILE_LEFT_READONLY, OnUpdateLeftReadOnly)
+       ON_COMMAND(ID_FILE_RIGHT_READONLY, OnRightReadOnly)
+       ON_UPDATE_COMMAND_UI(ID_FILE_RIGHT_READONLY, OnUpdateRightReadOnly)
+       ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTFILE_RO, OnUpdateStatusLeftRO)
+       ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTFILE_RO, OnUpdateStatusRightRO)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -203,6 +212,9 @@ void CMergeEditView::OnActivateView(BOOL bActivate, CView* pActivateView, CView*
        CCrystalEditViewEx::OnActivateView(bActivate, pActivateView, pDeactiveView);
 }
 
+/**
+ * @brief Determine text and backgdound color for line
+ */
 void CMergeEditView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
                                 COLORREF & crText, BOOL & bDrawWhitespace)
 {
@@ -256,6 +268,9 @@ void CMergeEditView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
        }
 }
 
+/**
+ * @brief Sync other pane position
+ */
 void CMergeEditView::UpdateSiblingScrollPos (BOOL bHorz)
 {
        CSplitterWnd *pSplitterWnd = GetParentSplitter (this, FALSE);
@@ -337,6 +352,9 @@ void CMergeEditView::OnUpdateSibling (CCrystalTextView * pUpdateSource, BOOL bHo
        }
 }
 
+/**
+ * @brief Select diff by number
+ */
 void CMergeEditView::SelectDiff(int nDiff, BOOL bScroll /*=TRUE*/, BOOL bSelectText /*=TRUE*/)
 {
        CMergeDoc *pd = GetDocument();
@@ -503,8 +521,13 @@ void CMergeEditView::OnEditUndo()
 
 void CMergeEditView::OnUpdateEditUndo(CCmdUI* pCmdUI)
 {
-       CMergeDoc* pDoc = GetDocument();
-       pCmdUI->Enable(pDoc->curUndo!=pDoc->undoTgt.begin());
+       if (!IsReadOnly(m_bIsLeft))
+       {
+               CMergeDoc* pDoc = GetDocument();
+               pCmdUI->Enable(pDoc->curUndo!=pDoc->undoTgt.begin());
+       }
+       else
+               pCmdUI->Enable(FALSE);
 }
 
 void CMergeEditView::OnFirstdiff()
@@ -672,6 +695,7 @@ void CMergeEditView::UpdateLineLengths()
 
 void CMergeEditView::OnL2r()
 {
+       // Check that right side is not readonly
        if (IsReadOnly(FALSE))
                return;
        WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYL2R));
@@ -680,6 +704,7 @@ void CMergeEditView::OnL2r()
 
 void CMergeEditView::OnUpdateL2r(CCmdUI* pCmdUI)
 {
+       // Check that right side is not readonly
        if (!IsReadOnly(FALSE))
                pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1);
        else
@@ -688,6 +713,7 @@ void CMergeEditView::OnUpdateL2r(CCmdUI* pCmdUI)
 
 void CMergeEditView::OnR2l()
 {
+       // Check that left side is not readonly
        if (IsReadOnly(TRUE))
                return;
        WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYR2L));
@@ -696,6 +722,7 @@ void CMergeEditView::OnR2l()
 
 void CMergeEditView::OnUpdateR2l(CCmdUI* pCmdUI)
 {
+       // Check that left side is not readonly
        if (!IsReadOnly(TRUE))
                pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1);
        else
@@ -704,6 +731,7 @@ void CMergeEditView::OnUpdateR2l(CCmdUI* pCmdUI)
 
 void CMergeEditView::OnAllLeft()
 {
+       // Check that left side is not readonly
        if (IsReadOnly(TRUE))
                return;
        WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYALL2L));
@@ -713,6 +741,7 @@ void CMergeEditView::OnAllLeft()
 
 void CMergeEditView::OnUpdateAllLeft(CCmdUI* pCmdUI)
 {
+       // Check that left side is not readonly
        if (!IsReadOnly(TRUE))
                pCmdUI->Enable(GetDocument()->m_nDiffs!=0);
        else
@@ -721,6 +750,7 @@ void CMergeEditView::OnUpdateAllLeft(CCmdUI* pCmdUI)
 
 void CMergeEditView::OnAllRight()
 {
+       // Check that right side is not readonly
        if (IsReadOnly(FALSE))
                return;
 
@@ -731,6 +761,7 @@ void CMergeEditView::OnAllRight()
 
 void CMergeEditView::OnUpdateAllRight(CCmdUI* pCmdUI)
 {
+       // Check that right side is not readonly
        if (!IsReadOnly(FALSE))
                pCmdUI->Enable(GetDocument()->m_nDiffs!=0);
        else
@@ -802,8 +833,13 @@ void CMergeEditView::OnEditRedo()
 
 void CMergeEditView::OnUpdateEditRedo(CCmdUI* pCmdUI)
 {
-       CMergeDoc* pDoc = GetDocument();
-       pCmdUI->Enable(pDoc->curUndo!=pDoc->undoTgt.end());
+       if (!IsReadOnly(m_bIsLeft))
+       {
+               CMergeDoc* pDoc = GetDocument();
+               pCmdUI->Enable(pDoc->curUndo!=pDoc->undoTgt.end());
+       }
+       else
+               pCmdUI->Enable(FALSE);
 }
 
 void CMergeEditView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
@@ -936,6 +972,36 @@ void CMergeEditView::OnUpdateFileSave(CCmdUI* pCmdUI)
                pCmdUI->Enable(FALSE);
 }
 
+void CMergeEditView::OnLeftReadOnly()
+{
+       CMergeDoc *pd = GetDocument();
+       BOOL bReadOnly = pd->m_ltBuf.GetReadOnly();
+       pd->m_ltBuf.SetReadOnly(!bReadOnly);
+}
+
+void CMergeEditView::OnUpdateLeftReadOnly(CCmdUI* pCmdUI)
+{
+       CMergeDoc *pd = GetDocument();
+       BOOL bReadOnly = pd->m_ltBuf.GetReadOnly();
+       pCmdUI->Enable(TRUE);
+       pCmdUI->SetCheck(bReadOnly);
+}
+
+void CMergeEditView::OnRightReadOnly()
+{
+       CMergeDoc *pd = GetDocument();
+       BOOL bReadOnly = pd->m_rtBuf.GetReadOnly();
+       pd->m_rtBuf.SetReadOnly(!bReadOnly);
+}
+
+void CMergeEditView::OnUpdateRightReadOnly(CCmdUI* pCmdUI)
+{
+       CMergeDoc *pd = GetDocument();
+       BOOL bReadOnly = pd->m_rtBuf.GetReadOnly();
+       pCmdUI->Enable(TRUE);
+       pCmdUI->SetCheck(bReadOnly);
+}
+
 // Store our interface we use to display status line info
 void CMergeEditView::SetStatusInterface(IMergeEditStatus * piMergeEditStatus)
 {
@@ -987,3 +1053,39 @@ void CMergeEditView::OnUpdateShowlinediff(CCmdUI* pCmdUI)
        BOOL enable = GetLineFlags(line) & LF_DIFF;
        pCmdUI->Enable(enable);
 }
+
+/**
+ * @brief Enable/disable Replace-menuitem
+ */
+void CMergeEditView::OnUpdateEditReplace(CCmdUI* pCmdUI)
+{
+       CMergeDoc *pd = GetDocument();
+       BOOL bReadOnly = FALSE;
+       if (m_bIsLeft)
+               bReadOnly = pd->m_ltBuf.GetReadOnly();
+       else
+               bReadOnly = pd->m_rtBuf.GetReadOnly();
+
+       pCmdUI->Enable(!bReadOnly);
+}
+
+/**
+ * @brief Update left readonly statusbaritem
+ */
+void CMergeEditView::OnUpdateStatusLeftRO(CCmdUI* pCmdUI)
+{
+       BOOL bROLeft = GetDocument()->m_ltBuf.GetReadOnly();
+       pCmdUI->Enable(bROLeft);
+}
+
+/**
+ * @brief Update right readonly statusbaritem
+ */
+void CMergeEditView::OnUpdateStatusRightRO(CCmdUI* pCmdUI)
+{
+       BOOL bRORight = GetDocument()->m_rtBuf.GetReadOnly();
+       pCmdUI->Enable(bRORight);
+}
+
+
+

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 18c6154..5cd80c1 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -193,6 +193,13 @@ protected:
        afx_msg void OnUpdateFileSave(CCmdUI* pCmdUI);
        afx_msg void OnShowlinediff();
        afx_msg void OnUpdateShowlinediff(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateEditReplace(CCmdUI* pCmdUI);
+       afx_msg void OnLeftReadOnly();
+       afx_msg void OnUpdateLeftReadOnly(CCmdUI* pCmdUI);
+       afx_msg void OnRightReadOnly();
+       afx_msg void OnUpdateRightReadOnly(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateStatusLeftRO(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateStatusRightRO(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };

diff --git a/Src/readme.txt b/Src/readme.txt
index 9b7b810..eaa5349 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,11 @@
 2003-08-31 Kimmo
  PATCH: [ 797741 ] Faster file loading
   WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
+ PATCH: [ 784302 ] Implement Read-only for files and dirs
+  UI changes
+  WinMerge: ChildFrm.cpp DirFrame.cpp DirView.h DirView.cpp Merge.rc
+   MergeEditView.h MergeEditView.cpp Resource.h
+  Languages: resource.h *.rc
 
 2003-08-30 Kimmo
  PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry

diff --git a/Src/resource.h b/Src/resource.h
index 435b745..86b64bc 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -2,6 +2,8 @@
 // Microsoft Developer Studio generated include file.
 // Used by Merge.rc
 //
+// $Id$
+
 #define IDC_CUT                         3
 #define IDC_COPY                        4
 #define IDC_PASTE                       5
@@ -118,6 +120,7 @@
 #define IDB_NOTEQUAL                    214
 #define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
+#define IDS_STATUSBAR_READONLY          215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217
 #define IDB_LFILE                       218
@@ -389,9 +392,17 @@
 #define ID_EDIT_FIND_PREVIOUS           32820
 #define ID_SHOWLINEDIFF                 32821
 #define ID_EDITOR_COPY_PATH             32822
-#define ID_EDIT_COLUMNS                 32822
-#define ID_EDITOR_COPY_FILENAME         32823
-#define ID_VIEW_DETAIL_BAR              32824
+#define ID_EDIT_COLUMNS                 32823
+#define ID_EDITOR_COPY_FILENAME         32824
+#define ID_VIEW_DETAIL_BAR              32825
+#define ID_FILE_LEFT_READONLY           32826
+#define ID_FILE_RIGHT_READONLY          32827
+#define ID_STATUS_RIGHTDIR_RO           32828
+#define ID_STATUS_LEFTDIR_RO            32829
+#define ID_STATUS_RIGHTFILE_RO          32830
+#define ID_STATUS_LEFTFILE_RO           32831
+#define ID_STATUS_RIGHTFILE_INFO        32832
+#define ID_STATUS_LEFTFILE_INFO         32833
 
 // Next default values for new objects
 // 
@@ -399,7 +410,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        118
-#define _APS_NEXT_COMMAND_VALUE         32825
+#define _APS_NEXT_COMMAND_VALUE         32834
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           108
 #endif