add toggle group option

ActionEnums.cpp

@@ -169,6 +169,8 @@ CString ActionEnums::EnumDescription(ActionEnumValues value)
 		return "Option - Show text for first ten copy hot keys";
 	case CONFIG_SHOW_CLIP_WAS_PASTED:
 		return "Option - Show indicator a clip has been pasted";
+	case TOGGLE_LAST_GROUP_TOGGLE:
+		return "Toggle Last Group Toggle";
 	}
 
 	return "";

ActionEnums.h

@@ -84,6 +84,7 @@ public:
 		PASTE_POSITION_10,
 		CONFIG_SHOW_FIRST_TEN_TEXT,
 		CONFIG_SHOW_CLIP_WAS_PASTED,
+		TOGGLE_LAST_GROUP_TOGGLE,
 
 		LAST_ACTION
 	};

CP_Main.rc

@@ -225,6 +225,7 @@ BEGIN
             MENUITEM "New Group",                   32811
             MENUITEM "New Group Selection",         32812
             MENUITEM "Move to Group",               32840
+            MENUITEM "Toggle Last Group Toggle",    ID_GROUPS_TOGGLELASTGROUP
         END
         POPUP "Send To"
         BEGIN

Options.cpp

@@ -2382,4 +2382,14 @@ BOOL CGetSetOptions::GetShowIfClipWasPasted()
 void CGetSetOptions::SetShowIfClipWasPasted(BOOL val)
 {
 	SetProfileLong(_T("ShowIfClipWasPasted"), val);
+}
+
+int CGetSetOptions::GetLastGroupToggle()
+{
+	return GetProfileLong(_T("LastGroupToggle"), -2);
+}
+
+void CGetSetOptions::SetLastGroupToggle(int val)
+{
+	SetProfileLong(_T("LastGroupToggle"), val);
 }

Options.h

@@ -518,6 +518,9 @@ public:
 
 	static BOOL GetShowIfClipWasPasted();
 	static void SetShowIfClipWasPasted(BOOL val);
+
+	static int GetLastGroupToggle();
+	static void SetLastGroupToggle(int val);
 };
 
 // global for easy access and for initialization of fast access variables

QPasteWnd.cpp

@@ -268,6 +268,8 @@ ON_COMMAND(ID_QUICKOPTIONS_SHOWTEXTFORFIRSTTENCOPYHOTKEYS, &CQPasteWnd::OnQuicko
 ON_UPDATE_COMMAND_UI(ID_QUICKOPTIONS_SHOWTEXTFORFIRSTTENCOPYHOTKEYS, &CQPasteWnd::OnUpdateQuickoptionsShowtextforfirsttencopyhotkeys)
 ON_COMMAND(ID_QUICKOPTIONS_SHOWINDICATORACLIPHASBEENPASTED, &CQPasteWnd::OnQuickoptionsShowindicatoracliphasbeenpasted)
 ON_UPDATE_COMMAND_UI(ID_QUICKOPTIONS_SHOWINDICATORACLIPHASBEENPASTED, &CQPasteWnd::OnUpdateQuickoptionsShowindicatoracliphasbeenpasted)
+ON_COMMAND(ID_GROUPS_TOGGLELASTGROUP, &CQPasteWnd::OnGroupsTogglelastgroup)
+ON_UPDATE_COMMAND_UI(ID_GROUPS_TOGGLELASTGROUP, &CQPasteWnd::OnUpdateGroupsTogglelastgroup)
 END_MESSAGE_MAP()
 
 
@@ -2941,6 +2943,9 @@ bool CQPasteWnd::DoAction(DWORD actionId)
 	case ActionEnums::CONFIG_SHOW_CLIP_WAS_PASTED:
 		ret = OnShowClipWasPasted();
 		break;
+	case ActionEnums::TOGGLE_LAST_GROUP_TOGGLE:
+		ret = OnToggleLastGroupToggle();
+		break;
 	}
 
 	return ret;
@@ -4071,6 +4076,27 @@ bool CQPasteWnd::OnShowClipWasPasted()
 	return true;
 }
 
+bool CQPasteWnd::OnToggleLastGroupToggle()
+{
+	int newGroupId = -2;
+	if (theApp.m_GroupID > 0)
+	{
+		CGetSetOptions::SetLastGroupToggle(theApp.m_GroupID);
+		newGroupId = -1;		
+	}
+	else
+	{
+		newGroupId = CGetSetOptions::GetLastGroupToggle();
+	}
+
+	if (newGroupId >= -1)
+	{
+		theApp.EnterGroupID(newGroupId);
+	}
+
+	return true;
+}
+
 bool CQPasteWnd::DoExportToBitMapFile()
 {
 	bool ret = false;
@@ -5771,3 +5797,20 @@ void CQPasteWnd::OnUpdateQuickoptionsShowindicatoracliphasbeenpasted(CCmdUI *pCm
 
 	UpdateMenuShortCut(pCmdUI, ActionEnums::CONFIG_SHOW_CLIP_WAS_PASTED);
 }
+
+
+void CQPasteWnd::OnGroupsTogglelastgroup()
+{
+	DoAction(ActionEnums::TOGGLE_LAST_GROUP_TOGGLE);
+}
+
+
+void CQPasteWnd::OnUpdateGroupsTogglelastgroup(CCmdUI *pCmdUI)
+{
+	if (!pCmdUI->m_pMenu)
+	{
+		return;
+	}
+
+	UpdateMenuShortCut(pCmdUI, ActionEnums::TOGGLE_LAST_GROUP_TOGGLE);
+}

QPasteWnd.h

@@ -260,6 +260,7 @@ public:
 	bool DoPasteTypoglycemia();
 	bool OnShowFirstTenText();
 	bool OnShowClipWasPasted();
+	bool OnToggleLastGroupToggle();
 
 	void UpdateMenuShortCut(CCmdUI *pCmdUI, DWORD action);
 
@@ -463,4 +464,6 @@ public:
 	afx_msg void OnUpdateQuickoptionsShowtextforfirsttencopyhotkeys(CCmdUI *pCmdUI);
 	afx_msg void OnQuickoptionsShowindicatoracliphasbeenpasted();
 	afx_msg void OnUpdateQuickoptionsShowindicatoracliphasbeenpasted(CCmdUI *pCmdUI);
+	afx_msg void OnGroupsTogglelastgroup();
+	afx_msg void OnUpdateGroupsTogglelastgroup(CCmdUI *pCmdUI);
 };

Resource.h

@@ -572,6 +572,7 @@
 #define ID_SPECIALPASTE_TYPOGLYCEMIA    32922
 #define ID_QUICKOPTIONS_SHOWTEXTFORFIRSTTENCOPYHOTKEYS 32923
 #define ID_QUICKOPTIONS_SHOWINDICATORACLIPHASBEENPASTED 32924
+#define ID_GROUPS_TOGGLELASTGROUP       32925
 
 // Next default values for new objects
 // 
@@ -579,7 +580,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        258
-#define _APS_NEXT_COMMAND_VALUE         32925
+#define _APS_NEXT_COMMAND_VALUE         32926
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104
 #endif