- Updated descriptions for shortcut keys

- Fixed issue with assigning multiple keys
- If right click menu is not within window rect show in it

ActionEnums.cpp

@@ -18,33 +18,33 @@ CString ActionEnums::EnumDescription(ActionEnumValues value)
 	switch (value)
 	{
 	case SHOWDESCRIPTION:
-		return "SHOWDESCRIPTION";
+		return "View Full Description";
 	case NEXTDESCRIPTION:
-		return "NEXTDESCRIPTION";
+		return "Next Full Description";
 	case PREVDESCRIPTION:
-		return "PREVDESCRIPTION";
+		return "Previous Full Description";
 	case SHOWMENU:
-		return "SHOWMENU";
+		return "Show Context Menu";
 	case NEWGROUP:
-		return "NEWGROUP";
+		return "New Group";
 	case NEWGROUPSELECTION:
-		return "NEWGROUPSELECTION";
+		return "New Group Selection";
 	case TOGGLEFILELOGGING:
-		return "TOGGLEFILELOGGING";
+		return "Toggle On File Logging";
 	case TOGGLEOUTPUTDEBUGSTRING:
-		return "TOGGLEOUTPUTDEBUGSTRING";
+		return "Toggle OutputDebugString Logging";
 	case CLOSEWINDOW:
-		return "CLOSEWINDOW";
+		return "Close Window";
 	case NEXTTABCONTROL:
 		return "NEXTTABCONTROL";
 	case PREVTABCONTROL:
 		return "PREVTABCONTROL";
 	case SHOWGROUPS:
-		return "SHOWGROUPS";
+		return "View Groups";
 	case NEWCLIP:
-		return "NEWCLIP";
+		return "New Clip";
 	case EDITCLIP:
-		return "EDITCLIP";
+		return "Edit Clip";
 	case SELECTIONUP:
 		return "SELECTIONUP";
 	case SELECTIONDOWN:
@@ -54,67 +54,67 @@ CString ActionEnums::EnumDescription(ActionEnumValues value)
 	case MOVELAST:
 		return "MOVELAST";
 	case CANCELFILTER:
-		return "CANCELFILTER";
+		return "Cancel Filter";
 	case HOMELIST:
 		return "HOMELIST";
 	case BACKGRROUP:
-		return "BACKGRROUP";
+		return "Back Group";
 	case TOGGLESHOWPERSISTANT:
-		return "TOGGLESHOWPERSISTANT";
+		return "Toggle Show Persistant";
 	case PASTE_SELECTED:
-		return "PASTE_SELECTED";
+		return "Paste Selected";
 	case DELETE_SELECTED:
-		return "DELETE_SELECTED";
+		return "Delete Selected";
 	case CLIP_PROPERTIES:
-		return "CLIP_PROPERTIES";
+		return "Clip Properties";
 	case PASTE_SELECTED_PLAIN_TEXT:
-		return "PASTE_SELECTED_PLAIN_TEXT";
+		return "Paste Selected Plain Text";
 	case MOVE_CLIP_TO_GROUP:
-		return "MOVE_CLIP_TO_GROUP";
+		return "Move Clip To Group";
 	case ELEVATE_PRIVlEGES:
-		return "ELEVATE_PRIVlEGES";
+		return "Option - Elevate Privleges";
 	case SHOW_IN_TASKBAR:
-		return "SHOW_IN_TASKBAR";
+		return "Option - Show In TaskBar";
 	case COMPARE_SELECTED_CLIPS:
-		return "COMPARE_SELECTED_CLIPS";
+		return "Compare Selected Clips";
 	case SELECT_LEFT_SIDE_COMPARE:
-		return "SELECT_LEFT_SIDE_COMPARE";
+		return "Select Left File For Compare";
 	case SELECT_RIGHT_SITE_AND_DO_COMPARE:
-		return "SELECT_RIGHT_SITE_AND_DO_COMPARE";
+		return "Select Right File And Do Compare";
 	case EXPORT_TO_TEXT_FILE:
-		return "EXPORT_TO_TEXT_FILE";
+		return "Export To Text File";
 	case EXPORT_TO_QR_CODE:
-		return "EXPORT_TO_QR_CODE";
+		return "Export To QR Code";
 	case EXPORT_TO_GOOGLE_TRANSLATE:
-		return "EXPORT_TO_GOOGLE_TRANSLATE";
+		return "Export To Google Translate";
 	case EXPORT_TO_BITMAP_FILE:
-		return "EXPORT_TO_BITMAP_FILE";
+		return "Export To Image File";
 	case SAVE_CURRENT_CLIPBOARD:
-		return "SAVE_CURRENT_CLIPBOARD";
+		return "Save Current Clipboard";
 	case MOVE_CLIP_UP:
-		return "MOVE_CLIP_UP";
+		return "Move Clip Up";
 	case MOVE_CLIP_DOWN:
-		return "MOVE_CLIP_DOWN";
+		return "Move Clip Down";
 	case MOVE_CLIP_TOP:
-		return "MOVE_CLIP_TOP";
+		return "Move Clip Top";
 	case FILTER_ON_SELECTED_CLIP:
-		return "FILTER_ON_SELECTED_CLIP";
+		return "Filter On Selected Clip";
 	case PASTE_UPPER_CASE:
-		return "PASTE_UPPER_CASE";
+		return "Paste Upper Case";
 	case PASTE_LOWER_CASE:
-		return "PASTE_LOWER_CASE";
+		return "Paste Lower Case";
 	case PASTE_CAPITALiZE:
-		return "PASTE_CAPITALiZE";
+		return "Paste Capitalize";
 	case PASTE_SENTENCE_CASE:
-		return "PASTE_SENTENCE_CASE";
+		return "Paste Sentence Case";
 	case PASTE_REMOVE_LINE_FEEDS:
-		return "PASTE_REMOVE_LINE_FEEDS";
+		return "Paste Remove Line Feeds";
 	case PASTE_ADD_ONE_LINE_FEED:
-		return "PASTE_ADD_ONE_LINE_FEED";
+		return "Paste Add One Line Feed";
 	case PASTE_ADD_TWO_LINE_FEEDS:
-		return "PASTE_ADD_TWO_LINE_FEEDS";
+		return "Paste Add Two Line Feeds";
 	case PASTE_TYPOGLYCEMIA:
-		return "PASTE_TYPOGLYCEMIA";
+		return "Paste Typoglycemia";
 	case SEND_TO_FRIEND_1:
 		return "Send to friend 1";
 	case SEND_TO_FRIEND_2:
@@ -226,7 +226,9 @@ int ActionEnums::GetDefaultShortCutKeyA(ActionEnumValues value, int pos)
 		case PASTE_POSITION_9:
 			return ACCEL_MAKEKEY('9', HOTKEYF_CONTROL);
 		case PASTE_POSITION_10:
-			return ACCEL_MAKEKEY('0 ', HOTKEYF_CONTROL);
+			return ACCEL_MAKEKEY('0', HOTKEYF_CONTROL);
+		case CLOSEWINDOW:
+			return VK_ESCAPE;
 		}
 		break;
 	case 1:
@@ -294,7 +296,6 @@ bool ActionEnums::UserConfigurable(ActionEnumValues value)
 	case ActionEnums::TOGGLEFILELOGGING:
 	case ActionEnums::TOGGLEOUTPUTDEBUGSTRING:
 	case ActionEnums::HOMELIST:
-	case ActionEnums::CLOSEWINDOW:
 		return false;
 	}
 

Options.cpp

@@ -2306,7 +2306,7 @@ void CGetSetOptions::SetShowMsgWndOnCopyToGroup(BOOL val)
 int CGetSetOptions::GetActionShortCutA(DWORD action, int pos)
 {
 	CString actionText;
-	actionText.Format(_T("%d_%d_A"), action, pos);
+	actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
 	int ret = GetProfileLong(actionText, -1);
 	if (ret == -1)
 	{
@@ -2319,14 +2319,14 @@ int CGetSetOptions::GetActionShortCutA(DWORD action, int pos)
 void CGetSetOptions::SetActionShortCutA(int action, DWORD shortcut, int pos)
 {
 	CString actionText;
-	actionText.Format(_T("%d_%d_A"), action, pos);
+	actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
 	SetProfileLong(actionText, shortcut);
 }
 
 int CGetSetOptions::GetActionShortCutB(DWORD action, int pos)
 {
 	CString actionText;
-	actionText.Format(_T("%d_%d_B"), action, pos);
+	actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
 	int ret = GetProfileLong(actionText, -1);
 	if (ret == -1)
 	{
@@ -2339,7 +2339,7 @@ int CGetSetOptions::GetActionShortCutB(DWORD action, int pos)
 void CGetSetOptions::SetActionShortCutB(int action, DWORD shortcut, int pos)
 {
 	CString actionText;
-	actionText.Format(_T("%d_%d_B"), action, pos);
+	actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
 	SetProfileLong(actionText, shortcut);
 }
 

QPasteWnd.cpp

@@ -438,7 +438,6 @@ void CQPasteWnd::LoadShortcuts()
 	m_actions.AddAccel(ActionEnums::TOGGLEFILELOGGING, ACCEL_MAKEKEY(VK_F5, HOTKEYF_CONTROL));
 	m_actions.AddAccel(ActionEnums::TOGGLEOUTPUTDEBUGSTRING, VK_F5);
 	m_actions.AddAccel(ActionEnums::HOMELIST, VK_HOME);
-	m_actions.AddAccel(ActionEnums::CLOSEWINDOW, VK_ESCAPE);
 	m_actions.AddAccel(ActionEnums::SHOWMENU, VK_APPS);
 
 	for (DWORD i = ActionEnums::FIRST_ACTION + 1; i < ActionEnums::LAST_ACTION; i++)
@@ -1326,20 +1325,31 @@ void CQPasteWnd::ShowRightClickMenu()
     CMenu *cmSubMenu = NULL;
 
     GetCursorPos(&pp);
-    if(cmPopUp.LoadMenu(IDR_QUICK_PASTE) != 0)
-    {
-        cmSubMenu = cmPopUp.GetSubMenu(0);
-        if(!cmSubMenu)
-        {
-            return ;
-        }
+	if (cmPopUp.LoadMenu(IDR_QUICK_PASTE) != 0)
+	{
+		cmSubMenu = cmPopUp.GetSubMenu(0);
+		if (!cmSubMenu)
+		{
+			return;
+		}
 
-       /* int nItem = m_lstHeader.GetCaret();
-        CRect rc;
-        m_lstHeader.GetItemRect(nItem, rc, LVIR_BOUNDS);
-        ClientToScreen(rc);
-        pp.x = rc.left;
-        pp.y = rc.bottom;*/
+		int nItem = m_lstHeader.GetCaret();
+		CRect listRect;
+		m_lstHeader.GetWindowRect(listRect);
+		if (listRect.PtInRect(pp) == FALSE)
+		{
+			CRect rc;
+			m_lstHeader.GetItemRect(nItem, rc, LVIR_BOUNDS);
+			ClientToScreen(rc);
+			pp.x = rc.left;
+			pp.y = rc.bottom;
+
+			if (listRect.PtInRect(pp) == FALSE)
+			{
+				pp.x = listRect.left;
+				pp.y = listRect.top;
+			}
+		}	
 
         theApp.m_Addins.AddPrePasteAddinsToMenu(cmSubMenu);
         

QuickPasteKeyboard.cpp

@@ -416,10 +416,10 @@ void CQuickPasteKeyboard::OnBnClickedButtonAdd()
 		{
 			CString shortcut;
 			int pos = m_assignedCombo.AddString(shortcut);
-			m_assignedCombo.SetItemData(pos, count + 1);
+			m_assignedCombo.SetItemData(pos, count);
 			m_assignedCombo.SetCurSel(pos);
 
-			LoadHotKey(m_map[id].Array[count + 1]);
+			LoadHotKey(m_map[id].Array[count]);
 
 			m_hotKey1.SetFocus();
 		}