first version of menu editor with dragging between menus

git-svn-id: http://svn.miranda-ng.org/main/trunk@15836 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 17 insertions, 12 deletions

diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
index 8f7599c41f..35b82d28fe 100644
--- a/src/mir_app/src/menu_options.cpp
+++ b/src/mir_app/src/menu_options.cpp
@@ -65,7 +65,7 @@ class CGenMenuOptionsPage : public CDlgBase
 
 	TCHAR idstr[100];
 
-	void SaveTreeInternal(HTREEITEM hRootItem, const char *szModule)
+	void SaveTreeInternal(MenuItemOptData *pParent, HTREEITEM hRootItem, const char *szModule)
 	{
 		TVITEMEX tvi;
 		tvi.hItem = hRootItem;
@@ -76,6 +76,12 @@ class CGenMenuOptionsPage : public CDlgBase
 		int count = 0, customOrder = 0;
 		int runtimepos = 100;
 
+		char pszParent[33];
+		if (pParent == NULL)
+			pszParent[0] = 0;
+		else
+			bin2hex(&pParent->pimi->mi.uid, sizeof(MUUID), pszParent);
+
 		while (tvi.hItem != NULL) {
 			m_menuItems.GetItem(&tvi);
 			MenuItemOptData *iod = (MenuItemOptData*)tvi.lParam;
@@ -91,12 +97,6 @@ class CGenMenuOptionsPage : public CDlgBase
 					else
 						ptszCustomName = _T("");
 
-					char pszParent[33];
-					if (pimi->mi.root == NULL)
-						pszParent[0] = 0;
-					else
-						bin2hex(&pimi->mi.root->mi.uid, sizeof(MUUID), pszParent);
-
 					CMString tszValue(FORMAT, _T("%d;%d;%S;%s"), visible, runtimepos, pszParent, ptszCustomName);
 					db_set_ts(NULL, szModule, menuItemName, tszValue);
 
@@ -104,8 +104,9 @@ class CGenMenuOptionsPage : public CDlgBase
 						db_set_s(NULL, szModule, CMStringA(FORMAT, "Custom%d", customOrder++), menuItemName);						
 				}
 
-				if (pimi->submenu.first != NULL)
-					SaveTreeInternal(m_menuItems.GetChild(tvi.hItem), szModule);
+				HTREEITEM hChild = m_menuItems.GetChild(tvi.hItem);
+				if (hChild != NULL)
+					SaveTreeInternal(iod, hChild, szModule);
 
 				runtimepos += 100;
 			}
@@ -131,7 +132,7 @@ class CGenMenuOptionsPage : public CDlgBase
 		char szModule[256];
 		mir_snprintf(szModule, "%s_Items", pmo->pszName);
 		CallService(MS_DB_MODULE_DELETE, NULL, (LPARAM)szModule);
-		SaveTreeInternal(m_menuItems.GetRoot(), szModule);
+		SaveTreeInternal(NULL, m_menuItems.GetRoot(), szModule);
 		db_set_b(NULL, szModule, "MenuFormat", 1);
 	}
 
@@ -295,7 +296,7 @@ public:
 
 		m_menuObjects.OnSelChange = Callback(this, &CGenMenuOptionsPage::onMenuObjectChanged);
 
-		m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND | MTREE_MULTISELECT);
+		m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND /*| MTREE_MULTISELECT*/);
 		m_menuItems.OnSelChanged = Callback(this, &CGenMenuOptionsPage::onMenuItemChanged);
 		m_menuItems.OnBeginDrag = Callback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
 
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index 4d4d6735d3..b63b4490d7 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -967,7 +967,9 @@ void ScheduleMenuUpdate()
 

 static int sttFindMenuItemByUid(TMO_IntMenuItem *pimi, void *pUid)

 {

-	return memcmp(&pimi->mi.uid, pUid, sizeof(MUUID)) == 0;

+	char szUid[33];

+	bin2hex(&pimi->mi.uid, sizeof(MUUID), szUid);

+	return !strcmp(szUid, (char*)pUid);

 }

 

 int Menu_LoadFromDatabase(TMO_IntMenuItem *pimi, void *szModule)

@@ -1356,6 +1358,8 @@ void TMO_LinkedList::remove(TMO_IntMenuItem *pItem)
 		if (p == pItem) {

 			if (first == pItem) first = pItem->next;

 			if (last == pItem) last = pPrev;

+			if (pPrev)

+				pPrev->next = pItem->next;

 			pItem->next = NULL;

 			return;

 		}