From b3033381cb86d5cadb205710bcec3075f8df78b1 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 6 May 2013 15:49:21 +0200 Subject: [PATCH] Git: Rename "Cancel" to "Close" in ChangeSelectionDialog Change-Id: Ib3dbfa8c3dc3b187d53ad004ffab29fb87c9aa2c Reviewed-by: Orgad Shaneh Reviewed-by: Petar Perisin --- src/plugins/git/changeselectiondialog.cpp | 6 +++--- src/plugins/git/changeselectiondialog.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 114e9effcf3..48a0fdec18c 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -56,7 +56,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW , m_cherryPickButton(new QPushButton(tr("Cherry &Pick"), this)) , m_revertButton(new QPushButton(tr("&Revert"), this)) , m_checkoutButton(new QPushButton(tr("Check&out"), this)) - , m_cancelButton(new QPushButton(tr("&Cancel"), this)) + , m_closeButton(new QPushButton(tr("&Close"), this)) , m_detailsText(new QPlainTextEdit(this)) , m_command(NoCommand) { @@ -75,7 +75,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW layout->addWidget(m_detailsText, 2, 0, 1, 3); QHBoxLayout* buttonsLine = new QHBoxLayout(); - buttonsLine->addWidget(m_cancelButton); + buttonsLine->addWidget(m_closeButton); buttonsLine->addStretch(); buttonsLine->addWidget(m_checkoutButton); buttonsLine->addWidget(m_revertButton); @@ -105,7 +105,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW connect(m_cherryPickButton, SIGNAL(clicked()), this, SLOT(acceptCherryPick())); connect(m_revertButton, SIGNAL(clicked()), this, SLOT(acceptRevert())); connect(m_checkoutButton, SIGNAL(clicked()), this, SLOT(acceptCheckout())); - connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject())); + connect(m_closeButton, SIGNAL(clicked()), this, SLOT(reject())); recalculateDetails(); } diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index 3556b088e8b..e850570369b 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -89,7 +89,7 @@ private: QPushButton *m_cherryPickButton; QPushButton *m_revertButton; QPushButton *m_checkoutButton; - QPushButton *m_cancelButton; + QPushButton *m_closeButton; QPlainTextEdit *m_detailsText; ChangeCommand m_command;