From c42aef73ffdef4e8ef1d35eb1b1f05d176a46aa4 Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Tue, 12 Sep 2023 21:14:54 -0400 Subject: [PATCH] Add ability to enable/disable QT's high resolution mode. Default is disabled --- oscar/highresolution.cpp | 120 ++++++++++++++++++++++++++++++++++++ oscar/highresolution.h | 26 ++++++++ oscar/main.cpp | 24 +++++++- oscar/oscar.pro | 2 + oscar/preferencesdialog.cpp | 3 + oscar/preferencesdialog.ui | 10 +++ 6 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 oscar/highresolution.cpp create mode 100644 oscar/highresolution.h diff --git a/oscar/highresolution.cpp b/oscar/highresolution.cpp new file mode 100644 index 00000000..74610c4c --- /dev/null +++ b/oscar/highresolution.cpp @@ -0,0 +1,120 @@ +/* Hi Resolution Implementation + * + * Copyright (c) 2023 The OSCAR Team + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +#define TEST_MACROS_ENABLEDoff +#include + +#include +#include +#include +#include +#include "SleepLib/profiles.h" +#include "highresolution.h" + + +namespace HighResolution { + + const QString HI_RES_FILENAME("hiResolutionMode.txt"); + HiResolutionMode hiResolutionNextSessionMode = HRM_INVALID; + HiResolutionMode hiResolutionOperaingMode = HRM_INVALID; + + int readMode( QString filename) { + QFile file ( filename ); + int mode=0; + if (file.open(QFile::ReadOnly)) { + QTextStream in(&file); + in >> mode; + file.close(); + } + return mode; + } + + void writeMode( QString filename, int data , QString description) { + QFile file ( filename ); + if (file.open(QFile::WriteOnly|QFile::Text)) { + QTextStream out(&file); + out << data << " " << description << "\n" ; + file.close(); + } + } + + HiResolutionMode setHiResolutionMode(HiResolutionMode value) { + QString filename = GetAppData() + HI_RES_FILENAME; + if (value == HRM_ENABLED ) { + writeMode( filename , HRM_ENABLED ,"HiResolutionMode Enabled"); + return HRM_ENABLED; + } else { + writeMode( filename , HRM_DISABLED , "HiResolutionMode Disabled"); + } + return HRM_DISABLED; + } + + HiResolutionMode getHiResolutionMode() { + QString filename = GetAppData() + HI_RES_FILENAME; + int hiResMode= readMode( filename ); + return (hiResMode == HRM_ENABLED ) ? HRM_ENABLED : HRM_DISABLED ; + } + + // this function is used to control the text name of the high resolution preference checkbox. + void checkBox(bool set,QCheckBox* button) { + if (set) { + hiResolutionNextSessionMode = button->isChecked()? HRM_ENABLED : HRM_DISABLED ; + setHiResolutionMode(hiResolutionNextSessionMode); + if ( hiResolutionOperaingMode != hiResolutionNextSessionMode ) { + QMessageBox::information(nullptr, + STR_MessageBox_Information, + QObject::tr("High Resolution Mode change will take effect when OSCAR is restarted.")); + } + return; + } + QString label; + if (hiResolutionNextSessionMode == HRM_ENABLED ) { + if ( hiResolutionOperaingMode == hiResolutionNextSessionMode ) { + label = QObject::tr("High Resolution Mode is Enabled"); + } else { + label = QObject::tr("The High Resolution Mode will be Enabled after Oscar is restarted."); + } + button->setChecked(true); + } else { + if ( hiResolutionOperaingMode == hiResolutionNextSessionMode ) { + label = QObject::tr("High Resolution Mode is Disabled"); + } else { + label = QObject::tr("High Resolution Mode will be Disabled after Oscar is restarted."); + } + button->setChecked(false); + } + button->setText(label); + } + + // These functions are for main.cpp + void init() { + hiResolutionOperaingMode = getHiResolutionMode(); + }; + + void init(HiResolutionMode mode) { + hiResolutionOperaingMode = mode; + }; + + bool isEnabled() { + hiResolutionNextSessionMode = hiResolutionOperaingMode ; + return hiResolutionOperaingMode >= HRM_ENABLED; + }; + + void display(bool actuallyEnabled) { + bool shouldBeEnabled= (hiResolutionOperaingMode >= HRM_ENABLED) ; + if (shouldBeEnabled != actuallyEnabled) { + DEBUGFC O("RESULT MISMATCH") Q(hiResolutionOperaingMode) Q(shouldBeEnabled) Q(actuallyEnabled); + + } + if (actuallyEnabled) { + qDebug() << "High Resolution Mode is Enabled"; + } else { + qDebug() << "High Resolution Mode is Disabled"; + } + } +} diff --git a/oscar/highresolution.h b/oscar/highresolution.h new file mode 100644 index 00000000..453f070f --- /dev/null +++ b/oscar/highresolution.h @@ -0,0 +1,26 @@ +/* Overview GUI Headers + * + * Copyright (c) 2023-2023 The OSCAR Team + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of the source code + * for more details. */ + +#ifndef HIGHRESOLUTION_H +#define HIGHRESOLUTION_H + +namespace HighResolution { + + // used by main.cpp + enum HiResolutionMode {HRM_INVALID = 0 , HRM_DISABLED = 1, HRM_ENABLED = 2} ; + void init(); + void init(HiResolutionMode); + bool isEnabled(); + void display(bool); + + // used by preferences + void checkBox(bool set,QCheckBox* button); +} + +#endif // HIGHRESOLUTION_H + diff --git a/oscar/main.cpp b/oscar/main.cpp index edc054e6..b481298e 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -32,6 +32,7 @@ #include "translation.h" #include "SleepLib/common.h" #include "SleepLib/deviceconnection.h" +#include "highresolution.h" #include #include @@ -300,6 +301,8 @@ void optionExit(int exitCode, QString error) { --datadir Use folderName as Oscar Data folder. For relatve paths: /. If folder does not exist then prompts user. --help Displays this menu and exits. + --hires Enables high Resolution + --hiresoff Disables high Resolution )" ); exit (exitCode); } @@ -309,7 +312,23 @@ int main(int argc, char *argv[]) { QCoreApplication::setApplicationName(getAppName()); QCoreApplication::setOrganizationName(getDeveloperName()); QCoreApplication::setOrganizationDomain(getDeveloperDomain()); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + HighResolution::init(); + bool hiResEnabled=false; + + for (int i = 1; i < argc; i++) { + if (0 == strcmp(argv[i] ,"--hires")) { + HighResolution::init(HighResolution::HRM_ENABLED); + } else if (0 == strcmp(argv[i] ,"--hiresoff")) { + HighResolution::init(HighResolution::HRM_DISABLED); + } else if (0 == strcmp(argv[i] ,"--datadir")) { i++; + } else if (0 == strcmp(argv[i] ,"-profile")) { i++; + } + } + if (HighResolution::isEnabled()) { + hiResEnabled=true; + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + } QSettings settings; @@ -408,6 +427,8 @@ int main(int argc, char *argv[]) { } else { optionExit(2,"Missing argument to --datadir\n"); } + } else if (0 == strcmp(argv[i] ,"--hires")) { // already handle in 1st scan + } else if (0 == strcmp(argv[i] ,"--hiresoff")) { // already handle in 1st scan } else if (QString(args[i]).contains("help",Qt::CaseInsensitive)) { optionExit(0,QString("")); } else { @@ -420,6 +441,7 @@ int main(int argc, char *argv[]) { qDebug() << "APP-NAME:" << QCoreApplication::applicationName(); qDebug() << "APP-PATH:" << QCoreApplication::applicationDirPath(); qDebug() << "APP-RESOURCES:" << appResourcePath(); + HighResolution::display(hiResEnabled); #ifdef QT_DEBUG QString relinfo = " debug"; diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 0f01e066..deddb8f5 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -255,6 +255,7 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,12) { SOURCES += \ checkupdates.cpp \ + highresolution.cpp \ Graphs/gGraph.cpp \ Graphs/gGraphView.cpp \ dailySearchTab.cpp \ @@ -364,6 +365,7 @@ QMAKE_EXTRA_COMPILERS += optimize HEADERS += \ checkupdates.h \ + highresolution.h \ dailySearchTab.h \ daily.h \ saveGraphLayoutSettings.h \ diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index 008061f7..dcfc780e 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -31,6 +31,7 @@ #include #include "ui_preferencesdialog.h" #include "SleepLib/machine_common.h" +#include "highresolution.h" extern QFont *defaultfont; extern QFont *mediumfont; @@ -248,6 +249,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : // clinicalMode and permissiveMode are radio buttons and must be set to opposite values. Once clinicalMode is used. // Radio Buttons illustrate the operating mode. ui->permissiveMode->setChecked(!profile->cpap->clinicalMode()); + HighResolution::checkBox(false,ui->highResolution); ui->autoLaunchImporter->setChecked(AppSetting->autoLaunchImport()); #ifndef NO_CHECKUPDATES @@ -860,6 +862,7 @@ bool PreferencesDialog::Save() AppSetting->setMonochromePrinting(ui->monochromePrinting->isChecked()); p_profile->appearance->setEventFlagSessionBar(ui->eventFlagSessionBar->isChecked()); p_profile->cpap->setClinicalMode(ui->clinicalMode->isChecked()); + HighResolution::checkBox(true,ui->highResolution); AppSetting->setGraphTooltips(ui->graphTooltips->isChecked()); AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked()); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 44da517a..d9f21ee4 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -2897,6 +2897,16 @@ Try it and see if you like it. + + + + Enables High Resoluton Mode. Changes take effect when Oscar is restarted. + + + Enables High Resolutiom Mode + + +