PATCH: [ 1198955 ] Discard all button on Save modified pane

 - submitted by Ferenc Kubatovics

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 9a33bac..f691293 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1159,6 +1159,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 58b3b24..70953f0 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index cd9f357..e24e213 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Des&carta els canvis",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "D'acord",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel·la",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 0fe0f61..3fce04b 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1145,6 +1145,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 437909e..3cb8f02 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1144,6 +1144,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index aeb528e..029b3a1 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 40e617f..75827c3 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "F&jern ændringer",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Afbryd",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 1887d76..596faab 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1158,6 +1158,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 42882f9..e3f9d4c 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1157,6 +1157,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "I&gnorer les changements",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Ann&uler",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index e4fa39e..83d0b56 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1162,6 +1162,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Änderungen ver&werfen",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Abbruch",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 3e0f974..7e4fc84 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1157,6 +1157,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Változtatások e&lvetése",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "Rendben",IDOK,149,133,50,14
     PUSHBUTTON      "Mégsem",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Hungarian/resource.h
+++ b/Src/Languages/Hungarian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index a0299ef..aa984ae 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1158,6 +1158,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Sca&rta le modifiche",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Annulla",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index c281ea5..544ec56 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1158,6 +1158,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "\95Ï\8dX\82ð\94j\8aü\82·\82é(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Japanese/resource.h
+++ b/Src/Languages/Japanese/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 360ea4f..d0a0579 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1153,6 +1153,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "ÀúÀåÇÏÁö ¾ÊÀ½(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "È®ÀÎ",IDOK,149,133,50,14
     PUSHBUTTON      "Ãë¼Ò",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 016c83b..7787fae 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1153,6 +1153,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Ka&st endringer",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Avbryt",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 5f4cc27..81980ab 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Odr&zuæ zmiany",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Anuluj",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index a9687c4..77afd52 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1170,6 +1170,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Î&òêëîíèòü èçìåíåíèÿ",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "ÎÊ",IDOK,149,133,50,14
     PUSHBUTTON      "Îòìåíà",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 891199e..be9f6ef 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 2af8289..300ced5 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1156,6 +1156,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "&Descartar cambios",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancelar",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 5e758a0..22dcd28 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1155,6 +1155,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Ign&orera ändringar",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Avbryt",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index dafb622..dd64696 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -179,6 +179,8 @@ BEGIN
         MENUITEM "Ko&pyala\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "&Yapýþtýr\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "&Seçenekler...",              ID_OPTIONS
         MENUITEM SEPARATOR
         MENUITEM "Ta&zele\tF5",                 ID_REFRESH
@@ -319,7 +321,6 @@ BEGIN
             MENUITEM "&Copy With Line Numbers\tCtrl+Shift+C",
                                                     ID_EDIT_COPY_LINENUMBERS
         END
-        MENUITEM SEPARATOR
         MENUITEM "&Git...\tCtrl+G",             ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Seçenekler...",              ID_OPTIONS
@@ -358,7 +359,6 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Tümünü Saða Kopyala",        ID_ALL_RIGHT
         MENUITEM "T&ümünü Sola Kopyala",        ID_ALL_LEFT
-        MENUITEM SEPARATOR
     END
     POPUP "&Araçlar"
     BEGIN
@@ -408,20 +408,14 @@ BEGIN
         POPUP "&Copy"
         BEGIN
             MENUITEM "&Left to Right",              ID_DIR_COPY_LEFT_TO_RIGHT
-
             MENUITEM "L&eft to...",                 ID_DIR_COPY_LEFT_TO_BROWSE
-
             MENUITEM "&Right to Left",              ID_DIR_COPY_RIGHT_TO_LEFT
-
             MENUITEM "R&ight to...",                ID_DIR_COPY_RIGHT_TO_BROWSE
-
         END
         POPUP "&Move"
         BEGIN
             MENUITEM "&Left to...",                 ID_DIR_MOVE_LEFT_TO_BROWSE
-
             MENUITEM "&Right to...",                ID_DIR_MOVE_RIGHT_TO_BROWSE
-
         END
         POPUP "&Delete"
         BEGIN
@@ -429,30 +423,26 @@ BEGIN
             MENUITEM "&Right",                      ID_DIR_DEL_RIGHT
             MENUITEM "&Both",                       ID_DIR_DEL_BOTH
         END
+        MENUITEM "&Hide Files",                     ID_DIR_HIDE_FILENAMES
         MENUITEM SEPARATOR
         POPUP "&Open Left"
         BEGIN
             MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT
             MENUITEM "with &External Editor",       ID_DIR_OPEN_LEFT_WITHEDITOR
-
             MENUITEM "&with...",                    ID_DIR_OPEN_LEFT_WITH
         END
         POPUP "O&pen Right"
         BEGIN
             MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT
             MENUITEM "with &External Editor",       ID_DIR_OPEN_RIGHT_WITHEDITOR
-
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
         POPUP "Cop&y Pathnames"
         BEGIN
             MENUITEM "&Left (%1 of %2)",            ID_DIR_COPY_PATHNAMES_LEFT
-
             MENUITEM "&Right (%1 of %2)",           ID_DIR_COPY_PATHNAMES_RIGHT
-
             MENUITEM "&Both (%1 of %2)",            ID_DIR_COPY_PATHNAMES_BOTH
-
         END
         MENUITEM "Copy &Filenames",             ID_DIR_COPY_FILENAMES
         MENUITEM SEPARATOR
@@ -462,7 +452,6 @@ BEGIN
             MENUITEM "&Right... (%1 of %2)",        ID_DIR_ZIP_RIGHT
             MENUITEM "&Both... (%1 of %2)",         ID_DIR_ZIP_BOTH
             MENUITEM "&Differences... (%1 of %2)",  ID_DIR_ZIP_BOTH_DIFFS_ONLY
-
         END
     END
     POPUP "_HDR_POPUP_"
@@ -1168,6 +1157,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/Languages/Turkish/resource.h b/Src/Languages/Turkish/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/Languages/Turkish/resource.h
+++ b/Src/Languages/Turkish/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 6344f38..d58a5bf 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1157,6 +1157,7 @@ BEGIN
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
     CONTROL         "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
                     BS_AUTORADIOBUTTON,16,109,230,10
+    PUSHBUTTON      "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
     DEFPUSHBUTTON   "OK",IDOK,149,133,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,205,133,50,14
 END

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 42a7944..adb121d 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2324,13 +2324,13 @@ BOOL CMergeDoc::SaveHelper(BOOL bAllowCancel)
 
        if (dlg.DoModal() == IDOK)
        {
-               if (bLModified && dlg.m_leftSave == 0)
+               if (bLModified && dlg.m_leftSave == SAVECLOSING_SAVE)
                {
                        if (!DoSave(m_filePaths.GetLeft(), bLSaveSuccess, TRUE))
                                result = FALSE;
                }
 
-               if (bRModified && dlg.m_rightSave == 0)
+               if (bRModified && dlg.m_rightSave == SAVECLOSING_SAVE)
                {
                        if (!DoSave(m_filePaths.GetRight(), bRSaveSuccess, FALSE))
                                result = FALSE;

diff --git a/Src/SaveClosingDlg.cpp b/Src/SaveClosingDlg.cpp
index 6b9358a..9b934f7 100644 (file)
--- a/Src/SaveClosingDlg.cpp
+++ b/Src/SaveClosingDlg.cpp
@@ -40,8 +40,8 @@ SaveClosingDlg::SaveClosingDlg(CWnd* pParent /*=NULL*/)
        : CDialog(SaveClosingDlg::IDD, pParent)
 {
        //{{AFX_DATA_INIT(SaveClosingDlg)
-       m_leftSave = 0; // Default to save
-       m_rightSave = 0;
+       m_leftSave = SAVECLOSING_SAVE; // Default to save
+       m_rightSave = SAVECLOSING_SAVE;
        m_bAskForLeft = FALSE;
        m_bAskForRight = FALSE;
        m_bDisableCancel = FALSE;
@@ -62,6 +62,7 @@ void SaveClosingDlg::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(SaveClosingDlg, CDialog)
        //{{AFX_MSG_MAP(SaveClosingDlg)
+       ON_BN_CLICKED(IDC_SAVECLOSING_DISCARDALL, OnDiscardAll)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -110,3 +111,14 @@ void SaveClosingDlg::DoAskFor(BOOL bLeft /*= FALSE*/, BOOL bRight /*= FALSE*/)
        m_bAskForLeft = bLeft;
        m_bAskForRight = bRight;
 }
+
+/** 
+ * @brief Called when 'Discard All' button is selected.
+ */
+void SaveClosingDlg::OnDiscardAll()
+{
+       m_leftSave = SAVECLOSING_DISCARD;
+       m_rightSave = SAVECLOSING_DISCARD;
+       UpdateData(FALSE);
+       OnOK();
+}

diff --git a/Src/SaveClosingDlg.h b/Src/SaveClosingDlg.h
index f29a8a9..e74eb9e 100644 (file)
--- a/Src/SaveClosingDlg.h
+++ b/Src/SaveClosingDlg.h
@@ -26,6 +26,15 @@
 #ifndef _SAVECLOSINGDLG_H_
 #define _SAVECLOSINGDLG_H_
 
+/** 
+ * @brief Choices for modified files: save/discard changes.
+ */
+enum SAVECLOSING_CHOICE
+{
+       SAVECLOSING_SAVE = 0, //*< Save changes */
+       SAVECLOSING_DISCARD,  //*< Discard changes */
+};
+
 /////////////////////////////////////////////////////////////////////////////
 // SaveClosingDlg dialog
 
@@ -61,6 +70,7 @@ protected:
        // Generated message map functions
        //{{AFX_MSG(SaveClosingDlg)
        afx_msg BOOL OnInitDialog();
+       afx_msg void OnDiscardAll();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 

diff --git a/Src/readme.txt b/Src/readme.txt
index e4402f9..0d06152 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,10 @@
 2005-05-11 Kimmo
  PATCH: [ 1199194 ] Optimization for difflist
   Src: DiffList.cpp DiffList.h
+ PATCH: [ 1198955 ] Discard all button on Save modified pane
+  Submitted by Ferenc Kubatovics
+  Src: Merge.rc MergeDoc.cpp resource.h SaveClosingDlg.cpp SaveClosingDlg.h
+  Src/Languages: *.rc resource.h
 
 2005-05-10 Perry
  BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files

diff --git a/Src/resource.h b/Src/resource.h
index 9ede311..baaa7e3 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -264,6 +264,7 @@
 #define IDC_SCOLOR_PREPROCESSOR_BOLD    1185
 #define IDC_SCOLOR_USER1_BOLD           1186
 #define IDC_SCOLOR_USER2_BOLD           1187
+#define IDC_SAVECLOSING_DISCARDALL      1188
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605