[commit] r2602 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jul 31 10:15:52 2015
New Revision: 2602

Log:
Registry Editor: F2 to rename; edit label of newly-added child nodes; dont display two selected items

Modified:
   trunk/GME/MgaUtil/RegistryTree.cpp

Modified: trunk/GME/MgaUtil/RegistryTree.cpp
==============================================================================
--- trunk/GME/MgaUtil/RegistryTree.cpp	Thu Jun 11 11:40:45 2015	(r2601)
+++ trunk/GME/MgaUtil/RegistryTree.cpp	Fri Jul 31 10:15:52 2015	(r2602)
@@ -140,11 +140,12 @@
 
 
 	ClientToScreen(&point);
-	popupMenu->TrackPopupMenu(IDR_CNTXMENU_REGBRW, point.x, point.y, this);
-	if (hOldItem)
-		SelectItem(hOldItem);
+    int command = popupMenu->TrackPopupMenuEx(TPM_RETURNCMD, point.x, point.y, this, NULL);
+    SendMessage(WM_COMMAND, command, 0);
+    if (command != ID_CNTX_ADDNODE /* dont interfere with editing label */ && hOldItem)
+        SelectItem(hOldItem);
 	
-	CTreeCtrl::OnRButtonDown(nFlags, point);
+	//CTreeCtrl::OnRButtonDown(nFlags, point);
 }
 
 void CRegistryTree::OnCntxAddnode() 
@@ -166,8 +167,10 @@
 	SetItemData((HTREEITEM)newNode->handle, (DWORD) newNode);
 
 	dlg->m_nodes.AddTail(newNode);
-	Expand(hItem, TVE_EXPAND);
-	UpdateWindow();
+    if (hItem)
+        VERIFY(Expand(hItem, TVE_EXPAND));
+    VERIFY(SelectItem((HTREEITEM)newNode->handle));
+    //UpdateWindow();
 
 	// Dirty trick...
 	CEdit *eLabel = EditLabel((HTREEITEM)newNode->handle);
@@ -325,5 +328,12 @@
 			SendMessage(WM_COMMAND, ID_CNTX_REMOVETREE);
 		}
 	}
-	CTreeCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
+    if (nChar == VK_F2) {
+        HTREEITEM hItem = GetSelectedItem();
+        if (hItem) {
+            m_cntxSelected = hItem;
+            SendMessage(WM_COMMAND, ID_CNTX_RENAMENODE);
+        }
+    }
+    CTreeCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
 }