From 9f36a8f3789ce579a70564d9338c54e309e9a2d0 Mon Sep 17 00:00:00 2001 From: sabrogden Date: Tue, 1 Oct 2024 20:16:43 -0600 Subject: [PATCH] Increase the number of copy buffers to 5 (#728) --- CP_Main.cpp | 8 ++++ CP_Main.h | 9 +++++ CP_Main.rc | 91 +++++++++++++++++++++++++++--------------- MainFrm.cpp | 30 ++++++++++++++ OptionsCopyBuffers.cpp | 36 +++++++++++++++++ OptionsCopyBuffers.h | 6 +++ Resource.h | 24 ++++++++++- 7 files changed, 171 insertions(+), 33 deletions(-) diff --git a/CP_Main.cpp b/CP_Main.cpp index f7505094..d7d5a354 100644 --- a/CP_Main.cpp +++ b/CP_Main.cpp @@ -484,6 +484,14 @@ void CCP_MainApp::AfterMainCreate() m_pPasteBuffer3 = new CHotKey("CopyBufferPasteHotKey_2", 0, true); m_pCutBuffer3 = new CHotKey("CopyBufferCutHotKey_2", 0, true); + m_pCopyBuffer4 = new CHotKey("CopyBufferCopyHotKey_3", 0, true); + m_pPasteBuffer4 = new CHotKey("CopyBufferPasteHotKey_3", 0, true); + m_pCutBuffer4 = new CHotKey("CopyBufferCutHotKey_3", 0, true); + + m_pCopyBuffer5 = new CHotKey("CopyBufferCopyHotKey_4", 0, true); + m_pPasteBuffer5 = new CHotKey("CopyBufferPasteHotKey_4", 0, true); + m_pCutBuffer5 = new CHotKey("CopyBufferCutHotKey_4", 0, true); + m_pTextOnlyPaste = new CHotKey("TextOnlyPaste", 0, true); m_pSaveClipboard = new CHotKey("SaveClipboard", 0, false); diff --git a/CP_Main.h b/CP_Main.h index 4029d96a..c82ee497 100644 --- a/CP_Main.h +++ b/CP_Main.h @@ -75,6 +75,15 @@ class CCP_MainApp : public CWinApp CHotKey* m_pCopyBuffer3; CHotKey* m_pPasteBuffer3; CHotKey* m_pCutBuffer3; + + CHotKey* m_pCopyBuffer4; + CHotKey* m_pPasteBuffer4; + CHotKey* m_pCutBuffer4; + + CHotKey* m_pCopyBuffer5; + CHotKey* m_pPasteBuffer5; + CHotKey* m_pCutBuffer5; + CHotKey* m_pTextOnlyPaste; CHotKey* m_pSaveClipboard; CHotKey* m_pCopyAndSaveClipboard; diff --git a/CP_Main.rc b/CP_Main.rc index a72b725e..91f0e03e 100644 --- a/CP_Main.rc +++ b/CP_Main.rc @@ -861,44 +861,66 @@ BEGIN CONTROL "Animate1",IDC_FILE_COPY,"SysAnimate32",ACS_CENTER | ACS_TRANSPARENT | WS_TABSTOP,7,3,270,26 END -IDD_OPTIONS_COPY_BUFFERS DIALOGEX 0, 0, 287, 250 +IDD_OPTIONS_COPY_BUFFERS DIALOGEX 0, 0, 379, 277 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Copy Buffers" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_COPY_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,16,80,14 - CONTROL "Win",IDC_WIN_COPY_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,16,33,14 + CONTROL "Win",IDC_WIN_COPY_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,16,27,14 CONTROL "",IDC_PASTE_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,32,80,14 - CONTROL "Win",IDC_WIN_PASTE_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,32,33,14 - CONTROL "",IDC_CUT_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,47,80,14 - CONTROL "Win",IDC_WIN_CUT_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,47,33,14 - CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,16,80,14 - CONTROL "",IDC_COPY_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,81,80,14 - CONTROL "Win",IDC_WIN_COPY_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,81,33,14 - CONTROL "",IDC_PASTE_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,97,80,14 - CONTROL "Win",IDC_WIN_PASTE_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,97,33,14 - CONTROL "",IDC_CUT_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,112,80,14 - CONTROL "Win",IDC_WIN_CUT_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,112,33,14 - CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,81,80,14 - CONTROL "",IDC_COPY_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,148,80,14 - CONTROL "Win",IDC_WIN_COPY_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,148,33,14 - CONTROL "",IDC_PASTE_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,164,80,14 - CONTROL "Win",IDC_WIN_PASTE_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,164,33,14 - CONTROL "",IDC_CUT_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,179,80,14 - CONTROL "Win",IDC_WIN_CUT_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,179,33,14 - CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,148,80,14 + CONTROL "Win",IDC_WIN_PASTE_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,32,27,14 + CONTROL "",IDC_CUT_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,221,32,80,14 + CONTROL "Win",IDC_WIN_CUT_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,304,32,33,14 + CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,15,80,14 + CONTROL "",IDC_COPY_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,66,80,14 + CONTROL "Win",IDC_WIN_COPY_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,66,27,14 + CONTROL "",IDC_PASTE_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,82,80,14 + CONTROL "Win",IDC_WIN_PASTE_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,82,27,14 + CONTROL "",IDC_CUT_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,221,82,80,14 + CONTROL "Win",IDC_WIN_CUT_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,304,82,33,14 + CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,66,80,14 + CONTROL "",IDC_COPY_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,116,80,14 + CONTROL "Win",IDC_WIN_COPY_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,116,27,14 + CONTROL "",IDC_PASTE_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,132,80,14 + CONTROL "Win",IDC_WIN_PASTE_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,132,27,14 + CONTROL "",IDC_CUT_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,221,132,80,14 + CONTROL "Win",IDC_WIN_CUT_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,304,132,33,14 + CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,116,80,14 LTEXT "Copy",IDC_STATIC_COPY_1,19,16,42,14,SS_CENTERIMAGE LTEXT "Paste",IDC_STATIC_PASTE_1,19,32,43,14,SS_CENTERIMAGE - LTEXT "Cut",IDC_STATIC_CUT_1,19,47,43,14,SS_CENTERIMAGE - GROUPBOX "Copy Buffer 1",IDC_BUFFER_GROUP_1,7,7,273,61 - LTEXT "Copy",IDC_STATIC_COPY_2,19,81,42,14,SS_CENTERIMAGE - LTEXT "Paste",IDC_STATIC_PASTE_2,19,97,43,14,SS_CENTERIMAGE - LTEXT "Cut",IDC_STATIC_CUT_2,19,112,43,14,SS_CENTERIMAGE - GROUPBOX "Copy Buffer 2",IDC_BUFFER_GROUP_2,7,72,273,61 - LTEXT "Copy",IDC_STATIC_COPY_3,19,148,42,14,SS_CENTERIMAGE - LTEXT "Paste",IDC_STATIC_PASTE_3,19,164,43,14,SS_CENTERIMAGE - LTEXT "Cut",IDC_STATIC_CUT_3,19,179,43,14,SS_CENTERIMAGE - GROUPBOX "Copy Buffer 3",IDC_BUFFER_GROUP_3,7,139,273,61 + LTEXT "Cut",IDC_STATIC_CUT_1,177,31,43,14,SS_CENTERIMAGE + GROUPBOX "Copy Buffer 1",IDC_BUFFER_GROUP_1,7,7,365,47 + LTEXT "Copy",IDC_STATIC_COPY_2,19,66,42,14,SS_CENTERIMAGE + LTEXT "Paste",IDC_STATIC_PASTE_2,19,82,43,14,SS_CENTERIMAGE + LTEXT "Cut",IDC_STATIC_CUT_2,177,82,43,14,SS_CENTERIMAGE + GROUPBOX "Copy Buffer 2",IDC_BUFFER_GROUP_2,7,57,365,47 + LTEXT "Copy",IDC_STATIC_COPY_3,19,116,42,14,SS_CENTERIMAGE + LTEXT "Paste",IDC_STATIC_PASTE_3,19,132,43,14,SS_CENTERIMAGE + LTEXT "Cut",IDC_STATIC_CUT_3,177,132,43,14,SS_CENTERIMAGE + GROUPBOX "Copy Buffer 3",IDC_BUFFER_GROUP_3,7,107,365,50 + CONTROL "",IDC_COPY_4,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,169,80,14 + CONTROL "Win",IDC_WIN_COPY_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,169,27,14 + CONTROL "",IDC_PASTE_4,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,185,80,14 + CONTROL "Win",IDC_WIN_PASTE_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,185,27,14 + CONTROL "",IDC_CUT_4,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,221,185,80,14 + CONTROL "Win",IDC_WIN_CUT_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,304,185,33,14 + CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,169,80,14 + LTEXT "Copy",IDC_STATIC_COPY_4,19,169,42,14,SS_CENTERIMAGE + LTEXT "Paste",IDC_STATIC_PASTE_4,19,185,43,14,SS_CENTERIMAGE + LTEXT "Cut",IDC_STATIC_CUT_4,177,185,43,14,SS_CENTERIMAGE + GROUPBOX "Copy Buffer 4",IDC_BUFFER_GROUP_4,7,160,365,50 + CONTROL "",IDC_COPY_5,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,223,80,14 + CONTROL "Win",IDC_WIN_COPY_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,223,27,14 + CONTROL "",IDC_PASTE_5,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,239,80,14 + CONTROL "Win",IDC_WIN_PASTE_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,239,27,14 + CONTROL "",IDC_CUT_5,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,221,239,80,14 + CONTROL "Win",IDC_WIN_CUT_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,304,239,33,14 + CONTROL "Play Sound on Copy",IDC_PLAY_SOUND_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,223,80,14 + LTEXT "Copy",IDC_STATIC_COPY_5,19,223,42,14,SS_CENTERIMAGE + LTEXT "Paste",IDC_STATIC_PASTE_5,19,239,43,14,SS_CENTERIMAGE + LTEXT "Cut",IDC_STATIC_CUT_5,177,239,43,14,SS_CENTERIMAGE + GROUPBOX "Copy Buffer 5",IDC_BUFFER_GROUP_5,7,213,365,50 END IDD_GLOBAL_CLIPS DIALOGEX 0, 0, 369, 199 @@ -1212,9 +1234,9 @@ BEGIN IDD_OPTIONS_COPY_BUFFERS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 280 + RIGHTMARGIN, 372 TOPMARGIN, 7 - BOTTOMMARGIN, 243 + BOTTOMMARGIN, 270 END IDD_GLOBAL_CLIPS, DIALOG @@ -1663,6 +1685,11 @@ BEGIN 0 END +IDD_OPTIONS_COPY_BUFFERS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // diff --git a/MainFrm.cpp b/MainFrm.cpp index 222ba1fe..90ba8ef8 100644 --- a/MainFrm.cpp +++ b/MainFrm.cpp @@ -405,6 +405,36 @@ LRESULT CMainFrame::OnHotKey(WPARAM wParam, LPARAM lParam) Log(_T("Cut buffer 3 hot key")); theApp.m_CopyBuffer.StartCopy(2, true); } + else if (theApp.m_pCopyBuffer4 && wParam == theApp.m_pCopyBuffer4->m_Atom) + { + Log(_T("Copy buffer 4 hot key")); + theApp.m_CopyBuffer.StartCopy(3); + } + else if (theApp.m_pPasteBuffer4 && wParam == theApp.m_pPasteBuffer4->m_Atom) + { + Log(_T("Paste buffer 4 hot key")); + theApp.m_CopyBuffer.PastCopyBuffer(3); + } + else if (theApp.m_pCutBuffer4 && wParam == theApp.m_pCutBuffer4->m_Atom) + { + Log(_T("Cut buffer 4 hot key")); + theApp.m_CopyBuffer.StartCopy(3, true); + } + else if (theApp.m_pCopyBuffer5 && wParam == theApp.m_pCopyBuffer5->m_Atom) + { + Log(_T("Copy buffer 5 hot key")); + theApp.m_CopyBuffer.StartCopy(4); + } + else if (theApp.m_pPasteBuffer5 && wParam == theApp.m_pPasteBuffer5->m_Atom) + { + Log(_T("Paste buffer 5 hot key")); + theApp.m_CopyBuffer.PastCopyBuffer(4); + } + else if (theApp.m_pCutBuffer5 && wParam == theApp.m_pCutBuffer5->m_Atom) + { + Log(_T("Cut buffer 5 hot key")); + theApp.m_CopyBuffer.StartCopy(4, true); + } else if(theApp.m_pTextOnlyPaste && wParam == theApp.m_pTextOnlyPaste->m_Atom) { DoTextOnlyPaste(); diff --git a/OptionsCopyBuffers.cpp b/OptionsCopyBuffers.cpp index 2fd42c73..5b293b08 100644 --- a/OptionsCopyBuffers.cpp +++ b/OptionsCopyBuffers.cpp @@ -33,6 +33,14 @@ void COptionsCopyBuffers::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_COPY_3, m_CopyBuffer3); DDX_Control(pDX, IDC_PASTE_3, m_PasteBuffer3); DDX_Control(pDX, IDC_CUT_3, m_CutBuffer3); + + DDX_Control(pDX, IDC_COPY_4, m_CopyBuffer4); + DDX_Control(pDX, IDC_PASTE_4, m_PasteBuffer4); + DDX_Control(pDX, IDC_CUT_4, m_CutBuffer4); + + DDX_Control(pDX, IDC_COPY_5, m_CopyBuffer5); + DDX_Control(pDX, IDC_PASTE_5, m_PasteBuffer5); + DDX_Control(pDX, IDC_CUT_5, m_CutBuffer5); } @@ -63,6 +71,18 @@ BOOL COptionsCopyBuffers::OnInitDialog() theApp.m_pCutBuffer3->CopyToCtrl(m_CutBuffer3, m_hWnd, IDC_WIN_CUT_3); CheckDlgButton(IDC_PLAY_SOUND_3, Item.m_bPlaySoundOnCopy); + g_Opt.GetCopyBufferItem(3, Item); + theApp.m_pCopyBuffer4->CopyToCtrl(m_CopyBuffer4, m_hWnd, IDC_WIN_COPY_4); + theApp.m_pPasteBuffer4->CopyToCtrl(m_PasteBuffer4, m_hWnd, IDC_WIN_PASTE_4); + theApp.m_pCutBuffer4->CopyToCtrl(m_CutBuffer4, m_hWnd, IDC_WIN_CUT_4); + CheckDlgButton(IDC_PLAY_SOUND_4, Item.m_bPlaySoundOnCopy); + + g_Opt.GetCopyBufferItem(4, Item); + theApp.m_pCopyBuffer5->CopyToCtrl(m_CopyBuffer5, m_hWnd, IDC_WIN_COPY_5); + theApp.m_pPasteBuffer5->CopyToCtrl(m_PasteBuffer5, m_hWnd, IDC_WIN_PASTE_5); + theApp.m_pCutBuffer5->CopyToCtrl(m_CutBuffer5, m_hWnd, IDC_WIN_CUT_5); + CheckDlgButton(IDC_PLAY_SOUND_5, Item.m_bPlaySoundOnCopy); + theApp.m_Language.UpdateOptionCopyBuffers(this); return TRUE; @@ -85,6 +105,14 @@ BOOL COptionsCopyBuffers::OnApply() theApp.m_pPasteBuffer3->CopyFromCtrl(m_PasteBuffer3, m_hWnd, IDC_WIN_PASTE_3); theApp.m_pCutBuffer3->CopyFromCtrl(m_CutBuffer3, m_hWnd, IDC_WIN_CUT_3); + theApp.m_pCopyBuffer4->CopyFromCtrl(m_CopyBuffer4, m_hWnd, IDC_WIN_COPY_4); + theApp.m_pPasteBuffer4->CopyFromCtrl(m_PasteBuffer4, m_hWnd, IDC_WIN_PASTE_4); + theApp.m_pCutBuffer4->CopyFromCtrl(m_CutBuffer4, m_hWnd, IDC_WIN_CUT_4); + + theApp.m_pCopyBuffer5->CopyFromCtrl(m_CopyBuffer5, m_hWnd, IDC_WIN_COPY_5); + theApp.m_pPasteBuffer5->CopyFromCtrl(m_PasteBuffer5, m_hWnd, IDC_WIN_PASTE_5); + theApp.m_pCutBuffer5->CopyFromCtrl(m_CutBuffer5, m_hWnd, IDC_WIN_CUT_5); + CCopyBufferItem Item; g_Opt.GetCopyBufferItem(0, Item); Item.m_bPlaySoundOnCopy = IsDlgButtonChecked(IDC_PLAY_SOUND_1); @@ -98,6 +126,14 @@ BOOL COptionsCopyBuffers::OnApply() Item.m_bPlaySoundOnCopy = IsDlgButtonChecked(IDC_PLAY_SOUND_3); g_Opt.SetCopyBufferItem(2, Item); + g_Opt.GetCopyBufferItem(3, Item); + Item.m_bPlaySoundOnCopy = IsDlgButtonChecked(IDC_PLAY_SOUND_4); + g_Opt.SetCopyBufferItem(3, Item); + + g_Opt.GetCopyBufferItem(4, Item); + Item.m_bPlaySoundOnCopy = IsDlgButtonChecked(IDC_PLAY_SOUND_5); + g_Opt.SetCopyBufferItem(4, Item); + INT_PTR x; INT_PTR y; ARRAY NewKeys; diff --git a/OptionsCopyBuffers.h b/OptionsCopyBuffers.h index c13f86d4..5383e26b 100644 --- a/OptionsCopyBuffers.h +++ b/OptionsCopyBuffers.h @@ -36,4 +36,10 @@ class COptionsCopyBuffers : public CPropertyPage CHotKeyCtrl m_CopyBuffer3; CHotKeyCtrl m_PasteBuffer3; CHotKeyCtrl m_CutBuffer3; + CHotKeyCtrl m_CopyBuffer4; + CHotKeyCtrl m_PasteBuffer4; + CHotKeyCtrl m_CutBuffer4; + CHotKeyCtrl m_CopyBuffer5; + CHotKeyCtrl m_PasteBuffer5; + CHotKeyCtrl m_CutBuffer5; }; diff --git a/Resource.h b/Resource.h index bc152dd5..b5ccd497 100644 --- a/Resource.h +++ b/Resource.h @@ -331,6 +331,8 @@ #define IDC_CHECK_MOVE_CLIPS_ON_PASTE2 1044 #define IDC_CHECK_USE_UI_GROUP_LAST_10 1044 #define IDC_CHECK_DATA_FORMAT 1045 +#define IDC_PLAY_SOUND_4 1045 +#define IDC_PLAY_SOUND_5 1046 #define IDD_OPTIONS_KEYSTROKES 2001 #define IDC_HOTKEY 2002 #define IDC_DISPLAY_IN_SYSTEMTRAY 2003 @@ -525,37 +527,57 @@ #define IDC_BUFFER_GROUP_3 2108 #define IDC_TIME_USE_END 2108 #define IDC_DATE_USE_END 2109 +#define IDC_COPY_4 2109 #define IDC_EDIT_CLIP_TITLE 2110 +#define IDC_WIN_COPY_4 2110 #define IDC_COMBO_DATA_FORMAT 2111 +#define IDC_PASTE_4 2111 #define IDC_STATIC_DB_SIZE 2112 +#define IDC_WIN_PASTE_4 2112 #define IDC_STATIC_SELECTED_SIZE 2113 +#define IDC_CUT_4 2113 #define IDC_STATIC_TO_DELETE_SIZE 2114 #define IDC_STATIC_SELECTED_SIZE2 2114 #define IDC_STATIC_SELECTED_COUNT 2114 +#define IDC_WIN_CUT_4 2114 #define IDC_STATIC_DB_SIZE_TEXT 2115 +#define IDC_STATIC_COPY_4 2115 #define IDC_STATIC_SELECTED_SIZE_TEXT 2116 +#define IDC_STATIC_PASTE_4 2116 #define IDC_STATIC_TO_DELETE_TEXT 2117 #define IDC_STATIC_SELECTED_SIZE_TEXT2 2117 +#define IDC_STATIC_CUT_4 2117 #define IDC_BUTTON_APPLY 2118 +#define IDC_BUFFER_GROUP_4 2118 +#define IDC_COPY_5 2119 #define IDC_STATIC_GROUP_SEARCH 2120 +#define IDC_WIN_COPY_5 2120 #define IDC_MFCPROPERTYGRID1 2121 +#define IDC_PASTE_5 2121 #define IDC_STATIC_DIFF 2122 +#define IDC_WIN_PASTE_5 2122 #define IDC_EDIT_DIFF_PATH 2123 +#define IDC_CUT_5 2123 #define IDC_BUTTON2 2124 #define IDC_BUTTON_DIFF_BROWSE 2124 #define IDC_BUTTON_REMOVE 2124 #define IDC_BUTTON_ADVANCED 2124 #define IDC_BUTTON_ADD_SCRIPT 2124 +#define IDC_WIN_CUT_5 2124 #define IDC_STATIC_QUICK_PASTE 2125 #define IDC_BUTTON_DELETE_SCRIPT 2125 +#define IDC_STATIC_COPY_5 2125 #define IDC_STATIC_DESC 2126 +#define IDC_STATIC_PASTE_5 2126 #define IDC_RADIO_USE_IP 2127 #define IDC_RADIO_KEYBOARD 2127 #define IDC_RADIO_KEYBOARD_1 2127 +#define IDC_STATIC_CUT_5 2127 #define IDC_STATIC_REMOTE_FILES 2128 #define IDC_RADIO2 2128 #define IDC_RADIO_ENTER 2128 #define IDC_RADIO_CURRENT_TYPES 2128 +#define IDC_BUFFER_GROUP_5 2128 #define IDC_RADIO_USE_HOST_NAME 2129 #define IDC_COMBO_ENTER_MODIFIER 2129 #define IDC_STATIC_REMOTE_FILE_REQUEST 2130 @@ -817,7 +839,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 389 +#define _APS_NEXT_RESOURCE_VALUE 390 #define _APS_NEXT_COMMAND_VALUE 32980 #define _APS_NEXT_CONTROL_VALUE 2173 #define _APS_NEXT_SYMED_VALUE 104