From 640d18ce32f749b9aaab39c4877ac2543c1dcfe5 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Mon, 2 Nov 2020 13:38:46 +0200 Subject: Obey stylesheet in SettingsDialog Change-Id: I3fa464acece6276a3c147d9b8585c7da100a3574 Reviewed-by: Arttu Tarkiainen --- src/sdk/tabcontroller.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/sdk') diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp index b69c69b33..5e2f1ed13 100644 --- a/src/sdk/tabcontroller.cpp +++ b/src/sdk/tabcontroller.cpp @@ -166,6 +166,23 @@ void TabController::restartWizard() void TabController::onSettingsButtonClicked() { SettingsDialog dialog(d->m_core); + // set custom stylesheet + const QString styleSheetFile = d->m_core->settings().styleSheet(); + if (!styleSheetFile.isEmpty()) { + QFile sheet(styleSheetFile); + if (sheet.exists()) { + if (sheet.open(QIODevice::ReadOnly)) { + dialog.setStyleSheet(QString::fromLatin1(sheet.readAll())); + } else { + qCWarning(QInstaller::lcDeveloperBuild) << "The specified style sheet file " + "can not be opened."; + } + } else { + qCWarning(QInstaller::lcDeveloperBuild) << "A style sheet file is specified, " + "but it does not exist."; + } + } + connect(&dialog, &SettingsDialog::networkSettingsChanged, this, &TabController::onNetworkSettingsChanged); dialog.exec(); -- cgit v1.2.3 From 0b0d46c12b369380e459ff25bb4ee399b4e3c1df Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Wed, 11 Nov 2020 13:43:02 +0200 Subject: Enable HighDPI support in X11 Change-Id: I560796aa248df505a86701014a001deb90c627f2 Reviewed-by: Arttu Tarkiainen --- src/sdk/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sdk') diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 27b58465e..7cacb2a85 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -57,12 +57,12 @@ static const char PLACEHOLDER[32] = "MY_InstallerCreateDateTime_MY"; int main(int argc, char *argv[]) { -#if defined(Q_OS_WIN) if (!qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); } +#if defined(Q_OS_WIN) QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); #endif // increase maximum numbers of file descriptors -- cgit v1.2.3 From 602cd6c8f6fb9c8ed21786bb08c56c81a40203af Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Tue, 17 Nov 2020 13:26:25 +0200 Subject: Set "FrameworkVersion" installer value This makes it possible to query for the Installer Framework version of the running installer binary from the scripting-API. Change-Id: I88fd12d081aa720cbe95683ee35714e5e2d4908b Reviewed-by: Katja Marttila --- src/sdk/sdkapp.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/sdk') diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 3a32d0336..9c9e01f95 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -57,6 +57,9 @@ #include #include +#define QUOTE_(x) #x +#define QUOTE(x) QUOTE_(x) + template class SDKApp : public T { @@ -196,6 +199,8 @@ public: QUuid::createUuid().toString(), QUuid::createUuid().toString(), QInstaller::Protocol::Mode::Production, userArgs, isCommandLineInterface); } + // Set this for convenience usage with the installer JS object + m_core->setValue(QLatin1String("FrameworkVersion"), QLatin1String(QUOTE(IFW_VERSION_STR))); // From Qt5.8 onwards system proxy is used by default. If Qt is built with // QT_USE_SYSTEM_PROXIES false then system proxies are not used by default. -- cgit v1.2.3