From 135cab152b007107daaa27f110bcf350d744d5fe Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 7 Dec 2022 16:46:37 +0100 Subject: [PATCH] Format some QLabels as plain text Signed-off-by: Claudio Cambra --- src/gui/conflictdialog.cpp | 2 ++ src/gui/creds/webflowcredentialsdialog.cpp | 2 ++ src/gui/invalidfilenamedialog.cpp | 3 ++ src/gui/invalidfilenamedialog.ui | 14 +++++++- src/gui/wizard/owncloudadvancedsetuppage.cpp | 5 +++ src/gui/wizard/owncloudadvancedsetuppage.ui | 34 +++++++++++++++++--- 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/gui/conflictdialog.cpp b/src/gui/conflictdialog.cpp index 74ce2034b064f..bae7b190f957a 100644 --- a/src/gui/conflictdialog.cpp +++ b/src/gui/conflictdialog.cpp @@ -53,6 +53,8 @@ ConflictDialog::ConflictDialog(QWidget *parent) _ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); _ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Keep selected version")); + _ui->conflictMessage->setTextFormat(Qt::PlainText); + connect(_ui->localVersionRadio, &QCheckBox::toggled, this, &ConflictDialog::updateButtonStates); connect(_ui->localVersionButton, &QToolButton::clicked, this, [=] { QDesktopServices::openUrl(QUrl::fromLocalFile(_solver->localVersionFilename())); diff --git a/src/gui/creds/webflowcredentialsdialog.cpp b/src/gui/creds/webflowcredentialsdialog.cpp index dce3d43a1495c..8bb1eb90eb4f0 100644 --- a/src/gui/creds/webflowcredentialsdialog.cpp +++ b/src/gui/creds/webflowcredentialsdialog.cpp @@ -36,6 +36,7 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo _containerLayout->setMargin(margin); _infoLabel = new QLabel(); + _infoLabel->setTextFormat(Qt::PlainText); _infoLabel->setAlignment(Qt::AlignCenter); _containerLayout->addWidget(_infoLabel); @@ -65,6 +66,7 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo connect(app, &Application::isShowingSettingsDialog, this, &WebFlowCredentialsDialog::slotShowSettingsDialog); _errorLabel = new QLabel(); + _errorLabel->setTextFormat(Qt::PlainText); _errorLabel->hide(); _containerLayout->addWidget(_errorLabel); diff --git a/src/gui/invalidfilenamedialog.cpp b/src/gui/invalidfilenamedialog.cpp index a55771c36862a..366596c61c547 100644 --- a/src/gui/invalidfilenamedialog.cpp +++ b/src/gui/invalidfilenamedialog.cpp @@ -85,6 +85,9 @@ InvalidFilenameDialog::InvalidFilenameDialog(AccountPtr account, Folder *folder, _ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); _ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Rename file")); + _ui->descriptionLabel->setTextFormat(Qt::PlainText); + _ui->errorLabel->setTextFormat(Qt::PlainText); + _ui->descriptionLabel->setText(tr("The file \"%1\" could not be synced because the name contains characters which are not allowed on this system.").arg(_originalFileName)); _ui->explanationLabel->setText(tr("The following characters are not allowed on the system: * \" | & ? , ; : \\ / ~ < > leading/trailing spaces")); _ui->filenameLineEdit->setText(filePathFileInfo.fileName()); diff --git a/src/gui/invalidfilenamedialog.ui b/src/gui/invalidfilenamedialog.ui index 68008709deb15..91ff3f7386bc5 100644 --- a/src/gui/invalidfilenamedialog.ui +++ b/src/gui/invalidfilenamedialog.ui @@ -6,7 +6,7 @@ 0 0 - 411 + 607 192 @@ -22,6 +22,9 @@ The file could not be synced because it contains characters which are not allowed on this system. + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -35,6 +38,9 @@ Error + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -48,6 +54,9 @@ Please enter a new name for the file: + + Qt::PlainText + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -105,6 +114,9 @@ + + Qt::PlainText + diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index 5435cf71e3dc6..668a0171a6258 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -51,6 +51,11 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage(OwncloudWizard *wizard) _filePathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); _ui.locationsGridLayout->addWidget(_filePathLabel.data(), 3, 3); + _filePathLabel->setTextFormat(Qt::PlainText); + _ui.userNameLabel->setTextFormat(Qt::PlainText); + _ui.serverAddressLabel->setTextFormat(Qt::PlainText); + _ui.localFolderDescriptionLabel->setTextFormat(Qt::PlainText); + registerField(QLatin1String("OCSyncFromScratch"), _ui.cbSyncFromScratch); auto sizePolicy = _progressIndi->sizePolicy(); diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui index fe4acc5a34d17..5f51a2d824e10 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.ui +++ b/src/gui/wizard/owncloudadvancedsetuppage.ui @@ -37,7 +37,7 @@ TextLabel - Qt::RichText + Qt::PlainText Qt::AlignCenter @@ -57,6 +57,9 @@ Avatar + + Qt::PlainText + Qt::AlignCenter @@ -73,6 +76,9 @@ &Local Folder + + Qt::PlainText + Qt::AlignCenter @@ -85,13 +91,15 @@ - 75 true Username + + Qt::PlainText + Qt::AlignCenter @@ -101,13 +109,15 @@ - 75 true Local Folder + + Qt::PlainText + Qt::AlignCenter @@ -143,6 +153,9 @@ Free space + + Qt::PlainText + Qt::AlignCenter @@ -214,6 +227,9 @@ Server address + + Qt::PlainText + Qt::AlignHCenter|Qt::AlignTop @@ -227,6 +243,9 @@ Sync Logo + + Qt::PlainText + Qt::AlignCenter @@ -366,6 +385,9 @@ MB + + Qt::PlainText + @@ -558,7 +580,6 @@ 9 - 75 true @@ -639,6 +660,9 @@ TextLabel + + Qt::PlainText + @@ -647,7 +671,7 @@ TextLabel - Qt::RichText + Qt::PlainText