Skip to content

Add clipboard history carousel #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qpd-v wants to merge 1 commit into
base: master
Choose a base branch
from
+1,936 −11
Open

Add clipboard history carousel #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CP_Main.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,26 @@ BEGIN
PUSHBUTTON "Reset",IDC_BUTTON_RESET,318,7,50,14
END

IDD_OPTIONS_CLIPBOARD_CAROUSEL DIALOGEX 0, 0, 370, 286
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION
CAPTION "Clipboard Carousel"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Enable Clipboard Carousel",IDC_CC_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,8,225,10
GROUPBOX "Activate carousel",IDC_CC_EDITOR_GROUP,8,29,351,93
CONTROL "Keyboard shortcut",IDC_CC_KEYBOARD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,43,93,10
CONTROL "Mouse button + modifiers",IDC_CC_MOUSE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,120,43,218,10
CONTROL "",IDC_CC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,17,63,246,14
COMBOBOX IDC_CC_MOUSE_TRIGGER,17,63,246,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Mouse modifiers (optional):",IDC_CC_MODIFIERS_LABEL,17,84,326,8
CONTROL "Shift",IDC_CC_SHIFT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,99,60,10
CONTROL "Ctrl",IDC_CC_CONTROL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,99,60,10
CONTROL "Alt",IDC_CC_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,99,60,10
PUSHBUTTON "Clear",IDC_CC_CLEAR,287,63,60,14
CONTROL "Paste when clicking outside the carousel",IDC_CC_PASTE_CLICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,132,345,10
LTEXT "",IDC_CC_HELP,8,156,345,91
END

IDD_DIALOG_FREIND_PROMPT DIALOGEX 0, 0, 237, 91
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Send to Friend"
Expand Down
11 changes: 10 additions & 1 deletion CP_Main.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,9 @@
<ClCompile Include="src\ChaiScriptXml.cpp" />
<ClCompile Include="src\Client.cpp" />
<ClCompile Include="src\Clip.cpp" />
<ClCompile Include="src\ClipboardCarousel.cpp" />
<ClCompile Include="src\ClipboardCarouselInput.cpp" />
<ClCompile Include="src\ClipboardCarouselWnd.cpp" />
<ClCompile Include="src\ClipboardSaveRestore.cpp" />
<ClCompile Include="src\ClipboardViewer.cpp" />
<ClCompile Include="src\ClipCompare.cpp" />
Expand Down Expand Up @@ -618,6 +621,7 @@
<ClCompile Include="src\OleClipSource.cpp" />
<ClCompile Include="src\OptionFriends.cpp" />
<ClCompile Include="src\Options.cpp" />
<ClCompile Include="src\OptionsClipboardCarousel.cpp" />
<ClCompile Include="src\OptionsCopyBuffers.cpp" />
<ClCompile Include="src\OptionsGeneral.cpp" />
<ClCompile Include="src\OptionsKeyBoard.cpp" />
Expand Down Expand Up @@ -809,6 +813,10 @@
<ClInclude Include="src\ChaiScriptXml.h" />
<ClInclude Include="src\Client.h" />
<ClInclude Include="src\Clip.h" />
<ClInclude Include="src\ClipboardCarousel.h" />
<ClInclude Include="src\ClipboardCarouselBinding.h" />
<ClInclude Include="src\ClipboardCarouselInput.h" />
<ClInclude Include="src\ClipboardCarouselWnd.h" />
<ClInclude Include="src\ClipboardSaveRestore.h" />
<ClInclude Include="src\ClipboardViewer.h" />
<ClInclude Include="src\ClipCompare.h" />
Expand Down Expand Up @@ -886,6 +894,7 @@
<ClInclude Include="src\OleClipSource.h" />
<ClInclude Include="src\OptionFriends.h" />
<ClInclude Include="src\Options.h" />
<ClInclude Include="src\OptionsClipboardCarousel.h" />
<ClInclude Include="src\OptionsCopyBuffers.h" />
<ClInclude Include="src\OptionsGeneral.h" />
<ClInclude Include="src\OptionsKeyBoard.h" />
Expand Down Expand Up @@ -1267,4 +1276,4 @@
<Error Condition="!Exists('packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets'))" />
<Error Condition="!Exists('packages\libpng-msvc-x86.1.6.33.8807\build\native\libpng-msvc-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng-msvc-x86.1.6.33.8807\build\native\libpng-msvc-x86.targets'))" />
</Target>
</Project>
</Project>
29 changes: 28 additions & 1 deletion CP_Main.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@
<ClCompile Include="src\Clip.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ClipboardCarousel.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ClipboardCarouselInput.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ClipboardCarouselWnd.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Clip_ImportExport.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down Expand Up @@ -244,6 +253,9 @@
<ClCompile Include="src\Options.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\OptionsClipboardCarousel.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\OptionsCopyBuffers.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down Expand Up @@ -541,6 +553,18 @@
<ClInclude Include="src\Clip.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ClipboardCarousel.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ClipboardCarouselBinding.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ClipboardCarouselInput.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ClipboardCarouselWnd.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Clip_ImportExport.h">
<Filter>src</Filter>
</ClInclude>
Expand Down Expand Up @@ -760,6 +784,9 @@
<ClInclude Include="src\Options.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\OptionsClipboardCarousel.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\OptionsCopyBuffers.h">
<Filter>src</Filter>
</ClInclude>
Expand Down Expand Up @@ -1684,4 +1711,4 @@
<Image Include="res\bmp00011.bmp" />
<Image Include="res\bmp00012.bmp" />
</ItemGroup>
</Project>
</Project>
18 changes: 16 additions & 2 deletions resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,20 @@
#define IDR_MENU2 390
#define IDR_MENU_DELETE_CLIP_DATA 390
#define IDR_MENU3 391
#define IDD_OPTIONS_CLIPBOARD_CAROUSEL 394
#define IDC_CC_ENABLE 2200
#define IDC_CC_EDITOR_GROUP 2201
#define IDC_CC_KEYBOARD 2202
#define IDC_CC_MOUSE 2203
#define IDC_CC_HOTKEY 2204
#define IDC_CC_MOUSE_TRIGGER 2205
#define IDC_CC_SHIFT 2206
#define IDC_CC_CONTROL 2207
#define IDC_CC_ALT 2208
#define IDC_CC_CLEAR 2209
#define IDC_CC_PASTE_CLICK 2210
#define IDC_CC_HELP 2211
#define IDC_CC_MODIFIERS_LABEL 2212
#define IDC_PATH 1000
#define IDC_GET_PATH 1001
#define IDC_SELECT_SOUND 1002
Expand Down Expand Up @@ -882,9 +896,9 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 394
#define _APS_NEXT_RESOURCE_VALUE 395
#define _APS_NEXT_COMMAND_VALUE 33002
#define _APS_NEXT_CONTROL_VALUE 2174
#define _APS_NEXT_CONTROL_VALUE 2213
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif
Loading