From be7f73308c63ea8d69360618ed6f6b5a773f90f8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 2 May 2013 18:09:38 +0300
Subject: [PATCH] Git: Use consistent ordering for Merge Tool dialog
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"
That makes Ignore default on Windows, which is confusing
Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitclient.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index c4ec4659f03..ed553af9d31 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2160,12 +2160,13 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
{
QString message = commit.isEmpty() ? tr("Conflicts detected")
: tr("Conflicts detected with commit %1").arg(commit);
- QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"),
- message, QMessageBox::Ignore | QMessageBox::Abort);
+ QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message);
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),
- QMessageBox::ActionRole);
+ QMessageBox::AcceptRole);
+ mergeOrAbort.addButton(QMessageBox::Ignore);
if (abortCommand == QLatin1String("rebase"))
- mergeOrAbort.addButton(tr("&Skip"), QMessageBox::ActionRole);
+ mergeOrAbort.addButton(tr("&Skip"), QMessageBox::RejectRole);
+ mergeOrAbort.addButton(QMessageBox::Abort);
switch (mergeOrAbort.exec()) {
case QMessageBox::Abort:
synchronousAbortCommand(workingDir, abortCommand);
--
GitLab