[commit] r2476 - trunk/Tools/ModelMigrate/FrontEnd

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Apr 25 12:46:37 2014
New Revision: 2476

Log:
ModelMigrate: GUI improvements

Modified:
   trunk/Tools/ModelMigrate/FrontEnd/FileTransDlg.cpp
   trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.rc
   trunk/Tools/ModelMigrate/FrontEnd/RuleListCtrl.cpp

Modified: trunk/Tools/ModelMigrate/FrontEnd/FileTransDlg.cpp
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/FileTransDlg.cpp	Fri Apr 25 12:46:25 2014	(r2475)
+++ trunk/Tools/ModelMigrate/FrontEnd/FileTransDlg.cpp	Fri Apr 25 12:46:37 2014	(r2476)
@@ -602,13 +602,10 @@
 
 void FileTransDlg::OnCancel()
 {
-	if( AfxMessageBox( "Do you really want to exit?", MB_YESNOCANCEL) == IDYES)
-	{
-		closeDlgRuleEditor( IDCANCEL);
+	closeDlgRuleEditor( IDCANCEL);
 
-		EndDialog( IDCANCEL);
-		DestroyWindow();
-	}
+	EndDialog(IDCANCEL);
+	DestroyWindow();
 }
 
 void FileTransDlg::quit()

Modified: trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.rc
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.rc	Fri Apr 25 12:46:25 2014	(r2475)
+++ trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.rc	Fri Apr 25 12:46:37 2014	(r2476)
@@ -538,10 +538,10 @@
 BEGIN
     POPUP "File"
     BEGIN
-        MENUITEM "Add File\tF6",                ID_FILES_ADDFILE
-        MENUITEM "Add Directory\tF7",           ID_FILES_ADDDIRECTORY
-        MENUITEM "Remove All",                  ID_FILES_REMOVEALL
-        MENUITEM "Remove Selected",             ID_FILES_REMOVESELECTED
+        MENUITEM "Add XME File\tF6",                ID_FILES_ADDFILE
+        MENUITEM "Add Directory of XMEs\tF7",           ID_FILES_ADDDIRECTORY
+        MENUITEM "Remove All XMEs",                  ID_FILES_REMOVEALL
+        MENUITEM "Remove Selected XMEs",             ID_FILES_REMOVESELECTED
         MENUITEM SEPARATOR
         MENUITEM "Exit",                        ID_FILES_EXIT
     END

Modified: trunk/Tools/ModelMigrate/FrontEnd/RuleListCtrl.cpp
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/RuleListCtrl.cpp	Fri Apr 25 12:46:25 2014	(r2475)
+++ trunk/Tools/ModelMigrate/FrontEnd/RuleListCtrl.cpp	Fri Apr 25 12:46:37 2014	(r2476)
@@ -551,7 +551,7 @@
 		// will use the file name given without extension
 		std::string output_file_name( pOutputFileName.substr(0, pos_of_dot));
 		char buff[16];
-		sprintf( buff, "%0.3i.xsl", rule_nmb);
+		sprintf_s( buff, "%0.3i.xsl", rule_nmb);
 		output_file_name += buff; // append something like: "001.xsl"
 
 		std::fstream f;