main.cpp   main.cpp 
skipping to change at line 128 skipping to change at line 128
UINT timerGrain = 1; UINT timerGrain = 1;
if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO) if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO)
{ {
// If this is too fine a grain, try the lowest value used by a timer // If this is too fine a grain, try the lowest value used by a timer
timerGrain = 5; timerGrain = 5;
if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO) if (timeBeginPeriod(timerGrain) == TIMERR_NOCANDO)
timerGrain = 0; timerGrain = 0;
} }
#endif #endif
// Seed the PRNG
qsrand(QDateTime::currentMSecsSinceEpoch());
QCoreApplication::setApplicationName("stellarium"); QCoreApplication::setApplicationName("stellarium");
QCoreApplication::setApplicationVersion(StelUtils::getApplicationVer sion()); QCoreApplication::setApplicationVersion(StelUtils::getApplicationVer sion());
QCoreApplication::setOrganizationDomain("stellarium.org"); QCoreApplication::setOrganizationDomain("stellarium.org");
QCoreApplication::setOrganizationName("stellarium"); QCoreApplication::setOrganizationName("stellarium");
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
QFileInfo appInfo(QString::fromUtf8(argv[0])); QFileInfo appInfo(QString::fromUtf8(argv[0]));
QDir appDir(appInfo.absolutePath()); QDir appDir(appInfo.absolutePath());
appDir.cdUp(); appDir.cdUp();
QCoreApplication::addLibraryPath(appDir.absoluteFilePath("plugins")) ; QCoreApplication::addLibraryPath(appDir.absoluteFilePath("plugins")) ;
skipping to change at line 153 skipping to change at line 156
QGuiApplication::setDesktopSettingsAware(false); QGuiApplication::setDesktopSettingsAware(false);
#ifndef USE_QUICKVIEW #ifndef USE_QUICKVIEW
QApplication::setStyle(QStyleFactory::create("Fusion")); QApplication::setStyle(QStyleFactory::create("Fusion"));
// The QApplication MUST be created before the StelFileMgr is initia lized. // The QApplication MUST be created before the StelFileMgr is initia lized.
QApplication app(argc, argv); QApplication app(argc, argv);
#else #else
QGuiApplication::setDesktopSettingsAware(false); QGuiApplication::setDesktopSettingsAware(false);
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
#endif #endif
QPixmap pixmap(":/splash.png");
QSplashScreen splash(pixmap);
splash.show();
app.processEvents();
// QApplication sets current locale, but // QApplication sets current locale, but
// we need scanf()/printf() and friends to always work in the C loca le, // we need scanf()/printf() and friends to always work in the C loca le,
// otherwise configuration/INI file parsing will be erroneous. // otherwise configuration/INI file parsing will be erroneous.
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
// Init the file manager // Init the file manager
StelFileMgr::init(); StelFileMgr::init();
// Log command line arguments QPixmap pixmap(StelFileMgr::findFile("data/splash.png"));
QSplashScreen splash(pixmap);
splash.show();
splash.showMessage(StelUtils::getApplicationVersion() , Qt::AlignLef
t, Qt::white);
app.processEvents();
// Log command line arguments.
QString argStr; QString argStr;
QStringList argList; QStringList argList;
for (int i=0; i<argc; ++i) for (int i=0; i<argc; ++i)
{ {
argList << argv[i]; argList << argv[i];
argStr += QString("%1 ").arg(argv[i]); argStr += QString("%1 ").arg(argv[i]);
} }
// add contents of STEL_OPTS environment variable.
QString envStelOpts(qgetenv("STEL_OPTS").constData());
if (envStelOpts.length()>0)
{
argList+= envStelOpts.split(" ");
argStr += " " + envStelOpts;
}
// Parse for first set of CLI arguments - stuff we want to process b efore other // Parse for first set of CLI arguments - stuff we want to process b efore other
// output, such as --help and --version // output, such as --help and --version
CLIProcessor::parseCLIArgsPreConfig(argList); CLIProcessor::parseCLIArgsPreConfig(argList);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if QT_VERSION >= 0x050300 #if QT_VERSION >= 0x050300
if (qApp->property("onetime_angle_mode").isValid()) if (qApp->property("onetime_angle_mode").isValid())
{ {
app.setAttribute(Qt::AA_UseOpenGLES, true); app.setAttribute(Qt::AA_UseOpenGLES, true);
} }
 End of changes. 4 change blocks. 
5 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/