[commit] r2790 - in trunk: Doc/GME Manual and User Guide Doc/GME Manual and User Guide/images GME/Gme Install

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Tue Apr 7 10:44:55 CDT 2020


Author: ksmyth
Date: Tue Apr  7 10:44:55 2020
New Revision: 2790

Log:
Change 'GME 18' to 'GME'

Deleted:
   trunk/GME/Gme/Splash.cpp
   trunk/GME/Gme/Splash.h
   trunk/GME/Gme/Splsh16.bmp
Modified:
   trunk/Doc/GME Manual and User Guide/GME Manual and User Guide.pdf
   trunk/Doc/GME Manual and User Guide/images/Splsh16.png
   trunk/GME/Gme/GME.rc
   trunk/GME/Gme/GME.vcxproj
   trunk/GME/Gme/GME.vcxproj.filters
   trunk/GME/Gme/GMEApp.cpp
   trunk/GME/Gme/MainFrm.cpp
   trunk/GME/Gme/aboutpic.bmp
   trunk/Install/dialog.bmp

Modified: trunk/Doc/GME Manual and User Guide/GME Manual and User Guide.pdf
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/Doc/GME Manual and User Guide/images/Splsh16.png
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/GME/Gme/GME.rc
==============================================================================
--- trunk/GME/Gme/GME.rc	Tue Apr  7 10:44:50 2020	(r2789)
+++ trunk/GME/Gme/GME.rc	Tue Apr  7 10:44:55 2020	(r2790)
@@ -85,7 +85,6 @@
 IDR_TOOLBAR_MODELING    BITMAP                  "res\\ToolbarModeling.bmp"
 IDB_MGAOPEN             BITMAP                  "res\\mgaopen.bmp"
 IDB_BITMAP_LOGO         BITMAP                  "res\\bitmap_l.bmp"
-IDB_SPLASH              BITMAP                  "Splsh16.bmp"
 IDB_ABOUT               BITMAP                  "aboutpic.bmp"
 IDR_TOOLBAR_COMPONENTS  BITMAP                  "res\\ToolbarComponents.bmp"
 IDR_TOOLBAR_NAVIG       BITMAP                  "res\\ToolbarNavig.bmp"

Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj	Tue Apr  7 10:44:50 2020	(r2789)
+++ trunk/GME/Gme/GME.vcxproj	Tue Apr  7 10:44:55 2020	(r2790)
@@ -359,7 +359,6 @@
     <ClCompile Include="RecentConnStrList.cpp" />
     <ClCompile Include="ScrollZoomView.cpp" />
     <ClCompile Include="search.cpp" />
-    <ClCompile Include="Splash.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -421,7 +420,6 @@
     <None Include="res\SetDefault.bmp" />
     <None Include="res\setport.bmp" />
     <None Include="res\XME.ico" />
-    <None Include="Splsh16.bmp" />
     <None Include="res\Toolbar.bmp" />
     <None Include="res\toolbar1.bmp" />
     <None Include="res\ToolbarComponents.bmp" />
@@ -526,7 +524,6 @@
     <ClInclude Include="Resource.h" />
     <ClInclude Include="ScrollZoomView.h" />
     <ClInclude Include="search.h" />
-    <ClInclude Include="Splash.h" />
     <ClInclude Include="StdAfx.h" />
     <ClInclude Include="SVNClient.h" />
     <ClInclude Include="SVNDialogCommit.h" />

Modified: trunk/GME/Gme/GME.vcxproj.filters
==============================================================================
--- trunk/GME/Gme/GME.vcxproj.filters	Tue Apr  7 10:44:50 2020	(r2789)
+++ trunk/GME/Gme/GME.vcxproj.filters	Tue Apr  7 10:44:55 2020	(r2790)
@@ -210,9 +210,6 @@
     <ClCompile Include="search.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Splash.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -332,9 +329,6 @@
     <None Include="res\setport.bmp">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="Splsh16.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="res\Toolbar.bmp">
       <Filter>Resource Files</Filter>
     </None>
@@ -596,9 +590,6 @@
     <ClInclude Include="search.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Splash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Tue Apr  7 10:44:50 2020	(r2789)
+++ trunk/GME/Gme/GMEApp.cpp	Tue Apr  7 10:44:55 2020	(r2790)
@@ -64,7 +64,6 @@
 #include <atlsafe.h>
 #include "mga_i.c"
 #include "meta_i.c"
-#include "Splash.h"
 
 CComModule _Module;
 
@@ -322,7 +321,6 @@
 		;
 	cmdInfo.m_bShowSplash = false;
 
-	CSplashWnd::EnableSplashScreen(cmdInfo.m_bShowSplash);
 	// CG: The following block was inserted by 'Status Bar' component.
 	{
 		//Set up date and time defaults so they're the same as system defaults
@@ -479,9 +477,6 @@
 
 BOOL CGMEApp::PreTranslateMessage(MSG* pMsg)
 {
-	// CG: The following lines were added by the Splash Screen component.
-	if (CSplashWnd::PreTranslateAppMessage(pMsg))
-		return TRUE;
 	// KMS: m_pMainWnd->PreTranslateMessage here for Alt-F,C. Otherwise, CGMEView::PreTranslateMessage TranslateAccelerator will return TRUE
 	if (m_pMainWnd && m_pMainWnd->PreTranslateMessage(pMsg))
 		return TRUE;

Modified: trunk/GME/Gme/MainFrm.cpp
==============================================================================
--- trunk/GME/Gme/MainFrm.cpp	Tue Apr  7 10:44:50 2020	(r2789)
+++ trunk/GME/Gme/MainFrm.cpp	Tue Apr  7 10:44:55 2020	(r2790)
@@ -8,7 +8,6 @@
 #include "MainFrm.h"
 #include "GMEDoc.h"
 #include "GMEChildFrame.h"
-#include "Splash.h"
 #include "GMEEventLogger.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -616,10 +615,6 @@
 	m_wndComponentBar.ShowWindow(SW_HIDE);
 	ShowPane(&m_wndComponentBar, FALSE, FALSE, FALSE);
 
-
-	// CG: The following line was added by the Splash Screen component.
-	CSplashWnd::ShowSplashScreen(this);
-
 	// Adding full screen functionality
 	EnableFullScreenMode(ID_VIEW_FULLSCREEN);
 

Modified: trunk/GME/Gme/aboutpic.bmp
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/Install/dialog.bmp
==============================================================================
Binary file (source and/or target). No diff available.


More information about the gme-commit mailing list