chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-19 04:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up OpenGL/BrokenGL startup messages a bit, remove unused Angle related stuff

Browse Source
This commit is contained in:
Mark Watkins 2014-10-03 12:58:44 +10:00
parent 1094159657
commit d3075f049d
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleepyhead/docs/release_notes.html
View File

@ -27,6 +27,7 @@ to set minimum/maximum values (that SleepyHead wasn't honouring properly anyway)
<br/> <br/>
<b>Bug fixes in v0.9.8-1</b> <b>Bug fixes in v0.9.8-1</b>
<list> <list>
<li>Made daily view left panel, and the right sidebar size changes persitent</li>
<li>Windows build related fixes</li> <li>Windows build related fixes</li>
<li>Increase brightness steps between barchart segments</li> <li>Increase brightness steps between barchart segments</li>
<li>Put Export CSV back</li> <li>Put Export CSV back</li>

38
sleepyhead/main.cpp
View File

@ -155,33 +155,29 @@ int main(int argc, char *argv[])
bool bad_graphics = !opengl2supported; bool bad_graphics = !opengl2supported;
bool intel_graphics = getOpenGLVersionString().contains("INTEL", Qt::CaseInsensitive); bool intel_graphics = getOpenGLVersionString().contains("INTEL", Qt::CaseInsensitive);
#if defined(Q_OS_WIN) //#if defined(Q_OS_WIN)
bool angle_supported = getGraphicsEngine().contains(CSTR_GFX_ANGLE, Qt::CaseInsensitive) && (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA); // bool angle_supported = getGraphicsEngine().contains(CSTR_GFX_ANGLE, Qt::CaseInsensitive) && (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA);
if (bad_graphics) { // if (bad_graphics) {
bad_graphics = !angle_supported; // bad_graphics = !angle_supported;
} // }
#endif //#endif
#ifdef BROKEN_OPENGL_BUILD #ifdef BROKEN_OPENGL_BUILD
Q_UNUSED(bad_graphics) Q_UNUSED(bad_graphics)
Q_UNUSED(intel_graphics) Q_UNUSED(intel_graphics)
QString betterbuild = "Settings/BetterBuild"; const QString BetterBuild = "Settings/BetterBuild";
QString fasterbuildavailable = QObject::tr("A faster build of SleepyHead may be available");
QString notbotheragain = QObject::tr("You will not be bothered with this message again.");
QString betterresults = QObject::tr("This version will run fine, but a \"<b>%1</b>\" tagged build of SleepyHead will likely run much smoother on your computer.");
if (opengl2supported) { if (opengl2supported) {
if (!settings.value(betterbuild, false).toBool()) { if (!settings.value(BetterBuild, false).toBool()) {
QMessageBox::information(nullptr, fasterbuildavailable, QMessageBox::information(nullptr, QObject::tr("A faster build of SleepyHead may be available"),
QObject::tr("This build of SleepyHead was designed to work with older computers lacking OpenGL 2.0 support, but it looks like your computer has full support for it.") + "<br/><br/>"+ QObject::tr("This build of SleepyHead is a compatability version that also works on computers lacking OpenGL 2.0 support.")+"<br/><br/>"+
betterresults.arg("-OpenGL")+"<br/><br/>"+ QObject::tr("However it looks like your computer has full support for OpenGL 2.0!") + "<br/><br/>"+
lookfor + "<br/><br/>"+ QObject::tr("This version will run fine, but a \"<b>%1</b>\" tagged build of SleepyHead will likely run a bit faster on your computer.").arg("-OpenGL")+"<br/><br/>"+
notbotheragain, QMessageBox::Ok, QMessageBox::Ok); QObject::tr("You will not be bothered with this message again."), QMessageBox::Ok, QMessageBox::Ok);
settings.setValue(betterbuild, true); settings.setValue(BetterBuild, true);
} }
} else { } /*else {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
if (angle_supported) { if (angle_supported) {
if (!settings.value(betterbuild, false).toBool()) { if (!settings.value(betterbuild, false).toBool()) {
@ -195,7 +191,7 @@ int main(int argc, char *argv[])
} }
} }
#endif #endif
} } */
#else #else
if (bad_graphics) { if (bad_graphics) {
QMessageBox::warning(nullptr, QObject::tr("Incompatible Graphics Hardware"), QMessageBox::warning(nullptr, QObject::tr("Incompatible Graphics Hardware"),
@ -204,8 +200,6 @@ int main(int argc, char *argv[])
arg(intel_graphics ? QObject::tr("(<a href='http://intel.com/support'>Intel's support site</a>)") : "")+"<br/><br/>"+ arg(intel_graphics ? QObject::tr("(<a href='http://intel.com/support'>Intel's support site</a>)") : "")+"<br/><br/>"+
QObject::tr("Because graphs will not render correctly, and it may cause crashes, this build will now exit.")+"<br/><br/>"+ QObject::tr("Because graphs will not render correctly, and it may cause crashes, this build will now exit.")+"<br/><br/>"+
QObject::tr("There is another build available tagged \"<b>-BrokenGL</b>\" that should work on your computer.") QObject::tr("There is another build available tagged \"<b>-BrokenGL</b>\" that should work on your computer.")
,QMessageBox::Ok, QMessageBox::Ok); ,QMessageBox::Ok, QMessageBox::Ok);
exit(1); exit(1);
} }

1
sleepyhead/scripts/build_number
View File

@ -1,2 +1 @@
0
1 1