From 822034b392e536e3f371dcab233b9db1bc4c3339 Mon Sep 17 00:00:00 2001 From: optizone <42874998+optizone@users.noreply.github.com> Date: Sun, 19 May 2019 20:29:01 +0300 Subject: [PATCH] Improve Color Theme Copy Feature (#1560) --- .../preferences/AppearanceOptionsWidget.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/dialogs/preferences/AppearanceOptionsWidget.cpp b/src/dialogs/preferences/AppearanceOptionsWidget.cpp index 1a0ebad57b38b..08f6ad21edee7 100644 --- a/src/dialogs/preferences/AppearanceOptionsWidget.cpp +++ b/src/dialogs/preferences/AppearanceOptionsWidget.cpp @@ -126,12 +126,19 @@ void AppearanceOptionsWidget::on_copyButton_clicked() do { newThemeName = QInputDialog::getText(this, tr("Enter theme name"), tr("Name:"), QLineEdit::Normal, - currColorTheme + tr(" - copy")); - } while (!newThemeName.isEmpty() && ThemeWorker().isThemeExist(newThemeName)); + currColorTheme + tr(" - copy")) + .trimmed(); + if (newThemeName.isEmpty()) { + return; + } + if (ThemeWorker().isThemeExist(newThemeName)) { + QMessageBox::information(this, tr("Theme Copy"), + tr("Theme named %1 already exists.").arg(newThemeName)); + } else { + break; + } + } while (true); - if (newThemeName.isEmpty()) { - return; - } ThemeWorker().copy(currColorTheme, newThemeName); Config()->setColorTheme(newThemeName); updateThemeFromConfig(false);