PATCH: [ 962509 ] Copy pathnames and filenames from directory compare

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 7a8344e..42c9e2a 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -158,6 +158,8 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll)
        ON_COMMAND_RANGE(ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO, OnPluginPredifferMode)
        ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO, OnUpdatePluginPredifferMode)
+       ON_COMMAND(ID_DIR_COPY_PATHNAMES, OnCopyPathnames)
+       ON_COMMAND(ID_DIR_COPY_FILENAMES, OnCopyFilenames)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
@@ -2200,3 +2202,56 @@ void CDirView::RefreshOptions()
        m_bEscCloses = mf->m_options.GetInt(OPT_CLOSE_WITH_ESC);
 }
 
+/**
+ * @brief Copy selected item paths (containing filenames) to clipboard.
+ */
+void CDirView::OnCopyPathnames()
+{
+       CDiffContext *pCtx = GetDiffContext();
+       CString strPaths;
+       int sel = -1;
+
+       while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
+       {
+               const DIFFITEM& di = GetDiffItem(sel);
+               if (!di.isSideRight())
+               {
+                       strPaths += di. getLeftFilepath(pCtx);
+                       strPaths += _T("\\");
+                       if (!di.isDirectory())
+                               strPaths += di.sfilename;
+                       strPaths += _T("\n");
+               }
+
+               if (!di.isSideLeft())
+               {
+                       strPaths += di. getRightFilepath(pCtx);
+                       strPaths += _T("\\");
+                       if (!di.isDirectory())
+                               strPaths += di.sfilename;
+                       strPaths += _T("\n");
+               }
+       }
+       PutToClipboard(strPaths, mf->GetSafeHwnd());
+}
+
+/**
+ * @brief Copy selected item filenames to clipboard.
+ */
+void CDirView::OnCopyFilenames()
+{
+       CDiffContext *pCtx = GetDiffContext();
+       CString strPaths;
+       int sel = -1;
+
+       while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
+       {
+               const DIFFITEM& di = GetDiffItem(sel);
+               if (!di.isDirectory())
+               {
+                       strPaths += di.sfilename;
+                       strPaths += _T("\n");
+               }
+       }
+       PutToClipboard(strPaths, mf->GetSafeHwnd());
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index 5a1b7c7..9cb7e73 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -294,6 +294,8 @@ protected:
        afx_msg void OnUpdateSelectAll(CCmdUI* pCmdUI);
        afx_msg void OnPluginPredifferMode(UINT nID);
        afx_msg void OnUpdatePluginPredifferMode(CCmdUI* pCmdUI);
+       afx_msg void OnCopyPathnames();
+       afx_msg void OnCopyFilenames();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index fc3ae69..e7a7476 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1533,6 +1536,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Abrir o arquivo a direita com..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index dd8c31b..006f8c3 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&ñ...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &ëÿâàòà ñòðàíà %1 ôàéë(à) îò %2 èçáðàíèÿ îáåêò(è)",
@@ -1417,6 +1420,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Îòâàðÿíå íà äåñíèÿ ôàéë ñ âúíøåí ðåäàêòîð"
     ID_DIR_OPEN_RIGHT_WITH  "Îòâàðÿíå íà äåñíèÿ ôàéë ñ..."
     IDS_CANNOT_EXECUTE_FILE "Íåìîæå äà ñòàðòèðà %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 2c10b57..d2d654e 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "amb...",                     ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1545,6 +1548,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Obre el fitxer de la dreta amb..."
     IDS_CANNOT_EXECUTE_FILE "No es pot executar el %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 3d78f66..eb7045c 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -270,6 +270,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1403,6 +1406,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "´ò¿ªÓÒ±ßÎļþÒÔ..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index b613ebd..def31a2 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1517,6 +1520,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "¶}±Ò¥kÃäÀÉ®×¥H..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index dc56df9..f88413a 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1530,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 7f05da6..a519585 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1528,6 +1531,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Åben højre fil med ..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index c1ac805..570d184 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -272,6 +272,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1532,6 +1535,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 2b015c2..25b1627 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1388,6 +1391,7 @@ BEGIN
     IDS_FILTERFILE_NAMETITLE "Name"
     IDS_FILTERFILE_PATHTITLE "Location"
     IDS_FILTER_TITLE        "Filters"
+    IDS_FILTER_PREFIX       "[F] "
 END
 
 // VERSION CONTROL OPTIONS
@@ -1529,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Ouvrir le fichier de droite avec ..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 5cd13df..d261450 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -278,6 +278,9 @@ BEGIN
             MENUITEM "&Mit...",                     ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1535,6 +1538,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Öffnet die rechte Datei im externen Editor."
     ID_DIR_OPEN_RIGHT_WITH  "Öffne rechte Datei mit..."
     IDS_CANNOT_EXECUTE_FILE "%1 konnte nicht ausgeführt werden."
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index e31b876..2041693 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1530,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index a727be0..965a119 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -236,6 +236,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1491,6 +1494,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 05f1c98..713ac6b 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1529,6 +1532,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Åpne høyre fil med ..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 8fbeedd..1ba35fc 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1530,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Otwórz prawy plik w..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index ecd55a9..a9509c7 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -282,6 +282,9 @@ BEGIN
             MENUITEM "Ñ ïîìîùüþ...",                ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1433,6 +1436,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Îòêðûòü ôàéë ñïðàâà âî âíåøíåì ðåäàêòîðå"
     ID_DIR_OPEN_RIGHT_WITH  "Îòêðûòü ôàéë ñïðàâà ñ ïîìîùüþ..."
     IDS_CANNOT_EXECUTE_FILE "Íåâîçìîæíî âûïîëíèòü %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 45e5f6c..8cd0dd2 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1530,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Otvor pravý súbor s..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 6bcbcbe..9241c34 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1530,6 +1533,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 77bb2bf..3d74257 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -270,6 +270,9 @@ BEGIN
             MENUITEM "&med...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zippa &vänster sida %1 Fil(er) från %2 valda Item(s)",
@@ -1529,6 +1532,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Öppna den högra filen med en extern editor"
     ID_DIR_OPEN_RIGHT_WITH  "Öppna den högra filen med ..."
     IDS_CANNOT_EXECUTE_FILE "Kan inte starta %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index df9efda..c0170de 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -271,6 +271,9 @@ BEGIN
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH
         END
         MENUITEM SEPARATOR
+        MENUITEM "Cop&y Pathnames"                  ID_DIR_COPY_PATHNAMES
+        MENUITEM "Copy &Filenames"                  ID_DIR_COPY_FILENAMES
+        MENUITEM SEPARATOR
         POPUP "&Zip"
         BEGIN
             MENUITEM "Zip &Left Side %1 File(s) from %2 Selected Item(s)",
@@ -1415,6 +1418,8 @@ BEGIN
     ID_DIR_OPEN_RIGHT_WITHEDITOR "Open the right file to external editor"
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
+    ID_DIR_COPY_PATHNAMES   "Copy pathnames to clipboard"
+    ID_DIR_COPY_FILENAMES   "Copy filenames to clipboard"
 END
 
 // DIRECTORY DIFFING : 7ZIP

diff --git a/Src/readme.txt b/Src/readme.txt
index fdc95ae..8ae30cd 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -12,6 +12,9 @@
   Src/res new files: customize_columns.bmp filters.bmp select_all.bmp
   Src/languages: *.rc resource.h
   Src/languages/res: same changes than in Src/res
+ PATCH: [ 962509 ] Copy pathnames and filenames from directory compare
+  Src: DirView.cpp DirView.h Merge.rc resource.h
+  Src/languages: *.rc resource.h
 
 2004-05-30 Laoran
  BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() ; fix the fix !

diff --git a/Src/resource.h b/Src/resource.h
index a54a8ce..118605a 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -364,6 +364,9 @@
 #define ID_DIR_OPEN_RIGHT_WITHEDITOR    17652
 #define ID_DIR_OPEN_RIGHT_WITH          17653
 #define IDS_CANNOT_EXECUTE_FILE         17654
+#define ID_DIR_COPY_PATHNAMES           17655
+#define ID_DIR_COPY_FILENAMES           17656
+
 
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17664