From a5fcf336e03cc0c7b132aa0ebbe16276bc2ff050 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Sun, 29 Jun 2025 17:10:37 +0200 Subject: [PATCH] fix(folderwizard): change message tone from error to information. When trying to sync a subfolder of an already syncing folder. Signed-off-by: Camila Ayres --- src/gui/folderwizard.cpp | 5 ++++- src/gui/folderwizardtargetpage.ui | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index 6f45b736a8..29301107a1 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -500,7 +500,9 @@ bool FolderWizardRemotePath::isComplete() const } if (targetPath.startsWith(remoteDir)) { - showWarn(tr("Please choose a different location. %1 is already being synced to %2.").arg(Utility::escape(targetPath), Utility::escape(localDir))); + _ui.warnFrame->show(); + _ui.warnLabel->hide(); + _ui.infoLabel->setText(tr("You are already syncing the subfolder %1 at %2.").arg(Utility::escape(targetPath), Utility::escape(localDir))); break; } @@ -531,6 +533,7 @@ void FolderWizardRemotePath::showWarn(const QString &msg) const } else { _ui.warnFrame->show(); + _ui.infoLabel->hide(); _ui.warnLabel->setText(msg); } } diff --git a/src/gui/folderwizardtargetpage.ui b/src/gui/folderwizardtargetpage.ui index 4e53902aba..cadfe0d535 100644 --- a/src/gui/folderwizardtargetpage.ui +++ b/src/gui/folderwizardtargetpage.ui @@ -23,30 +23,40 @@ true - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised - + + + + + TextLabel + + + true + + + true - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Plain + QFrame::Shadow::Plain TextLabel - Qt::RichText + Qt::TextFormat::RichText true @@ -83,7 +93,7 @@ - Qt::Vertical + Qt::Orientation::Vertical