feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Polish configuration check dialog

Browse Source 
Polish "CMakeCache.txt is different from Project" dialog based on suggestions
by Cornelis Bockemühlmade on the Qt Creator mailing list.

Task-number: QTCREATORBUG-17555
Change-Id: I22e616bfef1ffd79590a93335a5e34364e1a4f3f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tobias Hunger
2019-10-09 17:15:36 +02:00
parent 95eb794399
commit 28e4ed61af
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -51,6 +51,8 @@
#include <QPushButton> #include <QPushButton>
#include <QSet> #include <QSet>
#include <app/app_version.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -534,21 +536,27 @@ bool BuildDirManager::checkConfiguration()
QStringList keyList = changedKeys.keys(); QStringList keyList = changedKeys.keys();
Utils::sort(keyList); Utils::sort(keyList);
QString table = QString::fromLatin1("<table><tr><th>%1</th><th>%2</th><th>%3</th></tr>") QString table = QString::fromLatin1("<table><tr><th>%1</th><th>%2</th><th>%3</th></tr>")
.arg(tr("Key")).arg(tr("CMakeCache.txt")).arg(tr("Project")); .arg(tr("Key"))
.arg(tr("%1 Project").arg(Core::Constants::IDE_DISPLAY_NAME))
.arg(tr("Changed value"));
foreach (const QString &k, keyList) { foreach (const QString &k, keyList) {
const QPair<QString, QString> data = changedKeys.value(k); const QPair<QString, QString> data = changedKeys.value(k);
table += QString::fromLatin1("\n<tr><td>%1</td><td>%2</td><td>%3</td></tr>") table += QString::fromLatin1("\n<tr><td>%1</td><td>%2</td><td>%3</td></tr>")
.arg(k) .arg(k)
.arg(data.first.toHtmlEscaped()) .arg(data.second.toHtmlEscaped())
.arg(data.second.toHtmlEscaped()); .arg(data.first.toHtmlEscaped());
} }
table += QLatin1String("\n</table>"); table += QLatin1String("\n</table>");
QPointer<QMessageBox> box = new QMessageBox(Core::ICore::mainWindow()); QPointer<QMessageBox> box = new QMessageBox(Core::ICore::mainWindow());
box->setText(tr("CMake configuration has changed on disk.")); box->setText(tr("The project has been changed outside of %1.")
.arg(Core::Constants::IDE_DISPLAY_NAME));
box->setInformativeText(table); box->setInformativeText(table);
auto *defaultButton = box->addButton(tr("Overwrite Changes in CMakeCache.txt"), QMessageBox::RejectRole); auto *defaultButton = box->addButton(tr("Discard external changes"),
auto *applyButton = box->addButton(tr("Apply Changes to Project"), QMessageBox::ApplyRole); QMessageBox::RejectRole);
auto *applyButton = box->addButton(tr("Adapt %1 project to changes")
.arg(Core::Constants::IDE_DISPLAY_NAME),
QMessageBox::ApplyRole);
box->setDefaultButton(defaultButton); box->setDefaultButton(defaultButton);
box->exec(); box->exec();