1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWizard: give all buttons an objectName

Browse Source 
Only Commit, Finish and Cancel didn't have an object name, yet.
Also Extract Method on the switch statement, add a test, and
use QStringBuilder.

Task-number: QTBUG-29924
Reported-by: Leo Arias

Change-Id: I8c29606bc53e9d4caab631da2089e971a9da2d75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Marc Mutz 2013-10-08 13:31:19 +02:00 committed by The Qt Project
parent 862a8d46c3
commit 1ea191276e
2 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widgets/dialogs/qwizard.cpp
View File

@ -1345,6 +1345,21 @@ void QWizardPrivate::updateCurrentPage()
updateButtonTexts(); updateButtonTexts();
} }
static QString object_name_for_button(QWizard::WizardButton which)
{
switch (which) {
case QWizard::CommitButton:
return QLatin1String("qt_wizard_") + QLatin1String("commit");
case QWizard::FinishButton:
return QLatin1String("qt_wizard_") + QLatin1String("finish");
case QWizard::CancelButton:
return QLatin1String("qt_wizard_") + QLatin1String("cancel");
default:
// Make navigation buttons detectable as passive interactor in designer
return QLatin1String("__qt__passive_wizardbutton") + QString::number(which);
}
}
bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const
{ {
Q_Q(const QWizard); Q_Q(const QWizard);
@ -1356,19 +1371,7 @@ bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const
QStyle *style = q->style(); QStyle *style = q->style();
if (style != QApplication::style()) // Propagate style if (style != QApplication::style()) // Propagate style
pushButton->setStyle(style); pushButton->setStyle(style);
// Make navigation buttons detectable as passive interactor in designer pushButton->setObjectName(object_name_for_button(which));
switch (which) {
case QWizard::CommitButton:
case QWizard::FinishButton:
case QWizard::CancelButton:
break;
default: {
QString objectName = QLatin1String("__qt__passive_wizardbutton");
objectName += QString::number(which);
pushButton->setObjectName(objectName);
}
break;
}
#ifdef Q_OS_MACX #ifdef Q_OS_MACX
pushButton->setAutoDefault(false); pushButton->setAutoDefault(false);
#endif #endif

42
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
View File

@ -52,6 +52,8 @@
#include <QWizard> #include <QWizard>
#include <QTreeWidget> #include <QTreeWidget>
Q_DECLARE_METATYPE(QWizard::WizardButton);
static QImage grabWidget(QWidget *window) static QImage grabWidget(QWidget *window)
{ {
return window->grab().toImage(); return window->grab().toImage();
@ -100,6 +102,8 @@ private slots:
void setWizardStyle(); void setWizardStyle();
void removePage(); void removePage();
void sideWidget(); void sideWidget();
void objectNames_data();
void objectNames();
// task-specific tests below me: // task-specific tests below me:
void task177716_disableCommitButton(); void task177716_disableCommitButton();
@ -2384,6 +2388,44 @@ void tst_QWizard::sideWidget()
QVERIFY(wizard.sideWidget() == 0); QVERIFY(wizard.sideWidget() == 0);
} }
void tst_QWizard::objectNames_data()
{
QTest::addColumn<QWizard::WizardButton>("wizardButton");
QTest::addColumn<QString>("buttonName");
QTest::newRow("BackButton") << QWizard::BackButton << QStringLiteral("__qt__passive_wizardbutton0");
QTest::newRow("NextButton") << QWizard::NextButton << QStringLiteral("__qt__passive_wizardbutton1");
QTest::newRow("CommitButton") << QWizard::CommitButton << QStringLiteral("qt_wizard_commit");
QTest::newRow("FinishButton") << QWizard::FinishButton << QStringLiteral("qt_wizard_finish");
QTest::newRow("CancelButton") << QWizard::CancelButton << QStringLiteral("qt_wizard_cancel");
QTest::newRow("HelpButton") << QWizard::HelpButton << QStringLiteral("__qt__passive_wizardbutton5");
QTest::newRow("CustomButton1") << QWizard::CustomButton1 << QStringLiteral("__qt__passive_wizardbutton6");
QTest::newRow("CustomButton2") << QWizard::CustomButton2 << QStringLiteral("__qt__passive_wizardbutton7");
QTest::newRow("CustomButton3") << QWizard::CustomButton3 << QStringLiteral("__qt__passive_wizardbutton8");
}
void tst_QWizard::objectNames()
{
QFETCH(QWizard::WizardButton, wizardButton);
QFETCH(QString, buttonName);
QWizard wizard;
QList<QWizard::WizardButton> buttons = QList<QWizard::WizardButton>()
<< QWizard::BackButton
<< QWizard::NextButton
<< QWizard::CommitButton
<< QWizard::FinishButton
<< QWizard::CancelButton
<< QWizard::HelpButton
<< QWizard::CustomButton1
<< QWizard::CustomButton2
<< QWizard::CustomButton3
;
QVERIFY(buttons.contains(wizardButton));
QVERIFY(wizard.button(wizardButton));
QCOMPARE(wizard.button(wizardButton)->objectName(), buttonName);
}
class task177716_CommitPage : public QWizardPage class task177716_CommitPage : public QWizardPage
{ {
Q_OBJECT Q_OBJECT