diff --git a/AdvGeneral.cpp b/AdvGeneral.cpp index bfcd1c0..84162bf 100644 --- a/AdvGeneral.cpp +++ b/AdvGeneral.cpp @@ -61,7 +61,7 @@ END_MESSAGE_MAP() #define SETTING_FIND_AS_TYPE 16 #define SETTING_ENSURE_WINDOW_IS_VISIBLE 17 #define SETTING_SHOW_GROUP_CLIPS_IN_LIST 18 -#define SETTING_PROMP_ON_DELETE 19 +#define SETTING_PROMPT_ON_DELETE 19 #define SETTING_ALWAYS_SHOW_SCROLL_BAR 20 #define SETTING_PASTE_AS_ADMIN 21 #define SETTTING_SHOW_IN_TASKBAR 22 @@ -136,7 +136,7 @@ END_MESSAGE_MAP() #define SETTING_DEBUG_TO_OUTPUT_STRING 85 #define SETTING_NETWORK_BIND_IP_ADDRESS 86 #define SETTING_DISABLE_FRIENDS 87 -#define SETTING_IGNORE_FALSE_COPIES_DEALY 88 +#define SETTING_IGNORE_FALSE_COPIES_DELAY 88 #define SETTING_REFRESH_VIEW_AFTER_PASTE 89 #define SETTING_SLUGIFY_SEPARATOR 90 #define SETTING_CLIPBOARD_RESTORE_AFTER_COPY_BUFFER_DELAY 91 @@ -201,12 +201,12 @@ BOOL CAdvGeneral::OnInitDialog() AddTrueFalse(pGroupTest, _T("Ensure entire window is visible"), CGetSetOptions::GetEnsureEntireWindowCanBeSeen(), SETTING_ENSURE_WINDOW_IS_VISIBLE); AddTrueFalse(pGroupTest, _T("Find as you type"), CGetSetOptions::GetFindAsYouType(), SETTING_FIND_AS_TYPE); - pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("First ten hot heys start index"), (long)CGetSetOptions::GetFirstTenHotKeysStart(), _T(""), SETTING_FIRST_TEN_HOTKEYS_START)); - pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("First ten hot heys font size"), (long)CGetSetOptions::GetFirstTenHotKeysFontSize(), _T(""), SETTING_FIRST_TEN_HOTKEYS_FONT_SIZE)); + pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("First ten hot keys start index"), (long)CGetSetOptions::GetFirstTenHotKeysStart(), _T(""), SETTING_FIRST_TEN_HOTKEYS_START)); + pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("First ten hot keys font size"), (long)CGetSetOptions::GetFirstTenHotKeysFontSize(), _T(""), SETTING_FIRST_TEN_HOTKEYS_FONT_SIZE)); AddTrueFalse(pGroupTest, _T("Hide Ditto on hot key if Ditto is visible"), CGetSetOptions::GetHideDittoOnHotKeyIfAlreadyShown(), SETTING_HIDE_ON_HOTKEY_IF_VISIBLE); - pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Ignore copies faster than (ms) (default: 500)"), (long)CGetSetOptions::GetSaveClipDelay(), _T(""), SETTING_IGNORE_FALSE_COPIES_DEALY)); + pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Ignore copies faster than (ms) (default: 500)"), (long)CGetSetOptions::GetSaveClipDelay(), _T(""), SETTING_IGNORE_FALSE_COPIES_DELAY)); pGroupTest->AddSubItem( new CMFCPropertyGridProperty(_T("Maximum clip size in bytes (0 for no limit)"), g_Opt.m_lMaxClipSizeInBytes, _T(""), SETTING_MAX_CLIP_SIZE)); @@ -228,7 +228,7 @@ BOOL CAdvGeneral::OnInitDialog() pGroupTest->AddSubItem(pFileProp); AddTrueFalse(pGroupTest, _T("Paste clip in active window after selection"), CGetSetOptions::GetSendPasteAfterSelection(), SETTING_PASTE_IN_ACTIVE_WINDOW); - AddTrueFalse(pGroupTest, _T("Prompt when deleting clips"), CGetSetOptions::GetPromptWhenDeletingClips(), SETTING_PROMP_ON_DELETE); + AddTrueFalse(pGroupTest, _T("Prompt when deleting clips"), CGetSetOptions::GetPromptWhenDeletingClips(), SETTING_PROMPT_ON_DELETE); AddTrueFalse(pGroupTest, _T("Revert to top level group on close"), CGetSetOptions::GetRevertToTopLevelGroup(), SETTING_REVERT_TO_TOP_LEVEL_GROUP); @@ -274,7 +274,7 @@ BOOL CAdvGeneral::OnInitDialog() AddTrueFalse(pGroupTest, _T("Write debug to file"), CGetSetOptions::GetEnableDebugLogging(), SETTING_DEBUG_TO_FILE); AddTrueFalse(pGroupTest, _T("Write debug to OutputDebugString"), CGetSetOptions::GetEnableDebugLogging(), SETTING_DEBUG_TO_OUTPUT_STRING); - CMFCPropertyGridProperty * regexFilterGroup = new CMFCPropertyGridProperty(_T("Exlude clips by Regular Expressions")); + CMFCPropertyGridProperty * regexFilterGroup = new CMFCPropertyGridProperty(_T("Exclude clips by Regular Expressions")); m_propertyGrid.AddProperty(regexFilterGroup); CString processFilterDesc = _T("Process making the copy first must match this before the Regex will be applied (empty or * for all processes) (separate multiples by ;)"); @@ -547,7 +547,7 @@ void CAdvGeneral::OnBnClickedOk() CGetSetOptions::SetShowAllClipsInMainList(val); } break; - case SETTING_PROMP_ON_DELETE: + case SETTING_PROMPT_ON_DELETE: if (wcscmp(pNewValue->bstrVal, pOrigValue->bstrVal) != 0) { BOOL val = false; @@ -921,7 +921,7 @@ void CAdvGeneral::OnBnClickedOk() CGetSetOptions::SetAllowFriends(val); } break; - case SETTING_IGNORE_FALSE_COPIES_DEALY: + case SETTING_IGNORE_FALSE_COPIES_DELAY: if (pNewValue->lVal != pOrigValue->lVal) { CGetSetOptions::SetSaveClipDelay(pNewValue->lVal); diff --git a/CP_Main.cpp b/CP_Main.cpp index c302387..b313090 100644 --- a/CP_Main.cpp +++ b/CP_Main.cpp @@ -268,7 +268,7 @@ BOOL CCP_MainApp::InitInstance() else if(cmdInfo.m_bConnect || cmdInfo.m_bDisconnect) { //First get the saved hwnd and send it a message - //If ditt is running then this will return 1, meening the running ditto process + //If ditto is running then this will return 1, meaning the running ditto process //handled this message //If it didn't handle the message(ditto is not running) then startup this processes of ditto //disconnected from the clipboard @@ -297,7 +297,7 @@ BOOL CCP_MainApp::InitInstance() else if(cmdInfo.m_bOpenWindow || cmdInfo.m_bCloseWindow) { //First get the saved hwnd and send it a message - //If ditt is running then this will return 1, meening the running ditto process + //If ditto is running then this will return 1, meaning the running ditto process //handled this message //If it didn't handle the message(ditto is not running) then startup this processes of ditto //disconnected from the clipboard @@ -305,7 +305,7 @@ BOOL CCP_MainApp::InitInstance() HWND hWnd = (HWND)(LONG_PTR)CGetSetOptions::GetMainHWND(); if(hWnd) { - ret = ::SendMessage(hWnd, WM_OPEN_CLOSE_WINDWOW, cmdInfo.m_bOpenWindow, cmdInfo.m_bCloseWindow); + ret = ::SendMessage(hWnd, WM_OPEN_CLOSE_WINDOW, cmdInfo.m_bOpenWindow, cmdInfo.m_bCloseWindow); } return FALSE; @@ -313,7 +313,7 @@ BOOL CCP_MainApp::InitInstance() else if (cmdInfo.m_exit) { //First get the saved hwnd and send it a message - //If ditt is running then this will return 1, meening the running ditto process + //If ditto is running then this will return 1, meaning the running ditto process //handled this message //If it didn't handle the message(ditto is not running) then startup this processes of ditto //disconnected from the clipboard diff --git a/MainFrm.cpp b/MainFrm.cpp index 6b1fa5f..222ba1f 100644 --- a/MainFrm.cpp +++ b/MainFrm.cpp @@ -54,7 +54,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_WM_DESTROY() ON_COMMAND(ID_FIRST_NEWCLIP, OnFirstNewclip) ON_MESSAGE(WM_SET_CONNECTED, OnSetConnected) - ON_MESSAGE(WM_OPEN_CLOSE_WINDWOW, OnOpenCloseWindow) + ON_MESSAGE(WM_OPEN_CLOSE_WINDOW, OnOpenCloseWindow) ON_MESSAGE(WM_LOAD_ClIP_ON_CLIPBOARD, OnLoadClipOnClipboard) ON_COMMAND(ID_FIRST_GLOBALHOTKEYS, &CMainFrame::OnFirstGlobalhotkeys) ON_MESSAGE(WM_GLOBAL_CLIPS_CLOSED, OnGlobalClipsClosed) @@ -287,7 +287,7 @@ LRESULT CMainFrame::OnHotKey(WPARAM wParam, LPARAM lParam) if(m_bMovedSelectionMoveKeyState == false) { - Log(_T("Setting flag m_bMovedSelectionMoveKeyState to true, will paste when modifer keys are up")); + Log(_T("Setting flag m_bMovedSelectionMoveKeyState to true, will paste when modifier keys are up")); } m_quickPaste.MoveSelection(true); @@ -295,14 +295,14 @@ LRESULT CMainFrame::OnHotKey(WPARAM wParam, LPARAM lParam) } else if(g_Opt.m_HideDittoOnHotKeyIfAlreadyShown && m_quickPaste.IsWindowTopLevel() && g_Opt.GetShowPersistent() == FALSE) { - Log(_T("On Show Ditto HotKey, window is alread visible, hiding window")); + Log(_T("On Show Ditto HotKey, window is already visible, hiding window")); m_quickPaste.HideQPasteWnd(); } else { Log(_T("On Show Ditto HotKey, showing window")); - StartKeyModifyerTimer(); + StartKeyModifierTimer(); ShowQPasteWithActiveWindowCheck(); } @@ -577,7 +577,7 @@ void CMainFrame::DoFirstTenPositionsPaste(int nPos) CATCH_SQLITE_EXCEPTION } -void CMainFrame::StartKeyModifyerTimer() +void CMainFrame::StartKeyModifierTimer() { if (g_Opt.m_moveSelectionOnOpenHotkey) { @@ -629,7 +629,7 @@ void CMainFrame::PasteOrShowGroup(int dbId, BOOL updateClipTime, BOOL activeTarg SetTimer(GROUP_DOUBLE_CLICK, doubleClickTime, 0); - Log(StrF(_T("First Press of group hot key, group Id: %d, timout: %d"), dbId, doubleClickTime)); + Log(StrF(_T("First Press of group hot key, group Id: %d, timeout: %d"), dbId, doubleClickTime)); } } else @@ -786,7 +786,7 @@ void CMainFrame::OnTimer(UINT_PTR nIDEvent) if (theApp.EnterGroupID(m_doubleClickGroupId, FALSE, TRUE)) { theApp.m_activeWnd.TrackActiveWnd(true); - StartKeyModifyerTimer(); + StartKeyModifierTimer(); m_quickPaste.ShowQPasteWnd(this, false, true, FALSE); } } @@ -1179,7 +1179,7 @@ LRESULT CMainFrame::OnOpenCloseWindow(WPARAM wParam, LPARAM lParam) { if(wParam) { - StartKeyModifyerTimer(); + StartKeyModifierTimer(); ShowQPasteWithActiveWindowCheck(); } else if(lParam) diff --git a/MainFrm.h b/MainFrm.h index b5f4d0c..11898ed 100644 --- a/MainFrm.h +++ b/MainFrm.h @@ -82,7 +82,7 @@ class CMainFrame: public CFrameWnd void DoFirstTenPositionsPaste(int nPos); void PasteOrShowGroup(int dbId, BOOL updateClipTime, BOOL activeTarget, BOOL sendPaste, bool pastedFromGroup); - void StartKeyModifyerTimer(); + void StartKeyModifierTimer(); bool PasteQuickPasteEntry(CString csQuickPaste); bool SaveQuickPasteEntry(CString csQuickPaste, CClipList *pClipList); diff --git a/Misc.h b/Misc.h index 58a267b..d992b5e 100644 --- a/Misc.h +++ b/Misc.h @@ -151,7 +151,7 @@ __int64 GetLastWriteTime(const CString &csFile); #define WM_OPTIONS_CLOSED WM_USER + 219 #define WM_SHOW_OPTIONS WM_USER + 220 #define WM_DELETE_CLIPS_CLOSED WM_USER + 221 -#define WM_OPEN_CLOSE_WINDWOW WM_USER + 222 +#define WM_OPEN_CLOSE_WINDOW WM_USER + 222 #define WM_SAVE_CLIPBOARD WM_USER + 223 #define WM_READD_TASKBAR_ICON WM_USER + 224 #define WM_REOPEN_DATABASE WM_USER + 225 diff --git a/QuickPasteKeyboard.cpp b/QuickPasteKeyboard.cpp index bd2bfbf..5dcf942 100644 --- a/QuickPasteKeyboard.cpp +++ b/QuickPasteKeyboard.cpp @@ -43,7 +43,7 @@ BEGIN_MESSAGE_MAP(CQuickPasteKeyboard, CPropertyPage) ON_CBN_SELCHANGE(IDC_COMBO_ALL_ASSIGNED, &CQuickPasteKeyboard::OnCbnSelchangeComboAllAssigned) ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CQuickPasteKeyboard::OnBnClickedButtonRemove) ON_BN_CLICKED(IDC_BUTTON_ADD, &CQuickPasteKeyboard::OnBnClickedButtonAdd) - ON_CBN_KILLFOCUS(IDC_COMBO_ENTER_MODIFYER, &CQuickPasteKeyboard::OnCbnKillfocusComboEnterModifyer) + ON_CBN_KILLFOCUS(IDC_COMBO_ENTER_MODIFIER, &CQuickPasteKeyboard::OnCbnKillfocusComboEnterModifier) ON_EN_KILLFOCUS(IDC_HOTKEY1, &CQuickPasteKeyboard::OnEnKillfocusEdit1) ON_WM_KILLFOCUS() ON_BN_CLICKED(IDC_BUTTON_ENTER, &CQuickPasteKeyboard::OnBnClickedButtonEnter) @@ -747,7 +747,7 @@ void CQuickPasteKeyboard::SelectMouseTypeCombo(CComboBox &combo, int value) } -void CQuickPasteKeyboard::OnCbnKillfocusComboEnterModifyer() +void CQuickPasteKeyboard::OnCbnKillfocusComboEnterModifier() { // TODO: Add your control notification handler code here } diff --git a/QuickPasteKeyboard.h b/QuickPasteKeyboard.h index cee6de2..1ea3ad4 100644 --- a/QuickPasteKeyboard.h +++ b/QuickPasteKeyboard.h @@ -76,7 +76,7 @@ class CQuickPasteKeyboard : public CPropertyPage afx_msg void OnCbnSelchangeComboAllAssigned(); afx_msg void OnBnClickedButtonRemove(); afx_msg void OnBnClickedButtonAdd(); - afx_msg void OnCbnKillfocusComboEnterModifyer(); + afx_msg void OnCbnKillfocusComboEnterModifier(); afx_msg void OnEnKillfocusEdit1(); afx_msg void OnKillFocus(CWnd* pNewWnd); virtual BOOL PreTranslateMessage(MSG* pMsg); diff --git a/Resource.h b/Resource.h index 2583f61..e9abc4d 100644 --- a/Resource.h +++ b/Resource.h @@ -557,7 +557,7 @@ #define IDC_RADIO_ENTER 2128 #define IDC_RADIO_CURRENT_TYPES 2128 #define IDC_RADIO_USE_HOST_NAME 2129 -#define IDC_COMBO_ENTER_MODIFYER 2129 +#define IDC_COMBO_ENTER_MODIFIER 2129 #define IDC_STATIC_REMOTE_FILE_REQUEST 2130 #define IDC_RADIO3 2130 #define IDC_RADIO_MOUSE 2130 @@ -568,7 +568,7 @@ #define IDC_RADIO_KEYBOARD2 2133 #define IDC_RADIO_KEYBOARD_2 2133 #define IDC_RADIO_ENTER2 2134 -#define IDC_COMBO_ENTER_MODIFYER2 2135 +#define IDC_COMBO_ENTER_MODIFIER2 2135 #define IDC_BUTTON_ENTER 2135 #define IDC_RADIO4 2136 #define IDC_RADIO_MOUSE_2 2136