[commit] r1716 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Dec  1 12:05:07 2011
New Revision: 1716

Log:
GME-377: F2 in model editor triggers rename

Modified:
   trunk/GME/Gme/GME.rc
   trunk/GME/Gme/GMEView.cpp
   trunk/GME/Gme/GMEView.h
   trunk/GME/Gme/resource.h

Modified: trunk/GME/Gme/GME.rc
==============================================================================
--- trunk/GME/Gme/GME.rc	Thu Dec  1 10:41:30 2011	(r1715)
+++ trunk/GME/Gme/GME.rc	Thu Dec  1 12:05:07 2011	(r1716)
@@ -715,6 +715,7 @@
     "`",            ID_VIEW_CYCLEALLASPECTS, ASCII, NOINVERT
     VK_TAB,         ID_VIEW_CYCLEASPECTKEY, VIRTKEY, NOINVERT
     VK_TAB,         ID_VIEW_CYCLEASPECTBACKWARDSKEY, VIRTKEY, SHIFT, NOINVERT
+	VK_F2,          ID_VIEW_RENAME, VIRTKEY, NOINVERT
     "B",            ID_VIEW_FOCUSBROWSER,   VIRTKEY, NOINVERT
     "B",            ID_VIEW_FOCUSBROWSER,   VIRTKEY, CONTROL, NOINVERT
     "L",            ID_VIEW_FOCUSBROWSER,   VIRTKEY, NOINVERT

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Thu Dec  1 10:41:30 2011	(r1715)
+++ trunk/GME/Gme/GMEView.cpp	Thu Dec  1 12:05:07 2011	(r1716)
@@ -505,6 +505,7 @@
 	ON_MESSAGE(WM_USER_EXECUTEPENDINGREQUESTS, OnExecutePendingRequests)
 	ON_COMMAND(ID_VIEW_SHOWSELMODEL, OnShowSelectedModel)
 	ON_COMMAND(ID_VIEW_FOCUSBROWSER, OnFocusBrowser)
+	ON_COMMAND(ID_VIEW_RENAME, OnRename)
 	ON_COMMAND(ID_VIEW_FOCUSINSPECTOR, OnFocusInspector)
 	ON_COMMAND(ID_VIEW_CYCLEASPECTKEY, OnCycleAspect)
 	ON_COMMAND(ID_VIEW_CYCLEASPECTBACKWARDSKEY, OnCycleAspectBackwards)
@@ -10173,6 +10174,11 @@
 	}
 }
 
+void CGMEView::OnRename()
+{
+	CGMEObjectInspector::theInstance->m_ObjectInspector.EditName();
+}
+
 // called when VK_B + CTRL is pressed
 void CGMEView::OnFocusBrowser()
 {

Modified: trunk/GME/Gme/GMEView.h
==============================================================================
--- trunk/GME/Gme/GMEView.h	Thu Dec  1 10:41:30 2011	(r1715)
+++ trunk/GME/Gme/GMEView.h	Thu Dec  1 12:05:07 2011	(r1716)
@@ -632,6 +632,7 @@
 #endif
 	afx_msg void OnShowSelectedModel();
 	afx_msg void OnFocusBrowser();
+	afx_msg void OnRename();
 	afx_msg void OnFocusInspector();
 	afx_msg void OnCycleAspect();
 	afx_msg void OnCycleAspectBackwards();

Modified: trunk/GME/Gme/resource.h
==============================================================================
--- trunk/GME/Gme/resource.h	Thu Dec  1 10:41:30 2011	(r1715)
+++ trunk/GME/Gme/resource.h	Thu Dec  1 12:05:07 2011	(r1716)
@@ -471,6 +471,7 @@
 #define ID_VIEW_CONSOLE            33109
 #define ID_VIEW_SEARCH                  33110
 #define ID_VIEW_CYCLEASPECTBACKWARDSKEY          33111
+#define ID_VIEW_RENAME                  33112
 #define ID_VIEW_TOOLBARS                33200
 #define IDW_TOOLBAR_MAIN                0xE820
 #define IDW_TOOLBAR_WINS                0xE821
@@ -485,7 +486,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        225
-#define _APS_NEXT_COMMAND_VALUE         33112
+#define _APS_NEXT_COMMAND_VALUE         33113
 #define _APS_NEXT_CONTROL_VALUE         1132
 #define _APS_NEXT_SYMED_VALUE           119
 #endif