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

Merge branch 'master' into preferences

Browse Source
This commit is contained in:
Guy Scharf 2020-02-17 16:22:31 -07:00
commit 03adef372c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/main.cpp
View File

@ -255,6 +255,17 @@ int main(int argc, char* argv[])
#else #else
bool shiftKeyPressedAtLaunch(int argc, char *argv[])
{
// Reliably detecting the shift key requires a QGuiApplication instance, but
// we need to create the real QApplication afterwards, so create a temporary
// instance here.
QGuiApplication* app = new QGuiApplication(argc, argv);
Qt::KeyboardModifiers keymodifier = QGuiApplication::queryKeyboardModifiers();
delete app;
return keymodifier == Qt::ShiftModifier;
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"; QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/";
@ -265,9 +276,8 @@ int main(int argc, char *argv[]) {
QSettings settings; QSettings settings;
// If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX) // If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX)
Qt::KeyboardModifiers keymodifier = QApplication::keyboardModifiers();
QString forcedEngine = ""; QString forcedEngine = "";
if (keymodifier == Qt::ShiftModifier){ if (shiftKeyPressedAtLaunch(argc, argv)){
settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software); settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
forcedEngine = "Software Engine forced by shift key at launch"; forcedEngine = "Software Engine forced by shift key at launch";
} }