OSDN Git Service

PATCH: [ 1276916 ] Add Window/Close All menuitem
authorKimmo Varis <kimmov@gmail.com>
Wed, 31 Aug 2005 16:22:05 +0000 (16:22 +0000)
committerKimmo Varis <kimmov@gmail.com>
Wed, 31 Aug 2005 16:22:05 +0000 (16:22 +0000)
47 files changed:
Src/Languages/Brazilian/MergeBrazilian.rc
Src/Languages/Brazilian/resource.h
Src/Languages/Bulgarian/MergeBulgarian.rc
Src/Languages/Bulgarian/resource.h
Src/Languages/Catalan/MergeCatalan.rc
Src/Languages/Catalan/resource.h
Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
Src/Languages/ChineseSimplified/resource.h
Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
Src/Languages/ChineseTraditional/resource.h
Src/Languages/Czech/MergeCzech.rc
Src/Languages/Czech/resource.h
Src/Languages/Danish/MergeDanish.rc
Src/Languages/Danish/resource.h
Src/Languages/Dutch/MergeDutch.rc
Src/Languages/Dutch/resource.h
Src/Languages/French/MergeFrench.rc
Src/Languages/French/resource.h
Src/Languages/German/MergeGerman.rc
Src/Languages/German/resource.h
Src/Languages/Hungarian/MergeHungarian.rc
Src/Languages/Hungarian/resource.h
Src/Languages/Italian/MergeItalian.rc
Src/Languages/Italian/resource.h
Src/Languages/Japanese/MergeJapanese.rc
Src/Languages/Japanese/resource.h
Src/Languages/Korean/MergeKorean.rc
Src/Languages/Korean/resource.h
Src/Languages/Norwegian/MergeNorwegian.rc
Src/Languages/Norwegian/resource.h
Src/Languages/Polish/MergePolish.rc
Src/Languages/Polish/resource.h
Src/Languages/Russian/MergeRussian.rc
Src/Languages/Russian/resource.h
Src/Languages/Slovak/MergeSlovak.rc
Src/Languages/Slovak/resource.h
Src/Languages/Spanish/MergeSpanish.rc
Src/Languages/Spanish/resource.h
Src/Languages/Swedish/MergeSwedish.rc
Src/Languages/Swedish/resource.h
Src/Languages/Turkish/MergeTurkish.rc
Src/Languages/Turkish/resource.h
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.rc
Src/readme.txt
Src/resource.h

index a9c8526..9782654 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Ja&nela"
     BEGIN
         MENUITEM "Fechar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Ja&nela"
     BEGIN
         MENUITEM "Fechar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Ja&nela"
     BEGIN
         MENUITEM "Fechar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2646,6 +2649,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index e514f32..5689e09 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Ïðîçîðöè"
     BEGIN
         MENUITEM "Çà&òâîðè",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ñìåíè &ëèñòà\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Ïðîçîðöè"
     BEGIN
         MENUITEM "Çà&òâîðè",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ñìåíè &ëèñòà\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Ïðîçîðöè"
     BEGIN
         MENUITEM "Çà&òâîðè",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ñìåíè &ëèñòà\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2546,6 +2549,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Äà ñå âèæäà ñëåäâàùèÿ ôàéë\nÀêòèâèðàíå íà ñëåäâàùèÿ ôàéë"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index ccbf252..4e6d2f6 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "&Tanca",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Canvia de &subfinestra\tF6",     ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "&Tanca",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Canvia de &subfinestra\tF6",     ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "&Tanca",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Canvia de &subfinestra\tF6",     ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2545,6 +2548,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activa el següent fitxer visible\nActiva següent fitxer"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index f12520c..93509be 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "´°¿Ú(&W)"
     BEGIN
         MENUITEM "¹Ø±Õ",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Çл»´°¸ñ(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2512,6 +2515,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Çл»µ½ÏÂÒ»¸ö¿É¼ûµÄÎļþ´°¸ñ\nÇл»µ½Ï¸öÎļþ"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 3fcff7a..4f34410 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "µøµ¡(&W)"
     BEGIN
         MENUITEM "Ãö³¬",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Åܧ󵡮Ø(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "µøµ¡(&W)"
     BEGIN
         MENUITEM "Ãö³¬",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Åܧ󵡮Ø(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -383,6 +385,7 @@ BEGIN
     POPUP "µøµ¡(&W)"
     BEGIN
         MENUITEM "Ãö³¬",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Åܧ󵡮Ø(&P)\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2623,6 +2626,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "±Ò¥Î¤U¤@ÀÉ®×¥iµø\n±Ò¥Î¤U¤@ÀÉ®×"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 3263050..ff0a5b7 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrít",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrít",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrít",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2643,6 +2646,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 7258b45..c197cb9 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Vind&ue"
     BEGIN
         MENUITEM "&Luk",                         ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Skift panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Vind&ue"
     BEGIN
         MENUITEM "&Luk",                         ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Skift panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Vind&ue"
     BEGIN
         MENUITEM "&Luk",                         ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Skift panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2528,6 +2531,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Aktivere den næste synlige fil\nAktiver næste fil"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 28da5ab..f2b43fc 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Venster"
     BEGIN
         MENUITEM "Sluiten",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -244,6 +245,7 @@ BEGIN
     POPUP "&Venster"
     BEGIN
         MENUITEM "Sluiten",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -385,6 +387,7 @@ BEGIN
     POPUP "&Vensters"
     BEGIN
         MENUITEM "Sluiten",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Venster wijzigen\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2645,6 +2648,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Volgend zichtbaar bestand activeren\nVolgend bestand activeren"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 99c991d..6b56cd8 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Fe&nêtre"
     BEGIN
         MENUITEM "&Fermer",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "C&hanger de volet\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Fe&nêtre"
     BEGIN
         MENUITEM "&Fermer",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "C&hanger de volet\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Fe&nêtre"
     BEGIN
         MENUITEM "&Fermer",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "C&hanger de volet\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2529,6 +2532,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Basculer vers l'autre volet\nActive l'autre volet"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index b6c0fe6..8c950f3 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Fenster"
     BEGIN
         MENUITEM "&Schließen",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Ausschnitt wechseln\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -247,6 +248,7 @@ BEGIN
     POPUP "&Fenster"
     BEGIN
         MENUITEM "&Schließen",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Ausschnitt wechseln\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -388,6 +390,7 @@ BEGIN
     POPUP "&Fenster"
     BEGIN
         MENUITEM "&Schließen",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Ausschnitt wechseln\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2645,6 +2648,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Aktiviert die nächste sichtbare Datei\nAktiviere nächste Datei"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index b9eaf11..172666e 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Ablak"
     BEGIN
         MENUITEM "&Bezárás",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Panel váltása\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Ablak"
     BEGIN
         MENUITEM "&Bezárás",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Panel váltása\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Ablak"
     BEGIN
         MENUITEM "&Bezárás",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Panel váltása\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2529,6 +2532,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Következõ látható fájl aktiválása\nKövetkezõ fájl aktiválása"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 1f82544..e07c74e 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "&Chiudi",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambia &pannello\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "Chiudi",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambia &pannello\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Fi&nestra"
     BEGIN
         MENUITEM "Chiudi",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambia &pannello\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2643,6 +2646,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Attiva il prossimo file visibile\nAttiva il prossimo file"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 4fe8881..a4f27ea 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "\83E\83B\83\93\83h\83E(&W)"
     BEGIN
         MENUITEM "\95Â\82\82é(&O)",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "\83y\83C\83\93\82ð\95Ï\8dX\82·\82é(&P)\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "\83E\83B\83\93\83h\83E(&W)"
     BEGIN
         MENUITEM "\95Â\82\82é(&O)",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "\83y\83C\83\93\82ð\95Ï\8dX\82·\82é(&P)\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "\83E\83B\83\93\83h\83E(&W)"
     BEGIN
         MENUITEM "\95Â\82\82é(&O)",                  ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "\83y\83C\83\93\82ð\95Ï\8dX\82·\82é(&P)\tF6",    ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2533,6 +2536,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "\8e\9f\82Ì\83t\83@\83C\83\8b\82ð\83A\83N\83e\83B\83u\82É\82µ\82Ü\82·\n\8e\9f\82Ì\83t\83@\83C\83\8b\82ð\91I\91ð"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 4d933e1..a495716 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "â(&W)"
     BEGIN
         MENUITEM "´Ý±â",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "â(pane) À̵¿(&P)\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "â(&W)"
     BEGIN
         MENUITEM "´Ý±â",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "â(pane) À̵¿(&P)\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "â(&W)"
     BEGIN
         MENUITEM "´Ý±â",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "â(pane) À̵¿(&P)\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2526,6 +2529,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "´ÙÀ½ ÆÄÀÏÀ» È°¼ºÈ­ÇÕ´Ï´Ù\n´ÙÀ½ ÆÄÀÏ È°¼ºÈ­"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index d8c9cb4..c881d8f 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Vindu"
     BEGIN
         MENUITEM "&Lukk",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Endre vindu\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Vindu"
     BEGIN
         MENUITEM "&Lukk",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Endre vindu\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Vindu"
     BEGIN
         MENUITEM "&Lukk",                        ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Endre vindu\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2642,6 +2645,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Aktiverer neste fil synlig\nAktiverer neste fil"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index f222a10..27dc04c 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "&Zamknij",                    ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Prze³¹cz &panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "&Zamknij",                    ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Prze³¹cz &panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "&Zamknij",                    ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Prze³¹cz &panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2643,6 +2646,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Aktywuje nastêpny widoczny plik\nAktywuj nastêpny plik"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 89668ef..bd683a6 100644 (file)
@@ -148,6 +148,7 @@ BEGIN
     POPUP "&Îêíî"
     BEGIN
         MENUITEM "Çàêðûòü",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ïåðåêëþ÷èòü &Îêíî\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -247,6 +248,7 @@ BEGIN
     POPUP "&Îêíî"
     BEGIN
         MENUITEM "Çàêðûòü",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ïåðåêëþ÷èòü &Îêíî\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -393,6 +395,7 @@ BEGIN
     POPUP "&Îêíî"
     BEGIN
         MENUITEM "Çàêðûòü",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Ïåðåêëþ÷èòü &Îêíî\tF6",       ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2538,6 +2541,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Àêòèâèðîâàòü ñëåäóþùèé âèäèìûé ôàéë\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index babe8ef..f83e252 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrie\9d",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrie\9d",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "&Okno"
     BEGIN
         MENUITEM "Zavrie\9d",                     ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2643,6 +2646,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 54cd5ac..1812416 100644 (file)
@@ -145,6 +145,7 @@ BEGIN
     POPUP "Ve&ntana"
     BEGIN
         MENUITEM "&Cerrar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambiar &Panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -243,6 +244,7 @@ BEGIN
     POPUP "Ve&ntana"
     BEGIN
         MENUITEM "&Cerrar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambiar &Panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -384,6 +386,7 @@ BEGIN
     POPUP "Ve&ntana"
     BEGIN
         MENUITEM "&Cerrar",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Cambiar &Panel\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2643,6 +2646,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Cambia al siguiente panel visible\nCambiar Panel Siguiente"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 2e9a6e5..b40084c 100644 (file)
@@ -144,6 +144,7 @@ BEGIN
     POPUP "F&önster"
     BEGIN
         MENUITEM "Stäng",                       ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Växla fil\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -242,6 +243,7 @@ BEGIN
     POPUP "F&önster"
     BEGIN
         MENUITEM "Stäng",                       ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Växla fil\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -383,6 +385,7 @@ BEGIN
     POPUP "F&önster"
     BEGIN
         MENUITEM "Stäng",                       ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Växla fil\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2642,6 +2645,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Växlar mellan höger och vänster fil\nVäxla fil"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index b8f5c7f..97cfbc5 100644 (file)
@@ -144,6 +144,7 @@ BEGIN
     POPUP "Pencereler"
     BEGIN
         MENUITEM "&Kapat",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Pencere Deðitir\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -206,6 +207,8 @@ BEGIN
     END
     POPUP "&Birleþtirme"
     BEGIN
+        MENUITEM "Co&mpare\tEnter",             ID_MERGE_COMPARE
+        MENUITEM SEPARATOR
         MENUITEM "&Sonraki Fark\tAlt+Down",     ID_NEXTDIFF
         MENUITEM "&Önceki Fark\tAlt+Up",        ID_PREVDIFF
         MENUITEM SEPARATOR
@@ -240,6 +243,7 @@ BEGIN
     POPUP "Pencereler"
     BEGIN
         MENUITEM "&Kapat",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Pencere Deðitir\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -381,6 +385,7 @@ BEGIN
     POPUP "Pencereler"
     BEGIN
         MENUITEM "&Kapat",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "&Pencere Deðitir\tF6",        ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2527,6 +2532,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914
index 68bae06..9639462 100644 (file)
@@ -137,6 +137,8 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenproject)
        ON_MESSAGE(WM_COPYDATA, OnCopyData)
        ON_MESSAGE(WM_USER, OnUser)
+       ON_COMMAND(ID_WINDOW_CLOSEALL, OnWindowCloseAll)
+       ON_UPDATE_COMMAND_UI(ID_WINDOW_CLOSEALL, OnUpdateWindowCloseAll)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -2896,3 +2898,65 @@ CMainFrame::OnTimer(UINT nIDEvent)
                PostMessage(WM_CLOSE);
        }
 }
+
+/**
+ * @brief Close all open windows.
+ * 
+ * Asks about saving unsaved files and then closes all open windows.
+ */
+void CMainFrame::OnWindowCloseAll()
+{
+       // save any dirty edit views
+       MergeDocList mergedocs;
+       GetAllMergeDocs(&mergedocs);
+       for (POSITION pos = mergedocs.GetHeadPosition(); pos; mergedocs.GetNext(pos))
+       {
+               CMergeDoc * pMergeDoc = mergedocs.GetAt(pos);
+               CMergeEditView * pLeft = pMergeDoc->GetLeftView();
+               CMergeEditView * pRight = pMergeDoc->GetRightView();
+               if ((pLeft && pLeft->IsModified())
+                       || (pRight && pRight->IsModified()))
+               {
+                       // Allow user to cancel closing
+                       if (!pMergeDoc->SaveHelper(TRUE))
+                               return;
+                       else
+                       {
+                               // Set modified status to false so that we are not asking
+                               // about saving again. 
+                               pMergeDoc->m_ltBuf.SetModified(FALSE);
+                               pMergeDoc->m_rtBuf.SetModified(FALSE);
+                       }
+               }
+       }
+
+       DirDocList dirdocs;
+       GetAllDirDocs(&dirdocs);
+       while (!dirdocs.IsEmpty())
+       {
+               CDirDoc * pDirDoc = dirdocs.RemoveHead();
+               pDirDoc->CloseMergeDocs();
+               pDirDoc->OnCloseDocument();
+       }
+}
+
+/**
+ * @brief Enables Window/Close All item if there are open windows.
+ */ 
+void CMainFrame::OnUpdateWindowCloseAll(CCmdUI* pCmdUI)
+{
+       MergeDocList mergedocs;
+       GetAllMergeDocs(&mergedocs);
+       if (!mergedocs.IsEmpty())
+       {
+               pCmdUI->Enable(TRUE);
+               return;
+       }
+
+       DirDocList dirdocs;
+       GetAllDirDocs(&dirdocs);
+       if (!dirdocs.IsEmpty())
+               pCmdUI->Enable(TRUE);
+       else
+               pCmdUI->Enable(FALSE);
+}
index 4f4ab2a..a343a36 100644 (file)
@@ -239,6 +239,8 @@ protected:
        afx_msg LRESULT OnCopyData(WPARAM wParam, LPARAM lParam);
        afx_msg LRESULT OnUser(WPARAM wParam, LPARAM lParam);
        afx_msg void OnTimer(UINT nIDEvent);
+       afx_msg void OnWindowCloseAll();
+       afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 
index 9e9ed6b..d6c0bf1 100644 (file)
@@ -149,6 +149,7 @@ BEGIN
     POPUP "&Window"
     BEGIN
         MENUITEM "Cl&ose",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -251,6 +252,7 @@ BEGIN
     POPUP "&Window"
     BEGIN
         MENUITEM "Cl&ose",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -396,6 +398,7 @@ BEGIN
     POPUP "&Window"
     BEGIN
         MENUITEM "Cl&ose",                      ID_FILE_CLOSE
+        MENUITEM "Clo&se All",                  ID_WINDOW_CLOSEALL
         MENUITEM SEPARATOR
         MENUITEM "Change &Pane\tF6",            ID_WINDOW_CHANGE_PANE
         MENUITEM SEPARATOR
@@ -2544,6 +2547,7 @@ END
 STRINGTABLE
 BEGIN
     ID_WINDOW_CHANGE_PANE   "Activates next file visible\nActive next File"
+    ID_WINDOW_CLOSEALL      "Closes all open windows"
 END
 
 // HELP MENU
index b64ac28..4ba55aa 100644 (file)
@@ -2,6 +2,9 @@
  PATCH: [ 1265182 ] cannot transfer cmdargs from WinMergeU to WinMerge
   Submitted by Takashi Sawanaka
   Src: MainFrm.cpp MainFrm.h Merge.cpp
+ PATCH: [ 1276916 ] Add Window/Close All menuitem
+  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
+  Src/Languages: *.rc resource.h
 
 2005-08-30 Kimmo
  PATCH: [ 1275833 ] Fix difference navigation with ignored diffs
index 4b8a427..71cb658 100644 (file)
 #define ID_NOT_SUGGESTED_PLUGINS        32885
 #define ID_RELOAD_PLUGINS               32886
 #define ID_WINDOW_CHANGE_PANE           32896
+#define ID_WINDOW_CLOSEALL              32897
 #define ID_HELP_CONTENTS                32912
 #define ID_HELP_GETCONFIG               32913
 #define ID_HELP_GNULICENSE              32914