summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-01-12 16:34:53 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-02-04 09:13:37 +0200
commit2665bbe56e22ca71beb686d985d9859da72cbac2 (patch)
tree4e14a6149ad15693d650c619c8680af47c0aac62 /src/libs/installer
parent6f8b0581c9ee373b9b75a0e0879527b9efe013b8 (diff)
Add support for setting minimum wizard dimensions in config.xml
Task-number: QTIFW-1903 Change-Id: I4d8eaf71a1a63dfbfa75ea61af728fa1f5e3e9f3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/constants.h2
-rw-r--r--src/libs/installer/packagemanagergui.cpp11
-rw-r--r--src/libs/installer/settings.cpp13
-rw-r--r--src/libs/installer/settings.h2
4 files changed, 26 insertions, 2 deletions
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 304efb772..feee73fad 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -93,6 +93,8 @@ static const QLatin1String scStyleSheet("StyleSheet");
static const QLatin1String scTitleColor("TitleColor");
static const QLatin1String scWizardDefaultWidth("WizardDefaultWidth");
static const QLatin1String scWizardDefaultHeight("WizardDefaultHeight");
+static const QLatin1String scWizardMinimumWidth("WizardMinimumWidth");
+static const QLatin1String scWizardMinimumHeight("WizardMinimumHeight");
static const QLatin1String scWizardShowPageList("WizardShowPageList");
static const QLatin1String scProductImages("ProductImages");
static const QLatin1String scUrlQueryString("UrlQueryString");
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index c33d9bb3b..beb8603a4 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -743,7 +743,16 @@ void PackageManagerGui::showEvent(QShowEvent *event)
}
}
}
- setMinimumSize(size());
+ QSize minimumSize;
+ minimumSize.setWidth(m_core->settings().wizardMinimumWidth()
+ ? m_core->settings().wizardMinimumWidth()
+ : width());
+
+ minimumSize.setHeight(m_core->settings().wizardMinimumHeight()
+ ? m_core->settings().wizardMinimumHeight()
+ : height());
+
+ setMinimumSize(minimumSize);
if (minimumWidth() < m_core->settings().wizardDefaultWidth())
resize(m_core->settings().wizardDefaultWidth(), height());
if (minimumHeight() < m_core->settings().wizardDefaultHeight())
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 7c1400aed..7273080f9 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -299,7 +299,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix,
<< scAllowSpaceInPath << scAllowNonAsciiCharacters << scDisableAuthorizationFallback
<< scDisableCommandLineInterface
<< scWizardStyle << scStyleSheet << scTitleColor
- << scWizardDefaultWidth << scWizardDefaultHeight << scWizardShowPageList << scProductImages
+ << scWizardDefaultWidth << scWizardDefaultHeight << scWizardMinimumWidth << scWizardMinimumHeight
+ << scWizardShowPageList << scProductImages
<< scRepositorySettingsPageVisible << scTargetConfigurationFile
<< scRemoteRepositories << scTranslations << scUrlQueryString << QLatin1String(scControlScript)
<< scCreateLocalRepository << scInstallActionColumnVisible << scSupportsModify << scAllowUnstableComponents
@@ -481,6 +482,16 @@ int Settings::wizardDefaultHeight() const
return lengthToInt(d->m_data.value(scWizardDefaultHeight));
}
+int Settings::wizardMinimumWidth() const
+{
+ return lengthToInt(d->m_data.value(scWizardMinimumWidth));
+}
+
+int Settings::wizardMinimumHeight() const
+{
+ return lengthToInt(d->m_data.value(scWizardMinimumHeight));
+}
+
bool Settings::wizardShowPageList() const
{
return d->m_data.value(scWizardShowPageList, true).toBool();
diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h
index 4227ae957..68a1592ff 100644
--- a/src/libs/installer/settings.h
+++ b/src/libs/installer/settings.h
@@ -89,6 +89,8 @@ public:
QString titleColor() const;
int wizardDefaultWidth() const;
int wizardDefaultHeight() const;
+ int wizardMinimumWidth() const;
+ int wizardMinimumHeight() const;
bool wizardShowPageList() const;
QStringList productImages() const;
void setProductImages(const QStringList &images);