[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.128,1.129

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv24193

Modified Files:
	GMEApp.cpp 
Log Message:
Policy change upon Open:
The project can't be opened at the first attempt. The paradigm selection window is brought up.
If the user does NOT select any paradigm from there (by quitting either with [X] or Close button
instead of Double-Click on the paradigm name) then do not try any more.
It eliminates [in part] the bug related to showing the E_MGA_NOT_IMPLEMENTED message 
when the first Open did not succeed. 



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** GMEApp.cpp	15 Apr 2005 19:39:50 -0000	1.128
--- GMEApp.cpp	6 May 2005 23:47:12 -0000	1.129
***************
*** 1049,1052 ****
--- 1049,1053 ----
  							newparname.Empty();
  							COMTHROW( launcher->get_ParadigmName(PutOut(newparname)) );
+ 							tryit = !newparname.IsEmpty(); // zolmol
  						}
  					}
***************
*** 1054,1058 ****
  				if(hr == E_MGA_META_INCOMPATIBILITY && (parv.Length() > 0)) {
  					msg = "WARNING: Versioned project is not compatible with the paradigm '" + CString(parn) + "'\n" 
! 						" (Eg.: Same version string was assigned to incompatible paradims)\n"
  						"Do you want to open it based on the paradigm GUID?";
  					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
--- 1055,1059 ----
  				if(hr == E_MGA_META_INCOMPATIBILITY && (parv.Length() > 0)) {
  					msg = "WARNING: Versioned project is not compatible with the paradigm '" + CString(parn) + "'\n" 
! 						" (Eg.: Same version string was assigned to incompatible paradigms)\n"
  						"Do you want to open it based on the paradigm GUID?";
  					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
***************
*** 1111,1115 ****
  						AfxMessageBox("Upgrade failed, probably due to incompatibility.\n"
  									   "You can probably reopen the file without upgrade,\n"
! 									   "And use the 'Upgrade through XML' function later.");
  					}
  					else readable_only = false;
--- 1112,1116 ----
  						AfxMessageBox("Upgrade failed, probably due to incompatibility.\n"
  									   "You can probably reopen the file without upgrade,\n"
! 									   "and use the 'Upgrade through XML' function later.");
  					}
  					else readable_only = false;