Pull in PR #62

Author: sylikc

src/JPEGView/Clipboard.cpp

@@ -20,6 +20,17 @@ static void CopyOriginalFileNameToClipboard(LPCWSTR filename) {
 	::SetClipboardData(CF_HDROP, hMem);
 }
 
+static void CopyFileNameTextToClipboard(LPCWSTR filename) {
+	int fileNameLength = (int)wcslen(filename);
+	DWORD fileNameLengthBytes = sizeof(wchar_t) * (fileNameLength + 1);
+	HGLOBAL hMem = ::GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE | GMEM_DDESHARE, fileNameLengthBytes + sizeof(wchar_t)); // for double NULL char
+	WCHAR* pGlobal = (WCHAR*) ::GlobalLock(hMem);
+	::CopyMemory(pGlobal, filename, fileNameLengthBytes);
+	pGlobal[fileNameLength + 1] = 0; // add additional NULL character
+	::GlobalUnlock(hMem);
+	::SetClipboardData(CF_UNICODETEXT, hMem);
+}
+
 void CClipboard::CopyImageToClipboard(HWND hWnd, CJPEGImage * pImage, LPCTSTR fileName) {
 	if (pImage == NULL || pImage->DIBPixelsLastProcessed(true) == NULL) {
 		return;
@@ -52,6 +63,15 @@ void CClipboard::CopyFullImageToClipboard(HWND hWnd, CJPEGImage * pImage, const
 	pImage->EnableDimming(true);
 }
 
+void CClipboard::CopyPathToClipboard(HWND hWnd, CJPEGImage* pImage, LPCTSTR fileName) {
+	if (pImage == NULL || pImage->DIBPixelsLastProcessed(true) == NULL) {
+		return;
+	}
+	pImage->EnableDimming(false);
+	DoCopyFileNameText(hWnd, fileName);
+	pImage->EnableDimming(true);
+}
+
 CJPEGImage* CClipboard::PasteImageFromClipboard(HWND hWnd, const CImageProcessingParams& procParams, 
 												EProcessingFlags eFlags) {
 	if (!::OpenClipboard(hWnd)) {
@@ -138,5 +158,16 @@ void CClipboard::DoCopy(HWND hWnd, int nWidth, int nHeight, const void* pSourceI
 		CopyOriginalFileNameToClipboard(fileName);
 	}
 
+	::CloseClipboard();
+}
+
+void CClipboard::DoCopyFileNameText(HWND hWnd, LPCTSTR fileName) {
+	if (!::OpenClipboard(hWnd)) {
+		return;
+	}
+	::EmptyClipboard();
+
+	CopyFileNameTextToClipboard(fileName);
+
 	::CloseClipboard();
 }

src/JPEGView/Clipboard.h

@@ -4,7 +4,7 @@
 
 class CJPEGImage;
 
-// Allows to copy an image to the clipboard and to paste an image from the clipboard
+// Allows to copy an image or text to the clipboard and to paste an image from the clipboard
 class CClipboard {
 public:
 	// Copy the pixels of the currently visible part of the image as a 24 bpp DIB to the clipboard
@@ -19,11 +19,15 @@ class CClipboard {
 	static void CopyFullImageToClipboard(HWND hWnd, CJPEGImage * pImage, const CImageProcessingParams& procParams,
 		EProcessingFlags eFlags, CRect clipRect, LPCTSTR fileName);
 
+	// Copy file path to the clipboard.
+	static void CopyPathToClipboard(HWND hWnd, CJPEGImage* pImage, LPCTSTR fileName);
+
 	// Paste image from clipboard. Returns NULL if paste failed. The caller gets ownership of the returned image.
 	static CJPEGImage* PasteImageFromClipboard(HWND hWnd, const CImageProcessingParams& procParams, EProcessingFlags eFlags);
 
 private:
 	CClipboard(void);
 
 	static void DoCopy(HWND hWnd, int nWidth, int nHeight, const void* pSourceImageDIB32, LPCTSTR fileName);
+	static void DoCopyFileNameText(HWND hWnd, LPCTSTR fileName);
 };

src/JPEGView/Config/KeyMap.txt

@@ -14,6 +14,7 @@
 #define IDM_PRINT		1700			// print image
 #define IDM_COPY		2000			// copy image to clipboard in screen size
 #define IDM_COPY_FULL		2500			// copy image to clipboard in original size
+#define IDM_COPY_PATH		2525			// copy image path to clipboard
 #define IDM_PASTE		2550			// paste image from clipboard
 #define IDM_BATCH_COPY		2600			// open batch copy dialog
 #define IDM_RENAME		2610			// rename current file, only works when image processing panel can be shown (i.e. panel not disabled in INI and window size big enough)
@@ -181,6 +182,7 @@ Ctrl+Down               IDM_ZOOM_DEC
 Ctrl+Up                 IDM_ZOOM_INC
 Ctrl+A                  IDM_EXCHANGE_PROC_PARAMS
 Ctrl+C                  IDM_COPY
+Ctrl+Shift+C            IDM_COPY_PATH
 C                       IDM_SORT_CREATION_DATE
 Ctrl+N                  IDM_SHOW_NAVPANEL
 N                       IDM_SORT_NAME

src/JPEGView/Config/KeyMap_ru.txt

@@ -66,6 +66,7 @@ void CHelpDisplayCtl::GenerateHelpDisplay() {
 	m_pHelpDisplay->AddLine(_KeyDesc(IDM_MARK_FOR_TOGGLE), buffMI);
 	m_pHelpDisplay->AddLineInfo(_KeyDesc(IDM_SHOW_NAVPANEL), m_pMainDlg->GetNavPanelCtl()->IsActive(), CNLS::GetString(_T("Show/hide navigation panel")));
 	m_pHelpDisplay->AddLine(_KeyDesc(IDM_COPY, IDM_COPY_FULL), CNLS::GetString(_T("Copy screen to clipboard/ Copy processed full size image to clipboard")));
+	m_pHelpDisplay->AddLine(_KeyDesc(IDM_COPY_PATH), CNLS::GetString(_T("Copy file path of the image to clipboard")));
 	m_pHelpDisplay->AddLine(_KeyDesc(IDM_OPEN), CNLS::GetString(_T("Open new image or slideshow file")));
 	m_pHelpDisplay->AddLine(_KeyDesc(IDM_SAVE_ALLOW_NO_PROMPT), CNLS::GetString(_T("Save processed image to JPEG file (original size)")));
 	m_pHelpDisplay->AddLine(_KeyDesc(IDM_SAVE_SCREEN), CNLS::GetString(_T("Save processed image to JPEG file (screen size)")));

src/JPEGView/HelpDisplayCtl.cpp

@@ -301,6 +301,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Copy to clipboard",           IDM_COPY
         MENUITEM "Copy original size image",    IDM_COPY_FULL
+        MENUITEM "Copy file path",              IDM_COPY_PATH
         MENUITEM "Paste from clipboard",        IDM_PASTE
         MENUITEM SEPARATOR
         MENUITEM "Show picture info (EXIF)",    IDM_SHOW_FILEINFO

src/JPEGView/JPEGView.rc

@@ -1169,6 +1169,7 @@ LRESULT CMainDlg::OnContextMenu(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam,
 		::EnableMenuItem(hMenuTrackPopup, IDM_PRINT, MF_BYCOMMAND | MF_GRAYED);
 		::EnableMenuItem(hMenuTrackPopup, IDM_COPY, MF_BYCOMMAND | MF_GRAYED);
 		::EnableMenuItem(hMenuTrackPopup, IDM_COPY_FULL, MF_BYCOMMAND | MF_GRAYED);
+		::EnableMenuItem(hMenuTrackPopup, IDM_COPY_PATH, MF_BYCOMMAND | MF_GRAYED);
 		::EnableMenuItem(hMenuTrackPopup, IDM_SAVE_PARAM_DB, MF_BYCOMMAND | MF_GRAYED);
 		::EnableMenuItem(hMenuTrackPopup, IDM_CLEAR_PARAM_DB, MF_BYCOMMAND | MF_GRAYED);
 		::EnableMenuItem(hMenuTrackPopup, SUBMENU_POS_ZOOM, MF_BYPOSITION  | MF_GRAYED);
@@ -1182,6 +1183,7 @@ LRESULT CMainDlg::OnContextMenu(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam,
 		if (m_bKeepParams || m_pCurrentImage->IsClipboardImage())
 			::EnableMenuItem(hMenuTrackPopup, IDM_SAVE_PARAM_DB, MF_BYCOMMAND | MF_GRAYED);
 		if (m_pCurrentImage->IsClipboardImage()) {
+			::EnableMenuItem(hMenuTrackPopup, IDM_COPY_PATH, MF_BYCOMMAND | MF_GRAYED);
 			::EnableMenuItem(hMenuModDate, IDM_TOUCH_IMAGE, MF_BYCOMMAND | MF_GRAYED);
 			::EnableMenuItem(hMenuModDate, IDM_TOUCH_IMAGE_EXIF, MF_BYCOMMAND | MF_GRAYED);
 		}
@@ -1342,6 +1344,11 @@ void CMainDlg::ExecuteCommand(int nCommand) {
 				this->Invalidate(FALSE);
 			}
 			break;
+		case IDM_COPY_PATH:
+			if (m_pCurrentImage != NULL && !m_pCurrentImage->IsClipboardImage()) {
+				CClipboard::CopyPathToClipboard(this->m_hWnd, m_pCurrentImage, m_pFileList->Current());
+			}
+			break;
 		case IDM_PASTE:
 			if (::IsClipboardFormatAvailable(CF_DIB)) {
 				GotoImage(POS_Clipboard);

src/JPEGView/MainDlg.cpp

@@ -141,6 +141,7 @@
 #define IDM_PRINT			1700
 #define IDM_COPY			2000
 #define IDM_COPY_FULL		2500
+#define IDM_COPY_PATH		2525
 #define IDM_PASTE			2550
 #define IDM_BATCH_COPY		2600
 #define IDM_RENAME			2610