From 50f2bf8baf69425b39a68fa9001b6769390deff0 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 12 Sep 2013 18:41:34 +0200 Subject: Bugfix ported from 1.5 branch on customer request Remove some superfluous qApp->processEvents(). This shouldn't be there, as it forces event handling in certain situations which break other parts of the UI event handling. We experienced a missing redraw which caused hacky workarounds. Original gerrit id: I2185ecb1b99d1ff20caa9a08637d77100e520445 Change-Id: I46f028838d680ba46183df6d0368811eb041d2e2 Reviewed-by: Tim Jenssen --- src/sdk/installerbasecommons.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/sdk/installerbasecommons.cpp') diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index 19b76ce7c..d2fb5e27b 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -317,10 +317,6 @@ void IntroductionPageImpl::setPackageManager(bool value) void IntroductionPageImpl::onCoreNetworkSettingsChanged() { - // force a repaint of the ui as after the settings dialog has been closed and the wizard has been - // restarted, the "Next" button looks still disabled. TODO: figure out why this happens at all! - gui()->repaint(); - m_updatesFetched = false; m_allPackagesFetched = false; } @@ -344,8 +340,6 @@ void IntroductionPageImpl::entering() void IntroductionPageImpl::leaving() { - // TODO: force repaint on next page, keeps unpainted after fetch - QTimer::singleShot(100, gui()->page(nextId()), SLOT(repaint())); setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::CancelButton)); } @@ -442,9 +436,6 @@ bool TargetDirectoryPageImpl::askQuestion(const QString &identifier, const QStri QMessageBox::StandardButton bt = MessageBoxHandler::warning(MessageBoxHandler::currentBestSuitParent(), identifier, TargetDirectoryPageImpl::tr("Warning"), message, QMessageBox::Yes | QMessageBox::No); -#ifndef Q_OS_MAC - QTimer::singleShot(100, wizard()->page(nextId()), SLOT(repaint())); -#endif return bt == QMessageBox::Yes; } @@ -452,9 +443,6 @@ bool TargetDirectoryPageImpl::failWithError(const QString &identifier, const QSt { MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), identifier, TargetDirectoryPageImpl::tr("Error"), message); -#ifndef Q_OS_MAC - QTimer::singleShot(100, wizard()->page(nextId()), SLOT(repaint())); -#endif return false; } -- cgit v1.2.3 From 74f1ba9329f70b9f4b716fa882774de883fbee75 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 23 Sep 2013 18:48:18 +0200 Subject: add object names as API for RTA to radio buttions Task-number: QTIFW-372 Change-Id: I4b2272d0f7c482bcae2619e46e1ab3df0db77bbc Reviewed-by: Tarja Sundqvist Reviewed-by: Niels Weber --- src/sdk/installerbasecommons.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/sdk/installerbasecommons.cpp') diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index d2fb5e27b..a4e5047d0 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -75,16 +75,19 @@ IntroductionPageImpl::IntroductionPageImpl(QInstaller::PackageManagerCore *core) QVBoxLayout *layout = new QVBoxLayout(widget); m_packageManager = new QRadioButton(tr("Package manager"), this); + m_packageManager->setObjectName(QLatin1String("PackageManagerRadioButton")); layout->addWidget(m_packageManager); m_packageManager->setChecked(core->isPackageManager()); connect(m_packageManager, SIGNAL(toggled(bool)), this, SLOT(setPackageManager(bool))); m_updateComponents = new QRadioButton(tr("Update components"), this); + m_updateComponents->setObjectName(QLatin1String("UpdaterRadioButton")); layout->addWidget(m_updateComponents); m_updateComponents->setChecked(core->isUpdater()); connect(m_updateComponents, SIGNAL(toggled(bool)), this, SLOT(setUpdater(bool))); m_removeAllComponents = new QRadioButton(tr("Remove all components"), this); + m_removeAllComponents->setObjectName(QLatin1String("UninstallerRadioButton")); layout->addWidget(m_removeAllComponents); m_removeAllComponents->setChecked(core->isUninstaller()); connect(m_removeAllComponents, SIGNAL(toggled(bool)), this, SLOT(setUninstaller(bool))); -- cgit v1.2.3