assign short cut keys to past scripts

Accels.cpp

@@ -16,13 +16,13 @@ void CAccels::AddAccel(CAccel a)
 	m_multiMap.insert(pair<DWORD, CAccel>(a.Key, a));
 }
 
-void CAccels::AddAccel(DWORD cmd, DWORD key, DWORD key2)
+void CAccels::AddAccel(DWORD cmd, DWORD key, DWORD key2, CString refData)
 {
 	if ((int)key2 <= 0)
 	{
 		key2 = 0;
 	}
-	CAccel a(key, cmd, key2);
+	CAccel a(key, cmd, key2, refData);
 
 	m_multiMap.insert(pair<DWORD, CAccel>(key, a));
 }

Accels.h

@@ -16,13 +16,15 @@ public:
 	DWORD Key2;
     DWORD Cmd;
 	int RefId;
+	CString RefData;
 
-    CAccel(DWORD key = 0, DWORD cmd = 0, DWORD key2 = 0)
+    CAccel(DWORD key = 0, DWORD cmd = 0, DWORD key2 = 0, CString refData = _T(""))
     {
         Key = key;
 		Key2 = key2;
         Cmd = cmd;
 		RefId = 0;
+		RefData = refData;
     }
 };
 
@@ -36,7 +38,7 @@ public:
 
     void AddAccel(CAccel a);
 
-	void AddAccel(DWORD cmd, DWORD key, DWORD key2 = 0);
+	void AddAccel(DWORD cmd, DWORD key, DWORD key2 = 0, CString refData = _T(""));
 
 	void RemoveAll();
 

ActionEnums.cpp

@@ -302,6 +302,9 @@ CString ActionEnums::EnumDescription(ActionEnumValues value)
 	case MOVE_CLIP_LAST:
 		val = "Move Clip Last";
 		break;
+	case PASTE_SCRIPT:
+		val = "Paste Script";
+		break;
 	}
 
 	CString translatedValue = theApp.m_Language.GetQuickPasteKeyboardString(value, val);
@@ -438,6 +441,7 @@ bool ActionEnums::UserConfigurable(ActionEnumValues value)
 	case ActionEnums::TOGGLEFILELOGGING:
 	case ActionEnums::TOGGLEOUTPUTDEBUGSTRING:
 	case ActionEnums::HOMELIST:
+	case ActionEnums::PASTE_SCRIPT:
 		return false;
 	}
 

ActionEnums.h

@@ -101,6 +101,7 @@ public:
 		TOGGLE_DESCRIPTION_WORD_WRAP,
 		APPLY_LAST_SEARCH,
 		TOGGLE_SEARCH_METHOD,
+		PASTE_SCRIPT,
 		MOVE_CLIP_LAST,
 
 

AdvGeneral.cpp

@@ -659,6 +659,7 @@ void CAdvGeneral::OnBnClickedButtonCopyScripts()
 	CDimWnd dim(this);
 
 	CScriptEditor e(this);
+	e.m_title = _T("Copy Scripts");
 	e.m_xml.Load(CGetSetOptions::GetCopyScriptsXml());
 	if (e.DoModal() == IDOK)
 	{
@@ -672,6 +673,7 @@ void CAdvGeneral::OnBnClickedButtonPasteScripts2()
 	CDimWnd dim(this);
 
 	CScriptEditor e(this);
+	e.m_title = _T("Paste Scripts");
 	e.m_xml.Load(CGetSetOptions::GetPasteScriptsXml());
 	if (e.DoModal() == IDOK)
 	{

ChaiScriptOnCopy.cpp

@@ -30,6 +30,7 @@ bool ChaiScriptOnCopy::ProcessScript(CDittoChaiScript &clipData, std::string scr
 		chai.add(chaiscript::fun(&CDittoChaiScript::GetClipSize), "GetClipSize");
 		chai.add(chaiscript::fun(&CDittoChaiScript::GetAsciiString), "GetAsciiString");
 		chai.add(chaiscript::fun(&CDittoChaiScript::SetAsciiString), "SetAsciiString");
+		chai.add(chaiscript::fun(&CDittoChaiScript::GetActiveApp), "GetActiveApp");
 
 		chai.add(chaiscript::var(&clipData), "clip");
 

ChaiScriptXml.cpp

@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "ChaiScriptXml.h"
-
 #include "tinyxml\tinyxml.h"
-
 #include "Shared\TextConvert.h"
+#include "Misc.h"
 
 
 CChaiScriptXml::CChaiScriptXml()
 {
+	m_assignedGuidOnLoad = false;
 }
 
 
@@ -33,6 +33,7 @@ CString CChaiScriptXml::GetScript(CString name, BOOL &active)
 
 void CChaiScriptXml::Load(CString values)
 {
+	m_assignedGuidOnLoad = false;
 	m_list.clear();
 	
 	TiXmlDocument doc;
@@ -53,6 +54,14 @@ void CChaiScriptXml::Load(CString values)
 			array_item.m_name = ItemElement->Attribute("name");
 			array_item.m_description = ItemElement->Attribute("description");
 			array_item.m_script = ItemElement->Attribute("script");
+			array_item.m_guid = ItemElement->Attribute("guid");
+			array_item.m_version = ItemElement->Attribute("vesion");
+
+			if (array_item.m_guid == "")
+			{
+				array_item.m_guid = NewGuidString();
+				m_assignedGuidOnLoad = true;
+			}
 
 			m_list.push_back(array_item);
 
@@ -63,6 +72,7 @@ void CChaiScriptXml::Load(CString values)
 
 CString CChaiScriptXml::Save()
 {
+	m_assignedGuidOnLoad = false;
 	TiXmlDocument doc;
 
 	TiXmlElement* friendOuter = new TiXmlElement("ChaiScripts");
@@ -86,6 +96,14 @@ CString CChaiScriptXml::Save()
 		CTextConvert::ConvertToUTF8(listItem.m_script, script);
 		friendElement->SetAttribute("script", script);
 
+		CStringA guid;
+		CTextConvert::ConvertToUTF8(listItem.m_guid, guid);
+		friendElement->SetAttribute("guid", guid);
+
+		CStringA version;
+		CTextConvert::ConvertToUTF8(listItem.m_version, version);
+		friendElement->SetAttribute("version", version);
+
 		friendOuter->LinkEndChild(friendElement);
 	}
 

ChaiScriptXml.h

@@ -11,11 +11,14 @@ public:
 	CDittoChaiScriptXmlItem()
 	{
 		m_active = FALSE;
+		m_version = "1.0.0.0";
 	}
 	BOOL m_active;
 	CString m_name;
 	CString m_description;
 	CString m_script;
+	CString m_guid;
+	CString m_version;
 };
 
 class CChaiScriptXml
@@ -26,10 +29,9 @@ public:
 
 	CString Save();
 	void Load(CString values);
-
-	CString GetScript(CString name, BOOL &active);
+	CString GetScript(CString name, BOOL &active);	
+	void AddToMenu(CMenu *pMenu);
 
 	std::vector<CDittoChaiScriptXmlItem> m_list;
-
-	void AddToMenu(CMenu *pMenu);
+	bool m_assignedGuidOnLoad;
 };

Misc.cpp

@@ -1345,4 +1345,18 @@ bool RemoveRTFSection(CStringA &str, CStringA section)
 	}
 
 	return removedSection;
+}
+
+CString NewGuidString()
+{
+	CString guidString;
+
+	GUID guid;
+	CoCreateGuid(&guid);
+	guidString.Format(_T("%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX"),
+		guid.Data1, guid.Data2, guid.Data3,
+		guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
+		guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
+
+	return guidString;
 }

Misc.h

@@ -190,4 +190,6 @@ void DeleteParamFromRTF(CStringA &test, CStringA find, bool searchForTrailingDig
 
 bool RemoveRTFSection(CStringA &str, CStringA section);
 
+CString NewGuidString();
+
 #endif // !defined(AFX_CP_GUI_GLOBALS__FBCDED09_A6F2_47EB_873F_50A746EBC86B__INCLUDED_)

OleClipSource.cpp

@@ -198,35 +198,42 @@ BOOL COleClipSource::DoImmediateRender()
 	
 	SaveDittoFileDataToFile(clip);
 
-	if (m_pasteOptions.m_pasteScriptIndex >= 0 &&
-		m_pasteOptions.m_pasteScriptIndex < g_Opt.m_pasteScripts.m_list.size())
+	if (m_pasteOptions.m_pasteScriptGuid != _T(""))
 	{
-		try
+		for (auto & element : g_Opt.m_pasteScripts.m_list)
 		{
-			Log(StrF(_T("Start of paste script name: %s, script: %s"), g_Opt.m_pasteScripts.m_list[m_pasteOptions.m_pasteScriptIndex].m_name, g_Opt.m_pasteScripts.m_list[m_pasteOptions.m_pasteScriptIndex].m_script));
-
-			ChaiScriptOnCopy onPaste;
-			CDittoChaiScript clipData(&clip, "");
-			if (onPaste.ProcessScript(clipData, (LPCSTR)CTextConvert::ConvertToChar(g_Opt.m_pasteScripts.m_list[m_pasteOptions.m_pasteScriptIndex].m_script)) == false)
+			if (element.m_guid == m_pasteOptions.m_pasteScriptGuid)
 			{
-				Log(StrF(_T("End of paste script name: %s, returned false, not saving this copy to Ditto, last Error: %s"), g_Opt.m_pasteScripts.m_list[m_pasteOptions.m_pasteScriptIndex].m_name, onPaste.m_lastError));
+				try
+				{
+					Log(StrF(_T("Start of paste script name: %s, script: %s"), element.m_name, element.m_script));
 
-				return FALSE;
-			}
+					ChaiScriptOnCopy onPaste;
+					CDittoChaiScript clipData(&clip, "");
+					if (onPaste.ProcessScript(clipData, (LPCSTR)CTextConvert::ConvertToChar(element.m_script)) == false)
+					{
+						Log(StrF(_T("End of paste script name: %s, returned false, not saving this copy to Ditto, last Error: %s"), element.m_name, onPaste.m_lastError));
 
-			Log(StrF(_T("End of paste script name: %s, returned true, last Error: %s"), g_Opt.m_pasteScripts.m_list[m_pasteOptions.m_pasteScriptIndex].m_name, onPaste.m_lastError));			
-		}
-		catch (CException *ex)
-		{
-			TCHAR szCause[255];
-			ex->GetErrorMessage(szCause, 255);
-			CString cs;
-			cs.Format(_T("chai script paste exception: %s"), szCause);
-			Log(cs);
-		}
-		catch (...)
-		{
-			Log(_T("chai script paste exception 2"));
+						return FALSE;
+					}
+
+					Log(StrF(_T("End of paste script name: %s, returned true, last Error: %s"), element.m_name, onPaste.m_lastError));
+				}
+				catch (CException *ex)
+				{
+					TCHAR szCause[255];
+					ex->GetErrorMessage(szCause, 255);
+					CString cs;
+					cs.Format(_T("chai script paste exception: %s"), szCause);
+					Log(cs);
+				}
+				catch (...)
+				{
+					Log(_T("chai script paste exception 2"));
+				}
+
+				break;
+			}
 		}
 	}
 

Options.cpp

@@ -203,7 +203,15 @@ void CGetSetOptions::LoadSettings()
 	m_Theme.Load(GetTheme());
 
 	m_copyScripts.Load(GetCopyScriptsXml());
+	if (m_copyScripts.m_assignedGuidOnLoad)
+	{
+		SetCopyScriptsXml(m_copyScripts.Save());
+	}
 	m_pasteScripts.Load(GetPasteScriptsXml());
+	if (m_pasteScripts.m_assignedGuidOnLoad)
+	{
+		SetPasteScriptsXml(m_pasteScripts.Save());
+	}
 
 	m_tooltipTimeout = GetToolTipTimeout();
 }
@@ -2321,10 +2329,17 @@ void CGetSetOptions::SetShowMsgWndOnCopyToGroup(BOOL val)
 	SetProfileLong(_T("ShowMsgWndOnCopyToGroup"), val);
 }
 
-int CGetSetOptions::GetActionShortCutA(DWORD action, int pos)
+int CGetSetOptions::GetActionShortCutA(DWORD action, int pos, CString refData)
 {
 	CString actionText;
-	actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
+	if (refData != _T(""))
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%s_%d_A"), action, refData, pos);
+	}
+	else
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
+	}
 	int ret = GetProfileLong(actionText, -1);
 	if (ret == -1)
 	{
@@ -2334,17 +2349,31 @@ int CGetSetOptions::GetActionShortCutA(DWORD action, int pos)
 	return ret;
 }
 
-void CGetSetOptions::SetActionShortCutA(int action, DWORD shortcut, int pos)
+void CGetSetOptions::SetActionShortCutA(int action, DWORD shortcut, int pos, CString refData)
 {
 	CString actionText;
-	actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
+	if (refData != _T(""))
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%s_%d_A"), action, refData, pos);
+	}
+	else
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%d_A"), action, pos);
+	}
 	SetProfileLong(actionText, shortcut);
 }
 
-int CGetSetOptions::GetActionShortCutB(DWORD action, int pos)
+int CGetSetOptions::GetActionShortCutB(DWORD action, int pos, CString refData)
 {
 	CString actionText;
-	actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
+	if (refData != _T(""))
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%s_%d_B"), action, refData, pos);
+	}
+	else
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
+	}
 	int ret = GetProfileLong(actionText, -1);
 	if (ret == -1)
 	{
@@ -2354,10 +2383,17 @@ int CGetSetOptions::GetActionShortCutB(DWORD action, int pos)
 	return ret;
 }
 
-void CGetSetOptions::SetActionShortCutB(int action, DWORD shortcut, int pos)
+void CGetSetOptions::SetActionShortCutB(int action, DWORD shortcut, int pos, CString refData)
 {
 	CString actionText;
-	actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
+	if (refData != _T(""))
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%s_%d_B"), action, refData, pos);
+	}
+	else
+	{
+		actionText.Format(_T("QP_ShortCut_%d_%d_B"), action, pos);
+	}
 	SetProfileLong(actionText, shortcut);
 }
 

Options.h

@@ -508,11 +508,11 @@ public:
 	static BOOL GetShowMsgWndOnCopyToGroup();
 	static void SetShowMsgWndOnCopyToGroup(BOOL val);
 
-	static int GetActionShortCutA(DWORD action, int pos);
-	static void SetActionShortCutA(int action, DWORD shortcut, int pos);
+	static int GetActionShortCutA(DWORD action, int pos, CString refData = _T(""));
+	static void SetActionShortCutA(int action, DWORD shortcut, int pos, CString refData = _T(""));
 
-	static int GetActionShortCutB(DWORD action, int pos);
-	static void SetActionShortCutB(int action, DWORD shortcut, int pos);
+	static int GetActionShortCutB(DWORD action, int pos, CString refData = _T(""));
+	static void SetActionShortCutB(int action, DWORD shortcut, int pos, CString refData = _T(""));
 
 	static BOOL	m_bShowAlwaysOnTopWarning;
 	static BOOL GetShowAlwaysOnTopWarning();

QPasteWnd.cpp

@@ -533,6 +533,19 @@ void CQPasteWnd::LoadShortcuts()
 		}
 	}
 
+	for (auto & element : g_Opt.m_pasteScripts.m_list)
+	{
+		for (int i = 0; i < 10; i++)
+		{
+			int a = g_Opt.GetActionShortCutA(ActionEnums::PASTE_SCRIPT, i, element.m_guid);
+			if (a > 0)
+			{
+				int b = g_Opt.GetActionShortCutB(ActionEnums::PASTE_SCRIPT, i, element.m_guid);
+				m_actions.AddAccel(ActionEnums::PASTE_SCRIPT, a, b, element.m_guid);
+			}
+		}
+	}
+
 	m_lstHeader.SetTooltipActions(&m_toolTipActions);
 }
 
@@ -2836,7 +2849,7 @@ bool CQPasteWnd::CheckActions(MSG * pMsg)
 	{
 		if (m_modifierKeyActions.OnMsg(pMsg, a))
 		{
-			ret = DoAction(a.Cmd);
+			ret = DoAction(a);
 		}
 	}
 
@@ -2844,18 +2857,18 @@ bool CQPasteWnd::CheckActions(MSG * pMsg)
 	{
 		if (m_actions.OnMsg(pMsg, a))
 		{
-			ret = DoAction(a.Cmd);
+			ret = DoAction(a);
 		}
 	}
 
 	return ret;
 }
 
-bool CQPasteWnd::DoAction(DWORD actionId)
+bool CQPasteWnd::DoAction(CAccel a)
 {
 	bool ret = false;
 
-	switch (actionId)
+	switch (a.Cmd)
 	{
 	case ActionEnums::SHOWDESCRIPTION:
 		ret = DoActionShowDescription();
@@ -3139,11 +3152,23 @@ bool CQPasteWnd::DoAction(DWORD actionId)
 	case ActionEnums::TOGGLE_SEARCH_METHOD:
 		ret = DoActionToggleSearchMethod();
 		break;
+	case ActionEnums::PASTE_SCRIPT:
+		ret = DoActionPasteScript(a.RefData);
+		break;
 	}
 
 	return ret;
 }
 
+bool CQPasteWnd::DoActionPasteScript(CString scriptGuid)
+{
+	CSpecialPasteOptions pasteOptions;
+	pasteOptions.m_pasteScriptGuid = scriptGuid;
+	OpenSelection(pasteOptions);
+
+	return true;
+}
+
 bool CQPasteWnd::DoActionToggleSearchMethod()
 {
 	if (CGetSetOptions::GetRegExTextSearch())
@@ -6647,8 +6672,14 @@ void CQPasteWnd::OnCustomSendToFriend(UINT idIn)
 void CQPasteWnd::OnChaiScriptPaste(UINT idIn)
 {
 	CSpecialPasteOptions pasteOptions;
-	pasteOptions.m_pasteScriptIndex = ChaiScriptMenuStartId - idIn;
-	OpenSelection(pasteOptions);
+	int index = idIn - ChaiScriptMenuStartId;
+
+	if (index >= 0 &&
+		index < g_Opt.m_pasteScripts.m_list.size())
+	{
+		pasteOptions.m_pasteScriptGuid = g_Opt.m_pasteScripts.m_list[index].m_guid;
+		OpenSelection(pasteOptions);
+	}
 }
 
 void CQPasteWnd::OnCliporderMovetolast()

QPasteWnd.h

@@ -219,7 +219,7 @@ public:
 	void OnDragLeave();
 	COleDropTarget *m_pDropTarget;
 
-	bool DoAction(DWORD actionId);
+	bool DoAction(CAccel a);
 	bool DoActionShowDescription();
 	bool DoActionNextDescription(); 
 	bool DoActionPrevDescription();
@@ -238,6 +238,7 @@ public:
 	bool DoActionToggleDescriptionWordWrap();
 	bool DoActionApplyLastSearch();
 	bool DoActionToggleSearchMethod();
+	bool DoActionPasteScript(CString scriptGuid);
 	bool DoActionMoveSelectionUp();
 	bool DoModifierActiveActionSelectionUp();
 	bool DoModifierActiveActionSelectionDown();

QuickPasteKeyboard.cpp

@@ -153,6 +153,40 @@ void CQuickPasteKeyboard::LoadItems()
 		}
 	}
 
+	int dummyId = -1;
+
+	for (auto & element : g_Opt.m_pasteScripts.m_list)
+	{
+		// Insert the first item
+		lvi.mask = LVIF_TEXT;
+		lvi.iItem = (int)row;
+
+		KeyboardArray ar;
+		ar.m_refData = element.m_guid;
+		for (int x = 0; x < 10; x++)
+		{
+			ar.Array[x].A = g_Opt.GetActionShortCutA(ActionEnums::PASTE_SCRIPT, x, element.m_guid);
+			ar.Array[x].B = g_Opt.GetActionShortCutB(ActionEnums::PASTE_SCRIPT, x, element.m_guid);
+		}
+
+		CString shortCutText = GetShortCutText(ar);
+
+		lvi.iSubItem = 0;
+		lvi.pszText = (LPTSTR)(LPCTSTR)(shortCutText);
+		int x = m_list.InsertItem(&lvi);
+
+		CString col2 = ActionEnums::EnumDescription(ActionEnums::PASTE_SCRIPT);
+		col2 += _T(": ");
+		col2 += element.m_name;
+		m_list.SetItemText(row, 1, col2);
+
+		m_list.SetItemData(row, dummyId);
+		m_map[dummyId] = ar;
+
+		dummyId--;
+		row++;
+	}
+
 	SelectedRow(0);
 }
 
@@ -353,8 +387,14 @@ BOOL CQuickPasteKeyboard::OnApply()
 		{
 			if (it->second.Array[i].Dirty)
 			{
-				g_Opt.SetActionShortCutA(it->first, it->second.Array[i].A, i);
-				g_Opt.SetActionShortCutB(it->first, it->second.Array[i].B, i);
+				int actionEnum = it->first;
+				if (actionEnum < 0)
+				{
+					actionEnum = ActionEnums::PASTE_SCRIPT;
+				}
+
+				g_Opt.SetActionShortCutA(actionEnum, it->second.Array[i].A, i, it->second.m_refData);
+				g_Opt.SetActionShortCutB(actionEnum, it->second.Array[i].B, i, it->second.m_refData);
 				it->second.Array[i].Dirty = false;
 			}
 		}

QuickPasteKeyboard.h

@@ -32,8 +32,11 @@ public:
 	public:
 		KeyboardArray()
 		{
+			m_refData = _T("");
 		}
 
+		CString m_refData;
+
 		KeyboardAB Array[10];
 	};
 

ScriptEditor.cpp

@@ -50,6 +50,8 @@ BOOL CScriptEditor::OnInitDialog()
 {
 	CDialogEx::OnInitDialog();
 
+	SetWindowText(m_title);
+
 	int index = 0;
 	for (auto & listItem : m_xml.m_list)
 	{
@@ -123,6 +125,7 @@ void CScriptEditor::OnBnClickedButtonAddScript()
 	CDittoChaiScriptXmlItem newItem;
 	newItem.m_name = _T("New Script");
 	newItem.m_active = true;
+	newItem.m_guid = NewGuidString();
 	m_xml.m_list.push_back(newItem);
 
 	int index = m_scriptsList.AddString(newItem.m_name);

ScriptEditor.h

@@ -16,6 +16,8 @@ public:
 
 	CChaiScriptXml m_xml;
 
+	CString m_title;
+
 protected:
 	
 	void EnableDisable(BOOL enable);

SpecialPasteOptions.cpp

@@ -17,7 +17,7 @@ CSpecialPasteOptions::CSpecialPasteOptions()
 	m_pasteAddingDateTime = false;
 	m_delayRenderLockout = 0;
 	m_dragDropFilesOnly = false;
-	m_pasteScriptIndex = -1;
+	m_pasteScriptGuid = _T("");
 }
 
 CSpecialPasteOptions::~CSpecialPasteOptions()

SpecialPasteOptions.h

@@ -20,7 +20,7 @@ public:
 	CClipFormats *m_pPasteFormats;
 	DWORD m_delayRenderLockout;
 	bool m_dragDropFilesOnly;
-	int m_pasteScriptIndex;
+	CString m_pasteScriptGuid;
 
 	bool LimitFormatsToText() 
 	{