Commit b539179e authored by whitlocb's avatar whitlocb

Changed version and updated splashscreen.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21925 18c085ea-50e0-402c-830e-de6fd14e8384
parent 60d1e43e
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -64,6 +64,17 @@ SVNVersion()
#endif
}
std::string
VersionControlVersionString()
{
#cmakedefine VISIT_VERSION_STRING "@VISIT_VERSION_STRING@"
#ifdef VISIT_VERSION_STRING
return std::string(VISIT_VERSION_STRING);
#else
return std::string("svn version ") + SVNVersion();
#endif
}
std::string
SlashString()
{
......
......@@ -46,6 +46,8 @@ std::string MISC_API Version();
std::string MISC_API SVNVersion();
std::string MISC_API VersionControlVersionString();
std::string MISC_API SlashString();
char MISC_API SlashChar();
......
......@@ -467,6 +467,8 @@ GetVisItResourcesDirectory(VisItResourceDirectoryType t)
retval += "translations";
else if(t == VISIT_RESOURCES_MOVIETEMPLATES)
retval += "movietemplates";
else if(t == VISIT_RESOURCES_IMAGES)
retval += "images";
}
return retval;
......
......@@ -74,7 +74,8 @@ typedef enum {
VISIT_RESOURCES_HELP,
VISIT_RESOURCES_HOSTS,
VISIT_RESOURCES_TRANSLATIONS,
VISIT_RESOURCES_MOVIETEMPLATES
VISIT_RESOURCES_MOVIETEMPLATES,
VISIT_RESOURCES_IMAGES
} VisItResourceDirectoryType;
std::string MISC_API GetVisItResourcesDirectory(VisItResourceDirectoryType t);
......
......@@ -52,21 +52,8 @@
#include <InstallationFunctions.h>
#include <ConfigureInfo.h>
#define MULTIPLE_IMAGES
#define TIMER_DURATION 2*1000 // 2 seconds
//
// Include splashscreen images
//
#include <icons/VisIt1.xpm>
#ifdef MULTIPLE_IMAGES
#include <icons/VisIt2.xpm>
#include <icons/VisIt3.xpm>
#include <icons/VisIt4.xpm>
#define NUM_PIX 4
#else
#define NUM_PIX 1
#endif
// ****************************************************************************
// Method: SplashScreen::SplashScreen
......@@ -180,10 +167,12 @@
// Eric Brugger, Wed Jul 10 10:56:47 PDT 2013
// Changed the date on the splash screen to July 2013.
//
// Brad Whitlock, Wed Sep 25 13:22:27 PDT 2013
// Get splashscreen from resources.
//
// ****************************************************************************
SplashScreen::SplashScreen(bool cyclePictures)
: QFrame(0, Qt::SplashScreen)
SplashScreen::SplashScreen(bool cyclePictures) : QFrame(0, Qt::SplashScreen)
{
#ifdef Q_WS_MACX
setWindowModality(Qt::WindowModal);
......@@ -218,15 +207,14 @@ SplashScreen::SplashScreen(bool cyclePictures)
int firstPicture = seconds % NUM_PIX;
curPicture = cyclePictures ? firstPicture : 0;
if(firstPicture == 0 || cyclePictures)
pictures.push_back(QPixmap(VisIt1_xpm));
#ifdef MULTIPLE_IMAGES
pictures.push_back(QPixmap(GetVisItResourcesFile(VISIT_RESOURCES_IMAGES, "VisIt1.png").c_str()));
if(firstPicture == 1 || cyclePictures)
pictures.push_back(QPixmap(VisIt2_xpm));
pictures.push_back(QPixmap(GetVisItResourcesFile(VISIT_RESOURCES_IMAGES, "VisIt2.png").c_str()));
if(firstPicture == 2 || cyclePictures)
pictures.push_back(QPixmap(VisIt3_xpm));
pictures.push_back(QPixmap(GetVisItResourcesFile(VISIT_RESOURCES_IMAGES, "VisIt3.png").c_str()));
if(firstPicture == 3 || cyclePictures)
pictures.push_back(QPixmap(VisIt4_xpm));
#endif
pictures.push_back(QPixmap(GetVisItResourcesFile(VISIT_RESOURCES_IMAGES, "VisIt4.png").c_str()));
// If we have more stuff than just a version number in the version
// string then draw that information onto the splashscreen.
QString ver;
......@@ -285,9 +273,7 @@ SplashScreen::SplashScreen(bool cyclePictures)
QString versionText;
versionText.sprintf("VisIt %s, ", visitcommon::Version().c_str());
versionText += tr("svn revision");
versionText += " ";
versionText += QString(visitcommon::SVNVersion().c_str());
versionText += QString(visitcommon::VersionControlVersionString().c_str());
// Create a lookup of month names so the internationalization
// files don't have to change.
......@@ -304,7 +290,7 @@ SplashScreen::SplashScreen(bool cyclePictures)
<< tr("October")
<< tr("November")
<< tr("December");
int currentMonth = 7;
int currentMonth = 12;
lLayout->addWidget(new QLabel(versionText, this));
lLayout->addWidget(new QLabel(months[currentMonth-1] + " 2013", this));
......
......@@ -56,7 +56,7 @@
ADD_SUBDIRECTORY(hosts)
# Directories that we want installed wholesale to the "resources" directory.
SET(RESOURCE_DIRECTORIES colortables help hosts movietemplates translations usage clients)
SET(RESOURCE_DIRECTORIES colortables help hosts images movietemplates translations usage clients)
# Copy the resources directory into the out of source build
FOREACH(ITEM ${RESOURCE_DIRECTORIES})
......
......@@ -2,7 +2,7 @@
<body bgcolor=#ffffff>
<p><b><h2><center>Parts of VisIt are under the following licenses.</center></h2></b></p>
<p><b><h2>VisIt License:</h2></b></p>
<p><center>Copyright (c) 2000 - 2012.</center></p>
<p><center>Copyright (c) 2000 - 2013.</center></p>
<p><center>Lawrence Livermore National Security, LLC.</center></p>
<p><center>Produced at the Lawrence Livermore National Laboratory.</center></p>
<p><center>LLNL-CODE-442911</center></p>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment