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

Git: Rename "Cancel" to "Close" in ChangeSelectionDialog

Browse Source 
Change-Id: Ib3dbfa8c3dc3b187d53ad004ffab29fb87c9aa2c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Nikolai Kosjar
2013-05-06 15:49:21 +02:00
parent fd0cf19cfb
commit b3033381cb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/changeselectiondialog.cpp
View File

@@ -56,7 +56,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW
, m_cherryPickButton(new QPushButton(tr("Cherry &Pick"), this)) , m_cherryPickButton(new QPushButton(tr("Cherry &Pick"), this))
, m_revertButton(new QPushButton(tr("&Revert"), this)) , m_revertButton(new QPushButton(tr("&Revert"), this))
, m_checkoutButton(new QPushButton(tr("Check&out"), 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_detailsText(new QPlainTextEdit(this))
, m_command(NoCommand) , m_command(NoCommand)
{ {
@@ -75,7 +75,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW
layout->addWidget(m_detailsText, 2, 0, 1, 3); layout->addWidget(m_detailsText, 2, 0, 1, 3);
QHBoxLayout* buttonsLine = new QHBoxLayout(); QHBoxLayout* buttonsLine = new QHBoxLayout();
buttonsLine->addWidget(m_cancelButton); buttonsLine->addWidget(m_closeButton);
buttonsLine->addStretch(); buttonsLine->addStretch();
buttonsLine->addWidget(m_checkoutButton); buttonsLine->addWidget(m_checkoutButton);
buttonsLine->addWidget(m_revertButton); buttonsLine->addWidget(m_revertButton);
@@ -105,7 +105,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW
connect(m_cherryPickButton, SIGNAL(clicked()), this, SLOT(acceptCherryPick())); connect(m_cherryPickButton, SIGNAL(clicked()), this, SLOT(acceptCherryPick()));
connect(m_revertButton, SIGNAL(clicked()), this, SLOT(acceptRevert())); connect(m_revertButton, SIGNAL(clicked()), this, SLOT(acceptRevert()));
connect(m_checkoutButton, SIGNAL(clicked()), this, SLOT(acceptCheckout())); 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(); recalculateDetails();
} }

2
src/plugins/git/changeselectiondialog.h
View File

@@ -89,7 +89,7 @@ private:
QPushButton *m_cherryPickButton; QPushButton *m_cherryPickButton;
QPushButton *m_revertButton; QPushButton *m_revertButton;
QPushButton *m_checkoutButton; QPushButton *m_checkoutButton;
QPushButton *m_cancelButton; QPushButton *m_closeButton;
QPlainTextEdit *m_detailsText; QPlainTextEdit *m_detailsText;
ChangeCommand m_command; ChangeCommand m_command;