Register new global save to group shortcut key with correct type

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@800 595ec19a-5cb4-439b-94a8-42fb3063c22c

CopyProperties.cpp

@@ -314,7 +314,7 @@ BOOL CCopyProperties::CheckGlobalHotKey(CClip &clip)
 
 	if(clip.m_globalShortCut)
 	{
-		ret = g_HotKeys.ValidateClip(clip.m_id, clip.m_shortCut, clip.m_Desc);
+		ret = g_HotKeys.ValidateClip(clip.m_id, clip.m_shortCut, clip.m_Desc, CHotKey::PASTE_OPEN_CLIP);
 	}
 	else
 	{
@@ -331,7 +331,7 @@ BOOL CCopyProperties::CheckMoveToGroupGlobalHotKey(CClip &clip)
 
 	if(clip.m_globalMoveToGroupShortCut)
 	{
-		ret = g_HotKeys.ValidateClip(clip.m_id, clip.m_moveToGroupShortCut, clip.m_Desc);
+		ret = g_HotKeys.ValidateClip(clip.m_id, clip.m_moveToGroupShortCut, clip.m_Desc, CHotKey::MOVE_TO_GROUP);
 	}
 	else
 	{

HotKeys.cpp

@@ -307,13 +307,15 @@ bool CHotKeys::Remove(int clipId, CHotKey::HotKeyType hkType)
 	return false;
 }
 
-BOOL CHotKeys::ValidateClip(int clipId, DWORD key, CString desc)
+BOOL CHotKeys::ValidateClip(int clipId, DWORD key, CString desc, CHotKey::HotKeyType hkType)
 {
 	CHotKey *pKey = NULL;
 	INT_PTR count = GetSize();
 	for(int i=0; i < count; i++)
 	{
-		if(ElementAt(i) != NULL && ElementAt(i)->m_clipId == clipId)
+		if(ElementAt(i) != NULL && 
+			ElementAt(i)->m_clipId == clipId &&
+			ElementAt(i)->m_hkType == hkType)
 		{
 			pKey = ElementAt(i);
 			break;
@@ -322,7 +324,7 @@ BOOL CHotKeys::ValidateClip(int clipId, DWORD key, CString desc)
 
 	if(pKey == NULL)
 	{
-		pKey = new CHotKey(desc, key, true);
+		pKey = new CHotKey(desc, key, true, hkType);
 	}
 	   
 	BOOL ret = FALSE;

HotKeys.h

@@ -68,7 +68,7 @@ public:
 
 	bool Remove(int clipId, CHotKey::HotKeyType hkType);
 
-	BOOL ValidateClip(int clipId, DWORD key, CString desc);
+	BOOL ValidateClip(int clipId, DWORD key, CString desc, CHotKey::HotKeyType hkType);
 
 	// profile load / save
 	void LoadAllKeys();