[ 728542 ] Automatic rescan enable/disable

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 365660e..5fab0a9 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -123,7 +123,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Vlastnosti",                 ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "&Pohled"
     BEGIN
@@ -285,33 +285,36 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Nastavení",IDC_STATIC,7,7,242,92
+    GROUPBOX        "Nastavení",IDC_STATIC,7,7,221,94
     CONTROL         "&Zálohovat originální soubory",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,21,202,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,202,10
     CONTROL         "Automatický &skok na první rozdíl",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,129,10
+                    17,30,129,10
     CONTROL         "Ignorovat prázdné øád&ky",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,71,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,71,10
     CONTROL         "Ignorovat m&alá/VELKÁ",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,53,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,53,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,125,45,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,125,56,96,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
+                    BS_AUTORADIOBUTTON,125,67,83,10
     GROUPBOX        "Tabelátory",IDC_STATIC,7,105,221,30,WS_GROUP
-    LTEXT           "&Nastavení tabulátorù:",IDC_STATIC,15,119,30,8
-    EDITTEXT        IDC_TAB_EDIT,47,117,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
+    LTEXT           "&Nastavení tabulátorù:",IDC_STATIC,15,119,80,8
+    EDITTEXT        IDC_TAB_EDIT,90,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,120,113,51,10
     CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+                    BS_AUTORADIOBUTTON,120,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -637,7 +640,7 @@ BEGIN
     ID_HIDE_BACKUP_FILES    "Skrýt soubory s pøíponou BAK"
     ID_HELP_GNULICENSE      "Zobrazit GNU licenci"
     ID_USEVSS               "Attempts to checkout read-only files from sourcesafe"
-    ID_OPTIONS              "Nastavit mo\9enosti programu\nProperties"
+    ID_OPTIONS              "Nastavit mo\9enosti programu\nOptions"
     ID_ALL_LEFT             "Zkopírovat v\9aechny rozdíly do souboru vlevo\nAll Left"
     ID_ALL_RIGHT            "Zkopírovat v\9aechny rozdíly do souboru vpravo\nAll Right"
     ID_VIEW_SELECTFONT      "Nastavení písma pro zobrazení porovnávaných dokumentù\nSelect Diff Font"

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 43bbce4..df0f976 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -122,7 +122,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Egenskaber...",              ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "&Vis"
     BEGIN
@@ -297,30 +297,33 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generelt"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Indstillinger",IDC_STATIC,7,7,221,92
+    GROUPBOX        "Indstillinger",IDC_STATIC,7,7,221,94
     CONTROL         "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,21,81,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,81,10
     CONTROL         "Automatisk &scroll til første forskel",IDC_SCROLL_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,34,117,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,117,10
     CONTROL         "Ignorer blan&ke linjer",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,77,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,77,10
     CONTROL         "Ignorer store/små &bogstaver",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,105,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,105,10
+    CONTROL         "Sensitive for &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,71,10
     CONTROL         "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,79,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,79,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Sammenlign &mellemrum",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,121,46,89,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,121,45,89,10
     CONTROL         "Ignorer mellemrumsæ&ndringer",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,121,57,108,10
+                    BS_AUTORADIOBUTTON,121,56,108,10
     CONTROL         "Ignorer &alle mellemrum",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,121,68,85,10
+                    BS_AUTORADIOBUTTON,121,67,85,10
     GROUPBOX        "Tabulator",IDC_STATIC,7,105,221,30,WS_GROUP
     LTEXT           "&Tabulator størrelse:",IDC_STATIC,15,119,61,8
-    EDITTEXT        IDC_TAB_EDIT,81,116,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive for &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,71,10
+    EDITTEXT        IDC_TAB_EDIT,81,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Indsæt tabulatorer",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,112,73,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,113,73,10
     CONTROL         "Indsæt mellemrum",IDC_PROP_INSERT_SPACES,"Button",
                     BS_AUTORADIOBUTTON,128,122,73,10
 END

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 20f27a7..64a5c12 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -122,7 +122,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Eigenschappen...",           ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "B&eeld"
     BEGIN
@@ -283,34 +283,37 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Instellingen",IDC_STATIC,7,7,221,80
+    GROUPBOX        "Instellingen",IDC_STATIC,7,7,221,94
     CONTROL         "&Reservekopie orginele bestand",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,21,114,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,114,10
     CONTROL         "&Automatisch naar eerste verschil gaan",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,34,136,10
+                    17,30,136,10
     CONTROL         "&Negeer lege regels",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,75,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,75,10
     CONTROL         "Negeer vers&chil Hoofd/kleine letters",
                     IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,57,129,10
+                    17,52,129,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,65,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,128,76,96,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
+                    BS_AUTORADIOBUTTON,128,87,83,10
     GROUPBOX        "Tabs",IDC_STATIC,7,105,221,30,WS_GROUP
     LTEXT           "&Tab maat:",IDC_STATIC,15,119,33,8
-    EDITTEXT        IDC_TAB_EDIT,47,117,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
+    EDITTEXT        IDC_TAB_EDIT,51,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,99,113,51,10
     CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+                    BS_AUTORADIOBUTTON,99,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 3902453..8e52ae9 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -122,7 +122,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Pr&opriétés",                 ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "&Affichage"
     BEGIN
@@ -276,21 +276,36 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Paramètres :",IDC_STATIC,7,7,221,78
+    GROUPBOX        "Paramètres :",IDC_STATIC,7,7,221,94
     CONTROL         "&Sauvegarder les fichiers originaux.",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,121,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,121,10
     CONTROL         "&Défilement automatique jusqu'à la première différence.",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,183,10
-    CONTROL         "Ignorer les &espaces.",IDC_WHITESPACE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,77,10
+                    17,30,183,10
     CONTROL         "Ignorer les lignes &vides.",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,87,10
     CONTROL         "Ignorer la &casse.",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,69,66,10
-    GROUPBOX        "Tabulations :",IDC_STATIC,7,92,221,30
-    LTEXT           "&Taille des tabulations :",IDC_STATIC,15,106,71,8
-    EDITTEXT        IDC_TAB_EDIT,91,105,27,12,ES_AUTOHSCROLL
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,66,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
+    CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
+    CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,125,45,82,10
+    CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
+                    BS_AUTORADIOBUTTON,125,56,96,10
+    CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
+                    BS_AUTORADIOBUTTON,125,67,83,10
+    GROUPBOX        "Tabulations :",IDC_STATIC,7,105,221,30
+    LTEXT           "&Taille des tabulations :",IDC_STATIC,15,119,71,8
+    EDITTEXT        IDC_TAB_EDIT,90,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
+    CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,120,113,51,10
+    CONTROL         "I&nsert Spaces",IDC_PROP_INSERT_SPACES,"Button",
+                    BS_AUTORADIOBUTTON,120,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 62bd1ab..1177180 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -284,33 +284,36 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Einstellungen",IDC_STATIC,7,7,221,76
+    GROUPBOX        "Einstellungen",IDC_STATIC,7,7,221,94
     CONTROL         "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,121,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,121,10
     CONTROL         "Anzeige automatisch auf den ersten Unterschied &positionieren",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,210,10
+                    17,30,210,10
     CONTROL         "Leer&zeilen ignorieren",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,81,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,81,10
     CONTROL         "&Groß-/Kleinschreibung ignorieren",IDC_IGNCASE_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,57,119,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,52,119,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,65,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,128,76,100,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
-    GROUPBOX        "Tabulatoren",IDC_STATIC,7,105,221,30
+                    BS_AUTORADIOBUTTON,128,87,83,10
+    GROUPBOX        "Tabulatoren",IDC_STATIC,7,105,221,30,WS_GROUP
     LTEXT           "&Tabulator-Größe:",IDC_STATIC,15,119,54,8
-    EDITTEXT        IDC_TAB_EDIT,72,117,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
+    EDITTEXT        IDC_TAB_EDIT,72,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,99,113,51,10
     CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+                    BS_AUTORADIOBUTTON,99,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 56dae73..cbf06ba 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -121,7 +121,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Opzioni",                    ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "&Visualizza"
     BEGIN
@@ -296,34 +296,37 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Impostazioni",IDC_STATIC,7,7,221,78
+    GROUPBOX        "Impostazioni",IDC_STATIC,7,7,221,94
     CONTROL         "&Esegui il backup del file originale",IDC_BACKUP_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,118,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,118,10
     CONTROL         "&Visualizza automaticamente la prima differenza",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,161,10
+                    17,30,161,10
     CONTROL         "I&gnora le linee vuote",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,80,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,80,10
     CONTROL         "Ig&nora le differenze fra maiuscole e minuscole",
                     IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,69,159,10
+                    17,52,159,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,65,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,128,76,100,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
-    GROUPBOX        "Tabulazioni",IDC_STATIC,7,92,221,30
-    LTEXT           "&Dimensione delle tabulazioni:",IDC_STATIC,15,106,92,8
-    EDITTEXT        IDC_TAB_EDIT,110,105,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
+                    BS_AUTORADIOBUTTON,128,87,83,10
+    GROUPBOX        "Tabulazioni",IDC_STATIC,7,105,221,30
+    LTEXT           "&Dimensione delle tabulazioni:",IDC_STATIC,15,119,92,8
+    EDITTEXT        IDC_TAB_EDIT,110,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,140,113,51,10
     CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+                    BS_AUTORADIOBUTTON,140,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 2b723a7..5c3ae34 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -122,7 +122,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Pr&opiedades...",              ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&scar\tF5",                ID_REFRESH
+        MENUITEM "Refre&scar\tF5",               ID_REFRESH
     END
     POPUP "&Vista"
     BEGIN
@@ -296,33 +296,36 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Opciones",IDC_STATIC,7,7,242,92
+    GROUPBOX        "Opciones",IDC_STATIC,7,7,221,94
     CONTROL         "&Guardar el archivo original",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,21,98,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,98,10
     CONTROL         "Moverse automaticamente a la primera diferencia",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,165,10
+                    17,30,175,10
     CONTROL         "Ignorar diferencias de lineas vacias",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,127,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,160,10
     CONTROL         "Ignorar diferencias de mayúsculas/minúsculas",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,103,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,160,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,128,65,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,128,76,96,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
+                    BS_AUTORADIOBUTTON,128,87,83,10
     GROUPBOX        "Tabs",IDC_STATIC,7,105,221,30,WS_GROUP
-    LTEXT           "&Magnitud de Tab:",IDC_STATIC,15,119,108,8
-    EDITTEXT        IDC_TAB_EDIT,47,117,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
+    LTEXT           "&Magnitud de Tab:",IDC_STATIC,15,119,60,8
+    EDITTEXT        IDC_TAB_EDIT,75,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
     CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,105,113,51,10
     CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+                    BS_AUTORADIOBUTTON,105,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 3972200..9a1e8e9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -121,6 +121,7 @@ CMainFrame::CMainFrame()
        m_strSaveAsPath = _T("");
        m_bFirstTime = TRUE;
 
+       m_bAutomaticRescan = theApp.GetProfileInt(_T("Settings"), _T("AutomaticRescan"), TRUE)!=0;
        m_bIgnoreBlankLines = theApp.GetProfileInt(_T("Settings"), _T("IgnoreBlankLines"), FALSE)!=0;
        m_bEolSensitive = theApp.GetProfileInt(_T("Settings"), _T("EolSensitive"), FALSE)!=0;
        m_bIgnoreCase = theApp.GetProfileInt(_T("Settings"), _T("IgnoreCase"), FALSE)!=0;
@@ -308,8 +309,6 @@ void CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc, LPCTSTR szLeft, LPCTSTR szRight
        pMergeDoc->m_ltBuf.SetEolSensitivity(m_bEolSensitive);
        pMergeDoc->m_rtBuf.SetEolSensitivity(m_bEolSensitive);
 
-       
-
        CString sError;
        if (!pMergeDoc->m_ltBuf.LoadFromFile(szLeft))
        {
@@ -347,6 +346,10 @@ void CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc, LPCTSTR szLeft, LPCTSTR szRight
                        pLeft->SelectDiff(0, TRUE, FALSE);
                }
 
+               // Enable/disable automatic rescan (rescanning after edit)
+               pLeft->EnableRescan(m_bAutomaticRescan);
+               pRight->EnableRescan(m_bAutomaticRescan);
+
                // set the document types
                CString sname, sext;
                SplitFilename(szLeft, 0, &sname, &sext);
@@ -354,7 +357,6 @@ void CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc, LPCTSTR szLeft, LPCTSTR szRight
                SplitFilename(szRight, 0, &sname, &sext);
                pRight->SetTextType(sext);
 
-                       
                // SetTextType will revert to language dependent defaults for tab
                pLeft->SetTabSize(mf->m_nTabSize);
                pRight->SetTabSize(mf->m_nTabSize);
@@ -726,6 +728,7 @@ void CMainFrame::OnOptions()
        gen.m_nTabSize = m_nTabSize;
        gen.m_nTabType = m_nTabType;
        gen.m_bDisableSplash = theApp.m_bDisableSplash;
+       gen.m_bAutomaticRescan = m_bAutomaticRescan;
 
        syn.m_bHiliteSyntax = theApp.m_bHiliteSyntax;
        filter.m_bIgnoreRegExp = m_bIgnoreRegExp;
@@ -741,6 +744,7 @@ void CMainFrame::OnOptions()
                m_nTabSize = gen.m_nTabSize;
                m_nTabType = gen.m_nTabType;
                theApp.m_bDisableSplash = gen.m_bDisableSplash;
+               m_bAutomaticRescan = gen.m_bAutomaticRescan;
 
                m_nIgnoreWhitespace = gen.m_nIgnoreWhite;
                ignore_all_space_flag = (m_nIgnoreWhitespace==2);
@@ -766,6 +770,7 @@ void CMainFrame::OnOptions()
                theApp.WriteProfileInt(_T("Settings"), _T("TabSize"), m_nTabSize);
                theApp.WriteProfileInt(_T("Settings"), _T("TabType"), m_nTabType);
                theApp.WriteProfileInt(_T("Settings"), _T("EolSensitive"), m_bEolSensitive);
+               theApp.WriteProfileInt(_T("Settings"), _T("AutomaticRescan"), m_bAutomaticRescan);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreBlankLines"), m_bIgnoreBlankLines);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreCase"), m_bIgnoreCase);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreRegExp"), m_bIgnoreRegExp);
@@ -787,6 +792,10 @@ void CMainFrame::OnOptions()
                        CMergeEditView * pLeft = pMergeDoc->GetLeftView();
                        CMergeEditView * pRight = pMergeDoc->GetRightView();
 
+                       // Enable/disable automatic rescan (rescan after editing)
+                       pLeft->EnableRescan(m_bAutomaticRescan);
+                       pRight->EnableRescan(m_bAutomaticRescan);
+
                        // Set tab type (tabs/spaces)
                        if (m_nTabType == 0)
                        {

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 8bad3fe..aebbaa5 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -67,6 +67,7 @@ public:
        BOOL m_bFontSpecified;
        BOOL m_bEolSensitive;
        BOOL m_bReuseDirDoc; // policy to reuse existing dir doc
+       BOOL m_bAutomaticRescan;
 
 // Operations
 public:

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 706e87e..82bfc79 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -122,7 +122,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Options...",                 ID_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "Refre&sh\tF5",                 ID_REFRESH
+        MENUITEM "Refre&sh\tF5",                ID_REFRESH
     END
     POPUP "&View"
     BEGIN
@@ -291,38 +291,41 @@ BEGIN
     LTEXT           "&Versioning System",IDC_STATIC,16,22,60,10
 END
 
-IDD_PROPPAGE_LARGE DIALOG DISCARDABLE  0, 0, 235, 156
+IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 156
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Settings",IDC_STATIC,7,7,242,92
+    GROUPBOX        "Settings",IDC_STATIC,7,7,221,94
     CONTROL         "&Backup original file",IDC_BACKUP_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,21,75,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,19,75,10
     CONTROL         "Automatically &scroll to first difference",
                     IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    17,33,129,10
+                    17,30,129,10
     CONTROL         "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,45,71,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,41,71,10
     CONTROL         "Ignore &case",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,57,53,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,52,53,10
+    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,63,69,10
     CONTROL         "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,81,87,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,74,87,10
+    CONTROL         "Automatic &rescan",IDC_AUTOMRESCAN_CHECK,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,17,85,71,10
     CONTROL         "Compare &whitespace",IDC_WHITESPACE,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,128,45,82,10
+                    BS_AUTORADIOBUTTON | WS_GROUP,125,45,82,10
     CONTROL         "Ignore whitespace c&hange",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,128,57,100,10
+                    BS_AUTORADIOBUTTON,125,56,96,10
     CONTROL         "Ignore &all whitespace",IDC_ALL_WHITE,"Button",
-                    BS_AUTORADIOBUTTON,128,69,83,10
+                    BS_AUTORADIOBUTTON,125,67,83,10
     GROUPBOX        "Tabs",IDC_STATIC,7,105,221,30,WS_GROUP
     LTEXT           "&Tab size:",IDC_STATIC,15,119,30,8
-    EDITTEXT        IDC_TAB_EDIT,47,117,27,12,ES_AUTOHSCROLL
-    CONTROL         "Sensitive to &EOL",IDC_EOL_SENSITIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,17,68,69,10
-    CONTROL         "Insert Tabs",IDC_PROP_INSERT_TABS,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP,99,112,51,10
-    CONTROL         "Insert Spaces",IDC_PROP_INSERT_SPACES,"Button",
-                    BS_AUTORADIOBUTTON,99,123,59,10
+    EDITTEXT        IDC_TAB_EDIT,47,117,22,12,ES_AUTOHSCROLL | ES_NUMBER,
+                    WS_EX_RIGHT
+    CONTROL         "Insert &Tabs",IDC_PROP_INSERT_TABS,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,79,113,51,10
+    CONTROL         "I&nsert Spaces",IDC_PROP_INSERT_SPACES,"Button",
+                    BS_AUTORADIOBUTTON,79,122,59,10
 END
 
 IDD_LANGUAGE_SELECT DIALOG DISCARDABLE  0, 0, 213, 111
@@ -499,7 +502,7 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 228
-        VERTGUIDE, 128
+        VERTGUIDE, 125
         TOPMARGIN, 7
         BOTTOMMARGIN, 149
     END

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index a5466ef..ea138be 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -25,9 +25,10 @@ IMPLEMENT_DYNCREATE(CMergeEditView, CCrystalEditViewEx)
 
 CMergeEditView::CMergeEditView()
 {
-       m_bIsLeft=FALSE;
-       m_nModifications=0;
-  SetParser (&m_xParser);
+       m_bIsLeft = FALSE;
+       m_nModifications = 0;
+       SetParser(&m_xParser);
+       m_bAutomaticRescan = FALSE;
 }
 
 CMergeEditView::~CMergeEditView()
@@ -679,17 +680,21 @@ void CMergeEditView::OnEditOperation(int nAction, LPCTSTR pszText)
        CPoint ptCursorPos = GetCursorPos ();
        m_pTextBuffer->SetLineFlag(ptCursorPos.y, LF_WINMERGE_FLAGS, FALSE, FALSE, FALSE);
 
-       // keep document up to date
-       // (Re)start timer to rescan only when user edits text
-       // If timer starting fails, rescan immediately
-       if (nAction == CE_ACTION_TYPING ||
-               nAction == CE_ACTION_BACKSPACE)
+       // If automatic rescan enabled, rescan after edit events
+       if (m_bAutomaticRescan)
        {
-               if (!SetTimer(IDT_RESCAN, RESCAN_TIMEOUT, NULL))
+               // keep document up to date
+               // (Re)start timer to rescan only when user edits text
+               // If timer starting fails, rescan immediately
+               if (nAction == CE_ACTION_TYPING ||
+                       nAction == CE_ACTION_BACKSPACE)
+               {
+                       if (!SetTimer(IDT_RESCAN, RESCAN_TIMEOUT, NULL))
+                               pDoc->FlushAndRescan();
+               }
+               else
                        pDoc->FlushAndRescan();
        }
-       else
-               pDoc->FlushAndRescan();
 }
 
 void CMergeEditView::OnEditRedo()
@@ -784,3 +789,10 @@ void CMergeEditView::OnRefresh()
        ASSERT(pd);
        pd->FlushAndRescan(TRUE);
 }
+
+BOOL CMergeEditView::EnableRescan(BOOL bEnable)
+{
+       BOOL bOldValue = m_bAutomaticRescan;
+       m_bAutomaticRescan = bEnable;
+       return bOldValue;
+}

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 039e434..67c36d9 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -34,8 +34,13 @@ public:
        BOOL m_bIsLeft;
        LONG m_nModifications;
 
+protected:
+       // Controls if rescan is done after edit events
+       BOOL m_bAutomaticRescan;
+
 // Operations
 public:
+       BOOL EnableRescan(BOOL bEnable);
        void ShowDiff(BOOL bScroll, BOOL bSelectText);
        virtual void OnEditOperation(int nAction, LPCTSTR pszText);
        void UpdateLineLengths();

diff --git a/Src/PropGeneral.cpp b/Src/PropGeneral.cpp
index d147ae1..276cafa 100644 (file)
--- a/Src/PropGeneral.cpp
+++ b/Src/PropGeneral.cpp
@@ -48,6 +48,7 @@ CPropGeneral::CPropGeneral() : CPropertyPage(CPropGeneral::IDD)
        m_bDisableSplash = FALSE;
        m_nIgnoreWhite = -1;
        m_nTabType = 0;
+       m_bAutomaticRescan = FALSE;
        //}}AFX_DATA_INIT
 }
 
@@ -68,6 +69,7 @@ void CPropGeneral::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
        DDX_Radio(pDX, IDC_WHITESPACE, m_nIgnoreWhite);
        DDX_Radio(pDX, IDC_PROP_INSERT_TABS, m_nTabType);
+       DDX_Check(pDX, IDC_AUTOMRESCAN_CHECK, m_bAutomaticRescan);
        DDV_MinMaxInt( pDX, m_nTabSize, 0, 64 );
        //}}AFX_DATA_MAP
 }

diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h
index e61b769..f29ca30 100644 (file)
--- a/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@ -31,6 +31,7 @@ public:
        BOOL    m_bDisableSplash;
        int             m_nIgnoreWhite;
        int             m_nTabType;
+       BOOL    m_bAutomaticRescan; 
        //}}AFX_DATA
 
 

diff --git a/Src/readme.txt b/Src/readme.txt
index a523636..7ff5927 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2003-04-29 Kimmo
+ PATCH: [ 728542 ] Automatic rescan enable/disable
+  WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeEditView.h MergeEditView.cpp
+   PropGeneral.h PropGeneral.cpp resource.h
+   Updated other languages too
+
 2003-04-28 Kimmo
  PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
   WinMerge: MergeDoc.cpp MergeEditView.cpp

diff --git a/Src/resource.h b/Src/resource.h
index 7c86ca2..bf37f41 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -153,6 +153,7 @@
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
 #define IDC_LANGUAGE_LIST               1037
+#define IDC_AUTOMRESCAN_CHECK           1038
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -339,7 +340,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1038
+#define _APS_NEXT_CONTROL_VALUE         1039
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif