diff options
Diffstat (limited to 'tests/manual/dialogs')
-rw-r--r-- | tests/manual/dialogs/filedialogpanel.cpp | 15 | ||||
-rw-r--r-- | tests/manual/dialogs/filedialogpanel.h | 3 | ||||
-rw-r--r-- | tests/manual/dialogs/printdialogpanel.cpp | 12 |
3 files changed, 19 insertions, 11 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 57624a0d37..71147e1319 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -292,6 +292,11 @@ QString FileDialogPanel::filterString() const return m_nameFilters->toPlainText().trimmed().replace(QLatin1String("\n"), QLatin1String(";;")); } +QUrl FileDialogPanel::currentDirectoryUrl() const +{ + return QUrl::fromUserInput(m_directory->text().trimmed()); +} + QFileDialog::Options FileDialogPanel::options() const { QFileDialog::Options result; @@ -338,7 +343,7 @@ void FileDialogPanel::getOpenFileUrls() QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QList<QUrl> files = QFileDialog::getOpenFileUrls(this, tr("getOpenFileNames Qt %1").arg(QLatin1String(QT_VERSION_STR)), - QUrl(m_directory->text()), filterString(), &selectedFilter, options(), + currentDirectoryUrl(), filterString(), &selectedFilter, options(), allowedSchemes()); if (!files.isEmpty()) { QString result; @@ -371,7 +376,7 @@ void FileDialogPanel::getOpenFileUrl() QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QUrl file = QFileDialog::getOpenFileUrl(this, tr("getOpenFileUrl Qt %1").arg(QLatin1String(QT_VERSION_STR)), - QUrl(m_directory->text()), filterString(), &selectedFilter, options(), + currentDirectoryUrl(), filterString(), &selectedFilter, options(), allowedSchemes()); if (file.isValid()) { QString result; @@ -404,7 +409,7 @@ void FileDialogPanel::getSaveFileUrl() QString selectedFilter = m_selectedNameFilter->text().trimmed(); const QUrl file = QFileDialog::getSaveFileUrl(this, tr("getSaveFileName Qt %1").arg(QLatin1String(QT_VERSION_STR)), - QUrl(m_directory->text()), filterString(), &selectedFilter, options(), + currentDirectoryUrl(), filterString(), &selectedFilter, options(), allowedSchemes()); if (file.isValid()) { QString result; @@ -430,7 +435,7 @@ void FileDialogPanel::getExistingDirectoryUrl() #if QT_VERSION >= 0x050000 const QUrl dir = QFileDialog::getExistingDirectoryUrl(this, tr("getExistingDirectory Qt %1").arg(QLatin1String(QT_VERSION_STR)), - QUrl(m_directory->text()), options() | QFileDialog::ShowDirsOnly, + currentDirectoryUrl(), options() | QFileDialog::ShowDirsOnly, allowedSchemes()); if (!dir.isEmpty()) QMessageBox::information(this, tr("getExistingDirectory"), QLatin1String("Directory: ") + dir.toString(), QMessageBox::Ok); diff --git a/tests/manual/dialogs/filedialogpanel.h b/tests/manual/dialogs/filedialogpanel.h index 8a9d93da03..0486af7bd4 100644 --- a/tests/manual/dialogs/filedialogpanel.h +++ b/tests/manual/dialogs/filedialogpanel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -86,6 +86,7 @@ private slots: void useMimeTypeFilters(bool); private: + QUrl currentDirectoryUrl() const; QString filterString() const; QFileDialog::Options options() const; QStringList allowedSchemes() const; diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp index e316486fcf..2e6477df03 100644 --- a/tests/manual/dialogs/printdialogpanel.cpp +++ b/tests/manual/dialogs/printdialogpanel.cpp @@ -422,8 +422,9 @@ QSizeF PrintDialogPanel::customPageSize() const // Apply the settings to the QPrinter void PrintDialogPanel::applySettings(QPrinter *printer) const { - QString printerName = m_panel.m_printerCombo->currentData().toString(); - if (printerName == QStringLiteral("PdfFormat")) + const int currentIndex = m_panel.m_printerCombo->currentIndex(); + QString printerName = m_panel.m_printerCombo->itemData(currentIndex).toString(); + if (printerName == QLatin1String("PdfFormat")) printer->setOutputFileName(m_panel.m_fileName->text()); else printer->setPrinterName(printerName); @@ -459,7 +460,7 @@ void PrintDialogPanel::retrieveSettings(const QPrinter *printer) m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(printer->printerName()))); m_panel.m_fileName->setEnabled(false); } else { - m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(QStringLiteral("PdfFormat")))); + m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(QLatin1String("PdfFormat")))); m_panel.m_fileName->setEnabled(true); } m_panel.m_fileName->setText(printer->outputFileName()); @@ -662,10 +663,11 @@ void PrintDialogPanel::layoutModeChanged() void PrintDialogPanel::printerChanged() { - bool isPdf = (m_panel.m_printerCombo->currentData().toString() == QStringLiteral("PdfFormat")); + const int currentIndex = m_panel.m_printerCombo->currentIndex(); + const bool isPdf = (m_panel.m_printerCombo->itemData(currentIndex).toString() == QLatin1String("PdfFormat")); m_panel.m_fileName->setEnabled(isPdf); if (isPdf && m_panel.m_fileName->text().isEmpty()) - m_panel.m_fileName->setText(QDir::homePath() + QDir::separator() + QStringLiteral("print.pdf")); + m_panel.m_fileName->setText(QDir::homePath() + QDir::separator() + QLatin1String("print.pdf")); } void PrintDialogPanel::showPrintDialog() |