summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2020-12-01 13:15:42 +0200
committerKatja Marttila <katja.marttila@qt.io>2020-12-02 14:25:21 +0200
commitb43ab89a64c6484a8af4be424ab695b956d7f7bc (patch)
treef96aadc7c191e6d564d3727641969026b7ea3515 /src
parent885a41d1667ac8ccf59a4de76cb8449074a466ac (diff)
Remove 'Reject Licenses' radio button
One radio button is enough, by selecting 'Accept Licenses' the 'Next' button is enabled. Task-number: QTIFW-2057 Change-Id: I0db0fb2e85644528b4a2b4304903549d0a91ecbf Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/packagemanagergui.cpp20
-rw-r--r--src/libs/installer/packagemanagergui.h3
2 files changed, 0 insertions, 23 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 3bcf4e5fc..65c3d1611 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1955,29 +1955,13 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core)
m_acceptLabel->setObjectName(QLatin1String("AcceptLicenseLabel"));
m_acceptLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
- m_rejectRadioButton = new QRadioButton(this);
- ClickForwarder *rejectClickForwarder = new ClickForwarder(m_rejectRadioButton);
- m_rejectRadioButton->setObjectName(QString::fromUtf8("RejectLicenseRadioButton"));
- m_rejectRadioButton->setShortcut(QKeySequence(tr("Alt+D", "do not agree license")));
-
- m_rejectLabel = new QLabel;
- m_rejectLabel->setWordWrap(true);
- m_rejectLabel->installEventFilter(rejectClickForwarder);
- m_rejectLabel->setObjectName(QLatin1String("RejectLicenseLabel"));
- m_rejectLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-
QGridLayout *gridLayout = new QGridLayout;
gridLayout->setColumnStretch(1, 1);
gridLayout->addWidget(m_acceptRadioButton, 0, 0);
gridLayout->addWidget(m_acceptLabel, 0, 1);
- gridLayout->addWidget(m_rejectRadioButton, 1, 0);
- gridLayout->addWidget(m_rejectLabel, 1, 1);
layout->addLayout(gridLayout);
connect(m_acceptRadioButton, &QAbstractButton::toggled, this, &QWizardPage::completeChanged);
- connect(m_rejectRadioButton, &QAbstractButton::toggled, this, &QWizardPage::completeChanged);
-
- m_rejectRadioButton->setChecked(true);
}
/*!
@@ -2050,23 +2034,19 @@ void LicenseAgreementPage::updateUi()
{
QString subTitleText;
QString acceptButtonText;
- QString rejectButtonText;
if (m_licenseListWidget->count() == 1) {
subTitleText = tr("Please read the following license agreement. You must accept the terms "
"contained in this agreement before continuing with the installation.");
acceptButtonText = tr("I accept the license.");
- rejectButtonText = tr("I do not accept the license.");
} else {
subTitleText = tr("Please read the following license agreements. You must accept the terms "
"contained in these agreements before continuing with the installation.");
acceptButtonText = tr("I accept the licenses.");
- rejectButtonText = tr("I do not accept the licenses.");
}
m_licenseListWidget->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
setColoredSubTitle(subTitleText);
m_acceptLabel->setText(acceptButtonText);
- m_rejectLabel->setText(rejectButtonText);
}
diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h
index f8e154a79..9cb5ea316 100644
--- a/src/libs/installer/packagemanagergui.h
+++ b/src/libs/installer/packagemanagergui.h
@@ -304,10 +304,7 @@ private:
QListWidget *m_licenseListWidget;
QRadioButton *m_acceptRadioButton;
- QRadioButton *m_rejectRadioButton;
-
QLabel *m_acceptLabel;
- QLabel *m_rejectLabel;
};