StelApp.cpp   StelApp.cpp 
skipping to change at line 247 skipping to change at line 247
, nbDownloadedFiles(0) , nbDownloadedFiles(0)
, totalDownloadedSize(0) , totalDownloadedSize(0)
, nbUsedCache(0) , nbUsedCache(0)
, totalUsedCacheSize(0) , totalUsedCacheSize(0)
, baseFontSize(13) , baseFontSize(13)
, renderBuffer(Q_NULLPTR) , renderBuffer(Q_NULLPTR)
, viewportEffect(Q_NULLPTR) , viewportEffect(Q_NULLPTR)
, gl(Q_NULLPTR) , gl(Q_NULLPTR)
, flagShowDecimalDegrees(false) , flagShowDecimalDegrees(false)
, flagUseAzimuthFromSouth(false) , flagUseAzimuthFromSouth(false)
, flagUseFormattingOutput(false)
, flagUseCCSDesignation(false)
#ifdef ENABLE_SPOUT #ifdef ENABLE_SPOUT
, spoutSender(Q_NULLPTR) , spoutSender(Q_NULLPTR)
#endif #endif
, currentFbo(0) , currentFbo(0)
{ {
setObjectName("StelApp"); setObjectName("StelApp");
// Can't create 2 StelApp instances // Can't create 2 StelApp instances
Q_ASSERT(!singleton); Q_ASSERT(!singleton);
singleton = this; singleton = this;
skipping to change at line 405 skipping to change at line 407
{ {
return qApp->property("stelCommandLine").toStringList(); return qApp->property("stelCommandLine").toStringList();
} }
void StelApp::init(QSettings* conf) void StelApp::init(QSettings* conf)
{ {
gl = QOpenGLContext::currentContext()->functions(); gl = QOpenGLContext::currentContext()->functions();
confSettings = conf; confSettings = conf;
devicePixelsPerPixel = QOpenGLContext::currentContext()->screen()->d evicePixelRatio(); devicePixelsPerPixel = QOpenGLContext::currentContext()->screen()->d evicePixelRatio();
if (devicePixelsPerPixel>1)
qDebug() << "Detected a high resolution device! Device pixel
ratio:" << devicePixelsPerPixel;
setBaseFontSize(confSettings->value("gui/base_font_size", 13).toInt( )); setBaseFontSize(confSettings->value("gui/base_font_size", 13).toInt( ));
core = new StelCore(); core = new StelCore();
if (saveProjW!=-1 && saveProjH!=-1) if (saveProjW!=-1 && saveProjH!=-1)
core->windowHasBeenResized(0, 0, saveProjW, saveProjH); core->windowHasBeenResized(0, 0, saveProjW, saveProjH);
// Initialize AFTER creation of openGL context // Initialize AFTER creation of openGL context
textureMgr = new StelTextureMgr(); textureMgr = new StelTextureMgr();
skipping to change at line 547 skipping to change at line 551
// Proxy Initialisation // Proxy Initialisation
setupNetworkProxy(); setupNetworkProxy();
updateI18n(); updateI18n();
// Init actions. // Init actions.
actionMgr->addAction("actionShow_Night_Mode", N_("Display Options"), N_("Night mode"), this, "nightMode", "Ctrl+N"); actionMgr->addAction("actionShow_Night_Mode", N_("Display Options"), N_("Night mode"), this, "nightMode", "Ctrl+N");
setFlagShowDecimalDegrees(confSettings->value("gui/flag_show_decimal _degrees", false).toBool()); setFlagShowDecimalDegrees(confSettings->value("gui/flag_show_decimal _degrees", false).toBool());
setFlagSouthAzimuthUsage(confSettings->value("gui/flag_use_azimuth_f rom_south", false).toBool()); setFlagSouthAzimuthUsage(confSettings->value("gui/flag_use_azimuth_f rom_south", false).toBool());
setFlagUseFormattingOutput(confSettings->value("gui/flag_use_formatt
ing_output", false).toBool());
setFlagUseCCSDesignation(confSettings->value("gui/flag_use_ccs_desig
nations", false).toBool());
// Animation // Animation
animationScale = confSettings->value("gui/pointer_animation_speed", 1.f).toFloat(); animationScale = confSettings->value("gui/pointer_animation_speed", 1.f).toFloat();
#ifdef ENABLE_SPOUT #ifdef ENABLE_SPOUT
//qDebug() << "Property spout is" << qApp->property("spout").toStrin g(); //qDebug() << "Property spout is" << qApp->property("spout").toStrin g();
//qDebug() << "Property spoutName is" << qApp->property("spoutName") .toString(); //qDebug() << "Property spoutName is" << qApp->property("spoutName") .toString();
if (qApp->property("spout").toString() != "none") if (qApp->property("spout").toString() != "none")
{ {
//if we are on windows and we have GLES, we are most likely on ANGLE //if we are on windows and we have GLES, we are most likely on ANGLE
skipping to change at line 868 skipping to change at line 874
flagNightVision=b; flagNightVision=b;
emit(visionNightModeChanged(b)); emit(visionNightModeChanged(b));
} }
} }
void StelApp::setFlagShowDecimalDegrees(bool b) void StelApp::setFlagShowDecimalDegrees(bool b)
{ {
flagShowDecimalDegrees = b; flagShowDecimalDegrees = b;
} }
void StelApp::setFlagUseFormattingOutput(bool b)
{
flagUseFormattingOutput = b;
}
void StelApp::setFlagUseCCSDesignation(bool b)
{
flagUseCCSDesignation = b;
}
// Update translations and font for sky everywhere in the program // Update translations and font for sky everywhere in the program
void StelApp::updateI18n() void StelApp::updateI18n()
{ {
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
emit(languageChanged()); emit(languageChanged());
#endif #endif
} }
void StelApp::ensureGLContextCurrent() void StelApp::ensureGLContextCurrent()
{ {
 End of changes. 4 change blocks. 
0 lines changed or deleted 19 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/