Browse Source

added keyboard shortcut to open the system menu, defaults to control-right click keyboard key, Can be customized in option quick paste keyboard.

sabrogden 5 years ago
parent
commit
587dd598ee
4 changed files with 15 additions and 3 deletions
  1. 4 1
      ActionEnums.cpp
  2. 1 0
      ActionEnums.h
  3. 9 2
      QPasteWnd.cpp
  4. 1 0
      QPasteWnd.h

+ 4 - 1
ActionEnums.cpp

@@ -32,6 +32,9 @@ CString ActionEnums::EnumDescription(ActionEnumValues value)
 	case SHOWMENU:
 		val = "Show Context Menu";
 		break;
+	case SYSTEM_MENU:
+		val = "Show System Context Menu";
+		break;
 	case NEWGROUP:
 		val = "New Group";
 		break;
@@ -424,7 +427,7 @@ int ActionEnums::GetDefaultShortCutKeyA(ActionEnumValues value, int pos)
 		case ActionEnums::PASTE_SELECTED:
 			return VK_RETURN;
 		case ActionEnums::SHOWMENU:
-			return VK_MOUSE_RIGHT_CLICK;
+			return VK_MOUSE_RIGHT_CLICK;		
 		case PASTE_POSITION_1:
 			return ACCEL_MAKEKEY('1', HOTKEYF_CONTROL);
 		case PASTE_POSITION_2:

+ 1 - 0
ActionEnums.h

@@ -127,6 +127,7 @@ public:
 		FORCE_CLOSE_WINDOW,
 		REFRESH_LIST,
 		DELETE_ALL_NON_USED_CLIPS,
+		SYSTEM_MENU,
 
 		LAST_ACTION
 	};

+ 9 - 2
QPasteWnd.cpp

@@ -503,6 +503,7 @@ void CQPasteWnd::LoadShortcuts()
 
 	m_actions.AddAccel(ActionEnums::HOMELIST, VK_HOME);
 	m_actions.AddAccel(ActionEnums::SHOWMENU, VK_APPS);
+	m_actions.AddAccel(ActionEnums::SYSTEM_MENU, ACCEL_MAKEKEY(VK_APPS, HOTKEYF_CONTROL));
 
 	m_search.SetLastSearchAccel(CAccel(0, ActionEnums::APPLY_LAST_SEARCH, 0));
 
@@ -2985,6 +2986,9 @@ bool CQPasteWnd::DoAction(CAccel a)
 	case ActionEnums::SHOWMENU:
 		ret = DoActionShowMenu();
 		break;
+	case ActionEnums::SYSTEM_MENU:
+		ret = DoActionShowSystemMenu();
+		break;
 	case ActionEnums::NEWGROUP:
 		ret = DoActionNewGroup();
 		break;
@@ -3528,7 +3532,12 @@ bool CQPasteWnd::DoActionPrevDescription()
 bool CQPasteWnd::DoActionShowMenu()
 {
 	ShowRightClickMenu();
+	return true;
+}
 
+bool CQPasteWnd::DoActionShowSystemMenu()
+{
+	OnSystemButton();
 	return true;
 }
 
@@ -6539,13 +6548,11 @@ void CQPasteWnd::OnUpdateCliporderMovetotop(CCmdUI *pCmdUI)
 	UpdateMenuShortCut(pCmdUI, ActionEnums::MOVE_CLIP_TOP);
 }
 
-
 void CQPasteWnd::OnMenuFilteron()
 {
 	DoAction(ActionEnums::FILTER_ON_SELECTED_CLIP);
 }
 
-
 void CQPasteWnd::OnUpdateMenuFilteron(CCmdUI *pCmdUI)
 {
 	if (!pCmdUI->m_pMenu)

+ 1 - 0
QPasteWnd.h

@@ -229,6 +229,7 @@ public:
 	bool DoActionNextDescription(); 
 	bool DoActionPrevDescription();
 	bool DoActionShowMenu();
+	bool DoActionShowSystemMenu();
 	bool DoActionNewGroup();
 	bool DoActionNewGroupSelection();
 	bool DoActionToggleFileLogging();