PATCH: [ 1522037 ] Add read-only option for paths in Project file

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 5f32b5e..9fae986 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -5,6 +5,10 @@ Add new items to top.
 2006-07-19 Kimmo
  BUG: [ 1524832 ] Bogus include's
   Src: DirColsDlg.cpp PropEditor.cpp
+ PATCH: [ 1522037 ] Add read-only option for paths in Project file
+  Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
+   ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
+  Src/Languages/*: Merge*.rc
 
 2006-07-18 Kimmo
  Fix and improve comment for folder compare columns table

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 051a09e..8c01ff5 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 42f9dbe..0c733d9 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1543,7 +1543,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1552,16 +1552,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 9d90973..e05bd12 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Camins"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Esquerre:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "&Navega...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Dret:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "N&avega...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filtre:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Tria...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Dret:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "N&avega...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filtre:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Tria...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Inclou-hi subcarpetes",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "&Obre...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "De&sa...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "&Obre...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "De&sa...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 6d027ee..290c0a0 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1543,7 +1543,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1552,16 +1552,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 78a84ce..a3692b3 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 12df5a6..14c0788 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Cesty"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "V&levo:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "&Procházet...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "Vp&ravo:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Pr&ocházet...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filtr:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Vybrat...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "Vp&ravo:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Pr&ocházet...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filtr:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Vybrat...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "Vèetnì pod&slo\9eek",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "&Naèíst...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "&Ulo\9eit...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "&Naèíst...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "&Ulo\9eit...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 025272c..0de2a3b 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index f3f4f42..823aa94 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 1d5e946..e630a10 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1540,7 +1540,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1549,16 +1549,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 55d112f..6ad2981 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Pfade"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Links:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Suchen...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Rechts:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Suchen...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Auswählen...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Rechts:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Suchen...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Auswählen...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Unterordner einbeziehen",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Öffnen...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Speichern...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Öffnen...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Speichern...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index f8ebf1e..9954123 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 9a303d8..a7027a8 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 83e2a4d..40627d9 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "\83p\83X"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "\8d¶\91¤(&L):",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "\8eQ\8fÆ...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "\89E\91¤(&R):",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "\8eQ\8fÆ...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "\83t\83B\83\8b\83^(&F):",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "\91I\91ð...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "\89E\91¤(&R):",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "\8eQ\8fÆ...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "\83t\83B\83\8b\83^(&F):",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "\91I\91ð...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "\83T\83u\83t\83H\83\8b\83_\82ð\8aÜ\82Þ(&I)",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "\8aJ\82­...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "\95Û\91¶...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "\8aJ\82­...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "\95Û\91¶...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index d3573e2..8defdb6 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 87e51b2..28af0e7 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 64bf48d..1723393 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "\8ccie¿ki"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Lewa:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Przegl¹daj...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Prawa:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Przegl¹daj...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filtr:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Wybierz...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Prawa:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Przegl¹daj...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filtr:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Wybierz...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "Do³¹cz &podkatalogi",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Otwórz...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Zapisz...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Otwórz...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Zapisz...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 2687623..5c067fd 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 9ed559d..94c5ec1 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index a98d9a6..0312b35 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Rutas"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Izquierda:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Examinar...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Derecha:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Examinar...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filtro:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Seleccionar...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Derecha:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Examinar...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filtro:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Seleccionar...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Incluir subcarpetas",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Abrir...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Guardar...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Abrir...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Guardar...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index b4b7277..6ff57c3 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Sökvägar"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Vänster:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Bläddra...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Höger:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Bläddra...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Välj...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Höger:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Bläddra...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Välj...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Inkludera underkataloger",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Öppna...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Spara...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Öppna...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Spara...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 0fe5b34..159ab54 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 0c35b89..f932768 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1017,6 +1017,14 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                strRight = dlg.m_strRight;
                bRecurse = dlg.m_bRecurse;
                infoUnpacker = dlg.m_infoHandler;
+               if (dlg.m_pProjectFile != NULL)
+               {
+                       // User loaded a project file, set additional information
+                       if (dlg.m_pProjectFile->GetLeftReadOnly())
+                               bROLeft = TRUE;
+                       if (dlg.m_pProjectFile->GetRightReadOnly())
+                               bRORight = TRUE;
+               }
                pathsType = static_cast<PATH_EXISTENCE>(dlg.m_pathsType);
                // TODO: add codepage options to open dialog ?
        }

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index a53318a..2c2f0a1 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -648,8 +648,11 @@ bool CMergeApp::LoadAndOpenProjectFile(const CString & sProject)
                return false;
        }
        CString sLeft, sRight;
-       BOOL bRecursive=FALSE;
-       project.GetPaths(sLeft, sRight, bRecursive);
+       BOOL bLeftReadOnly = FALSE;
+       BOOL bRightReadOnly = FALSE;
+       BOOL bRecursive = FALSE;
+       sLeft = project.GetLeft(&bLeftReadOnly);
+       sRight = project.GetRight(&bRightReadOnly);
        if (project.HasFilter())
        {
                CString filter = project.GetFilter();
@@ -658,11 +661,24 @@ bool CMergeApp::LoadAndOpenProjectFile(const CString & sProject)
                m_globalFileFilter.SetFilter(filter);
        }
 
-       DWORD dwLeftFlags = (sLeft.IsEmpty() ? FFILEOPEN_NONE : FFILEOPEN_PROJECT);
-       DWORD dwRightFlags = (sRight.IsEmpty() ? FFILEOPEN_NONE : FFILEOPEN_PROJECT);
+       DWORD dwLeftFlags = FFILEOPEN_NONE;
+       DWORD dwRightFlags = FFILEOPEN_NONE;
+       if (!sLeft.IsEmpty())
+       {       
+               dwLeftFlags = FFILEOPEN_PROJECT;
+               if (bLeftReadOnly)
+                       dwLeftFlags |= FFILEOPEN_READONLY;
+       }
+       if (!sRight.IsEmpty())
+       {       
+               dwRightFlags = FFILEOPEN_PROJECT;
+               if (bRightReadOnly)
+                       dwRightFlags |= FFILEOPEN_READONLY;
+       }
+
 
        WriteProfileInt(_T("Settings"), _T("Recurse"), bRecursive);
-       
+
        BOOL rtn = GetMainFrame()->DoFileOpen(sLeft, sRight, dwLeftFlags, dwRightFlags, bRecursive);
        return !!rtn;
 }

diff --git a/Src/Merge.rc b/Src/Merge.rc
index f99fcbe..84e30d5 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1542,7 +1542,7 @@ BEGIN
                     WS_EX_CLIENTEDGE
 END
 
-IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 97
+IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "Paths"
@@ -1551,16 +1551,18 @@ BEGIN
     RTEXT           "&Left:",IDC_STATIC,7,11,40,8
     EDITTEXT        IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
-    RTEXT           "&Right:",IDC_STATIC,7,28,40,8
-    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,26,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,26,50,14
-    RTEXT           "&Filter:",IDC_STATIC,7,46,40,8
-    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,43,210,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,43,50,14
+    CONTROL         "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+    RTEXT           "&Right:",IDC_STATIC,7,42,40,8
+    EDITTEXT        IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+    CONTROL         "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+    RTEXT           "&Filter:",IDC_STATIC,7,74,40,8
+    EDITTEXT        IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
     CONTROL         "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,61,130,10
-    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,76,50,14
-    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,76,50,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
+    PUSHBUTTON      "Open...",IDC_PROJ_OPEN,211,103,50,14
+    PUSHBUTTON      "Save...",IDC_PROJ_SAVE,265,103,50,14
 END
 
 #ifndef _MAC

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index 614a391..857acc7 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 
 #include "Merge.h"
+#include "ProjectFile.h"
 #include "OpenDlg.h"
 #include "coretools.h"
 #include "paths.h"
@@ -38,7 +39,6 @@
 #include "OptionsDef.h"
 #include "MainFrm.h"
 #include "OptionsMgr.h"
-#include "ProjectFile.h"
 #include "dlgutil.h"
 
 #ifdef COMPILE_MULTIMON_STUBS
@@ -57,23 +57,32 @@ const UINT IDT_CHECKFILES = 1;
 const UINT CHECKFILES_TIMEOUT = 1000; // milliseconds
 static const TCHAR EMPTY_EXTENSION[] = _T(".*");
 
-/**
- * @brief Location for file compare specific help to open.
- */
+/** @brief Location for Open-dialog specific help to open. */
 static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/OpenPaths.html");
 
 /////////////////////////////////////////////////////////////////////////////
 // COpenDlg dialog
 
-
+/**
+ * @brief Standard constructor.
+ */
 COpenDlg::COpenDlg(CWnd* pParent /*=NULL*/)
        : CDialog(COpenDlg::IDD, pParent)
        , m_pathsType(DOES_NOT_EXIST)
        , m_bOverwriteRecursive(FALSE)
        , m_bRecurse(FALSE)
+       , m_pProjectFile(NULL)
 {
 }
 
+/**
+ * @brief Standard destructor.
+ */
+COpenDlg::~COpenDlg()
+{
+       delete m_pProjectFile;
+}
+
 void COpenDlg::DoDataExchange(CDataExchange* pDX)
 {
        CDialog::DoDataExchange(pDX);
@@ -606,10 +615,13 @@ BOOL COpenDlg::LoadProjectFile(CString path)
 {
        CString filterPrefix;
        CString err;
-       ProjectFile pfile;
+
+       m_pProjectFile = new ProjectFile;
+       if (m_pProjectFile == NULL)
+               return FALSE;
 
        VERIFY(filterPrefix.LoadString(IDS_FILTER_PREFIX));
-       if (!pfile.Read(path, &err))
+       if (!m_pProjectFile->Read(path, &err))
        {
                if (!err.IsEmpty())
                {
@@ -621,10 +633,10 @@ BOOL COpenDlg::LoadProjectFile(CString path)
        }
        else
        {
-               pfile.GetPaths(m_strLeft, m_strRight, m_bRecurse);
-               if (pfile.HasFilter())
+               m_pProjectFile->GetPaths(m_strLeft, m_strRight, m_bRecurse);
+               if (m_pProjectFile->HasFilter())
                {
-                       m_strExt = pfile.GetFilter();
+                       m_strExt = m_pProjectFile->GetFilter();
                        m_strExt.TrimLeft();
                        m_strExt.TrimRight();
                        if (m_strExt[0] != '*')

diff --git a/Src/OpenDlg.h b/Src/OpenDlg.h
index acba33d..dc32901 100644 (file)
--- a/Src/OpenDlg.h
+++ b/Src/OpenDlg.h
@@ -38,14 +38,17 @@
 #endif
 #include "FileTransform.h"
 
+class ProjectFile;
+
 /** @brief File open dialog displayed for user to choose directories or files */
 class COpenDlg : public CDialog
 {
 // Construction
 public:
 
-       void UpdateButtonStates();
        COpenDlg(CWnd* pParent = NULL);   // standard constructor
+       ~COpenDlg();
+       void UpdateButtonStates();
        BOOL SelectFile(CString& path, LPCTSTR pszFolder);
 
 // Dialog Data
@@ -70,11 +73,11 @@ public:
        /// unpacker info
        PackingInfo m_infoHandler;
        BOOL m_bOverwriteRecursive;  /**< If TRUE overwrite last used value of recursive */
+       ProjectFile * m_pProjectFile; /**< Project file (if loaded) */
 
 // Implementation data
 private:
-       prdlg::CMoveConstraint m_constraint; 
-
+       prdlg::CMoveConstraint m_constraint;
 
 // Overrides
        // ClassWizard generated virtual function overrides

diff --git a/Src/ProjectFile.cpp b/Src/ProjectFile.cpp
index cbb9e37..ca2faf4 100755 (executable)
--- a/Src/ProjectFile.cpp
+++ b/Src/ProjectFile.cpp
@@ -26,9 +26,15 @@
 #include "ProjectFile.h"
 #include "XmlDoc.h"
 
-ProjectFile::ProjectFile()
+
+/** 
+ * @brief Standard constructor.
+ */
+ ProjectFile::ProjectFile()
+: m_subfolders(-1)
+, m_bLeftReadOnly(FALSE)
+, m_bRightReadOnly(FALSE)
 {
-       m_subfolders = -1;
 }
 
 /** 
@@ -50,6 +56,9 @@ static BOOL NTAPI False(CException *e, CString *sError)
 
 /** 
  * @brief Open given path-file and read data from it to member variables.
+ * @param [in] path Path to project file.
+ * @param [out] sError Error string if error happened.
+ * @return TRUE if reading succeeded, FALSE if error happened.
  */
 BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
 {
@@ -58,6 +67,9 @@ BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
 
 /** 
  * @brief Save data from member variables to path-file.
+ * @param [in] path Path to project file.
+ * @param [out] sError Error string if error happened.
+ * @return TRUE if saving succeeded, FALSE if error happened.
  * @note paths are converted to UTF-8
  */
 BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
@@ -68,9 +80,16 @@ BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
        
 /** 
  * @brief Read or write project file
+ * @param [in] writing TRUE if project file is saved, FALSE if it is loaded.
+ * @param [in] path Path to project file.
+ * @param [out] sError Error string if error happened.
+ * @return TRUE if operation succeeded, FALSE if error happened.
  */
 BOOL ProjectFile::Serialize(bool writing, LPCTSTR path, CString *sError)
 {
+       int leftReadOnly = m_bLeftReadOnly ? 1 : 0;
+       int rightReadOnly = m_bRightReadOnly ? 1 : 0;
+
        try
        {
                XmlDoc::XML_LOADSAVE loadSave = (writing ? XmlDoc::XML_SAVE : XmlDoc::XML_LOAD);
@@ -84,8 +103,12 @@ BOOL ProjectFile::Serialize(bool writing, LPCTSTR path, CString *sError)
                                {
                                        XmlElement(doc, _T("left"), m_leftFile);
                                } {
+                                       XmlElement(doc, _T("left-readonly"), leftReadOnly);
+                               } {
                                        XmlElement(doc, _T("right"), m_rightFile);
                                } {
+                                       XmlElement(doc, _T("right-readonly"), rightReadOnly);
+                               } {
                                        XmlElement(doc, _T("filter"), m_filter);
                                } {
                                        XmlElement(doc, _T("subfolders"), m_subfolders);
@@ -99,6 +122,12 @@ BOOL ProjectFile::Serialize(bool writing, LPCTSTR path, CString *sError)
        {
                return False(e, sError);
        }
+
+       if (!writing)
+       {
+               m_bLeftReadOnly = (leftReadOnly == 1);
+               m_bRightReadOnly = (rightReadOnly == 1);
+       }
        return TRUE;
 }
 
@@ -136,38 +165,68 @@ BOOL ProjectFile::HasSubfolders() const
 
 /** 
  * @brief Returns left path.
+ * @param [out] pReadOnly TRUE if readonly was specified for path.
  */
-CString ProjectFile::GetLeft() const
+CString ProjectFile::GetLeft(BOOL * pReadOnly /*=NULL*/) const
 {
+       if (pReadOnly)
+               *pReadOnly = m_bLeftReadOnly;
        return m_leftFile;
 }
 
 /** 
+ * @brief Returns if left path is specified read-only.
+ */
+BOOL ProjectFile::GetLeftReadOnly() const
+{
+       return m_bLeftReadOnly;
+}
+
+/** 
  * @brief Set left path, returns old left path.
+ * @param [in] sLeft Left path.
+ * @param [in] bReadOnly Will path be recorded read-only?
  */
-CString ProjectFile::SetLeft(const CString& sLeft)
+CString ProjectFile::SetLeft(const CString& sLeft, const BOOL * pReadOnly /*=NULL*/)
 {
        CString sLeftOld = GetLeft();
        m_leftFile = sLeft;
+       if (pReadOnly)
+               m_bLeftReadOnly = *pReadOnly;
 
        return sLeftOld;
 }
 
 /** 
  * @brief Returns right path.
+ * @param [out] pReadOnly TRUE if readonly was specified for path.
  */
-CString ProjectFile::GetRight() const
+CString ProjectFile::GetRight(BOOL * pReadOnly /*=NULL*/) const
 {
+       if (pReadOnly)
+               *pReadOnly = m_bRightReadOnly;
        return m_rightFile;
 }
 
 /** 
+ * @brief Returns if right path is specified read-only.
+ */
+BOOL ProjectFile::GetRightReadOnly() const
+{
+       return m_bRightReadOnly;
+}
+
+/** 
  * @brief Set right path, returns old right path.
+ * @param [in] sRight Right path.
+ * @param [in] bReadOnly Will path be recorded read-only?
  */
-CString ProjectFile::SetRight(const CString& sRight)
+CString ProjectFile::SetRight(const CString& sRight, const BOOL * pReadOnly /*=NULL*/)
 {
        CString sRightOld = GetRight();
        m_rightFile = sRight;
+       if (pReadOnly)
+               m_bRightReadOnly = *pReadOnly;
 
        return sRightOld;
 }

diff --git a/Src/ProjectFile.h b/Src/ProjectFile.h
index e7e21c3..28c7658 100755 (executable)
--- a/Src/ProjectFile.h
+++ b/Src/ProjectFile.h
@@ -28,7 +28,9 @@ const TCHAR PROJECTFILE_EXT[] = _T("WinMerge");
 /**
  * @brief Class for handling project files.
  *
- * @todo open/save unicode paths - use UTF-8 for xml?
+ * This class handles project files, reading and saving projectdata from
+ * XML files. Jochen's Markdown -parser (@s markdown.h) is used. We use UTF-8
+ * encoding so Unicode paths are supported.
  */
 class ProjectFile
 {
@@ -42,15 +44,17 @@ public:
        BOOL HasFilter() const;
        BOOL HasSubfolders() const;
 
-       CString GetLeft() const;
-       CString GetRight() const;
+       CString GetLeft(BOOL * pReadOnly = NULL) const;
+       BOOL GetLeftReadOnly() const;
+       CString GetRight(BOOL * pReadOnly = NULL) const;
+       BOOL GetRightReadOnly() const;
        CString GetFilter() const;
        int GetSubfolders() const;
 
-       CString SetLeft(const CString& sLeft);
-       CString SetRight(const CString& sRight);
+       CString SetLeft(const CString& sLeft, const BOOL * pReadOnly = NULL);
+       CString SetRight(const CString& sRight, const BOOL * pReadOnly = NULL);
        CString SetFilter(const CString& sFilter);
-       int SetSubfolders(const int iSubfolder);
+       int SetSubfolders(int iSubfolder);
 
        void GetPaths(CString & sLeft, CString & sRight, BOOL & bSubFolders) const;
 
@@ -60,8 +64,10 @@ protected:
                TCHAR *ptag1, TCHAR *ptag2, TCHAR *pbuf);
 
 private:
-       CString m_leftFile;
-       CString m_rightFile;
-       CString m_filter;
-       int m_subfolders;
+       CString m_leftFile; /**< Left path */
+       CString m_rightFile; /**< Right path */
+       CString m_filter; /**< Filter name or mask */
+       int m_subfolders; /**< Are subfolders included (recursive scan) */
+       BOOL m_bLeftReadOnly; /**< Is left path opened as read-only */
+       BOOL m_bRightReadOnly; /**< Is right path opened as read-only */
 };

diff --git a/Src/ProjectFilePathsDlg.cpp b/Src/ProjectFilePathsDlg.cpp
index abfd94b..62e08b6 100644 (file)
--- a/Src/ProjectFilePathsDlg.cpp
+++ b/Src/ProjectFilePathsDlg.cpp
@@ -27,6 +27,8 @@ IMPLEMENT_DYNCREATE(ProjectFilePathsDlg, CPropertyPage)
  * @brief Standard constructor.
  */
 ProjectFilePathsDlg::ProjectFilePathsDlg() : CPropertyPage(ProjectFilePathsDlg::IDD)
+, m_bLeftPathReadOnly(FALSE)
+, m_bRightPathReadOnly(FALSE)
 {
        //{{AFX_DATA_INIT(ProjectFilePathsDlg)
        //}}AFX_DATA_INIT
@@ -41,6 +43,8 @@ void ProjectFilePathsDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Text(pDX, IDC_PROJ_FILTER_EDIT, m_sFilter);
        DDX_Check(pDX, IDC_PROJ_INC_SUBFOLDERS, m_bIncludeSubfolders);
        //}}AFX_DATA_MAP
+       DDX_Check(pDX, IDC_PROJFILE_LREADONLY, m_bLeftPathReadOnly);
+       DDX_Check(pDX, IDC_PROJFILE_RREADONLY, m_bRightPathReadOnly);
 }
 
 BEGIN_MESSAGE_MAP(ProjectFilePathsDlg, CDialog)
@@ -137,8 +141,8 @@ void ProjectFilePathsDlg::OnBnClickedProjOpen()
        }
        else
        {
-               m_sLeftFile = project.GetLeft();
-               m_sRightFile = project.GetRight();
+               m_sLeftFile = project.GetLeft(&m_bLeftPathReadOnly);
+               m_sRightFile = project.GetRight(&m_bRightPathReadOnly);
                m_sFilter = project.GetFilter();
                m_bIncludeSubfolders = project.GetSubfolders();
        }
@@ -159,9 +163,9 @@ void ProjectFilePathsDlg::OnBnClickedProjSave()
        ProjectFile project;
 
        if (!m_sLeftFile.IsEmpty())
-               project.SetLeft(m_sLeftFile);
+               project.SetLeft(m_sLeftFile, &m_bLeftPathReadOnly);
        if (!m_sRightFile.IsEmpty())
-               project.SetRight(m_sRightFile);
+               project.SetRight(m_sRightFile, &m_bRightPathReadOnly);
        if (!m_sFilter.IsEmpty())
                project.SetFilter(m_sFilter);
     project.SetSubfolders(m_bIncludeSubfolders);

diff --git a/Src/ProjectFilePathsDlg.h b/Src/ProjectFilePathsDlg.h
index a761cd7..dfb4e15 100644 (file)
--- a/Src/ProjectFilePathsDlg.h
+++ b/Src/ProjectFilePathsDlg.h
@@ -27,6 +27,8 @@ public:
        CString m_sRightFile;
        CString m_sFilter;
        BOOL m_bIncludeSubfolders;
+       BOOL m_bLeftPathReadOnly;
+       BOOL m_bRightPathReadOnly;
        //}}AFX_DATA
 
 protected:

diff --git a/Src/resource.h b/Src/resource.h
index 9cf9a2b..07dcf7e 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -377,7 +377,9 @@
 #define IDC_PROJ_LFILE_EDIT             1302
 #define IDC_FILTER_USER_BROWSE          1303
 #define IDC_FILTER_USER_PATH            1304
-#define IDC_FILTERCOMMENTS_CHECK        1306
+#define IDC_FILTERCOMMENTS_CHECK        1305
+#define IDC_PROJFILE_LREADONLY          1306
+#define IDC_PROJFILE_RREADONLY          1307
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605
@@ -1058,7 +1060,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        232
 #define _APS_NEXT_COMMAND_VALUE         33119
-#define _APS_NEXT_CONTROL_VALUE         1306
+#define _APS_NEXT_CONTROL_VALUE         1308
 #define _APS_NEXT_SYMED_VALUE           113
 #endif
 #endif