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

Git: Rename 'Undo uncommitted repository changes' to 'Reset...'.

Browse Source 
'Reset' is in sync with the command line option and more
appropriate to the functionality after the introduction
of the history dialog.

Change-Id: I2328c7137089a5f372b59b4db7074753a16ecbdf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-07-31 14:57:11 +02:00
parent 1283233f4b
commit a1b696c718
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/gitplugin.cpp
View File

@@ -396,8 +396,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, true, &GitClient::status); globalcontext, true, &GitClient::status);
createRepositoryAction(gitContainer, createRepositoryAction(gitContainer,
tr("Undo Uncommitted Changes..."), Core::Id("Git.UndoRepository"), tr("Reset..."), Core::Id("Git.Reset"),
globalcontext, false, SLOT(undoRepositoryChanges())); globalcontext, false, SLOT(resetRepository()));
createRepositoryAction(gitContainer, createRepositoryAction(gitContainer,
@@ -623,7 +623,7 @@ void GitPlugin::undoUnstagedFileChanges()
undoFileChanges(false); undoFileChanges(false);
} }
void GitPlugin::undoRepositoryChanges() void GitPlugin::resetRepository()
{ {
const VcsBase::VcsBasePluginState state = currentState(); const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);

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

@@ -112,7 +112,7 @@ private slots:
void logProject(); void logProject();
void undoFileChanges(bool revertStaging = true); void undoFileChanges(bool revertStaging = true);
void undoUnstagedFileChanges(); void undoUnstagedFileChanges();
void undoRepositoryChanges(); void resetRepository();
void stageFile(); void stageFile();
void unstageFile(); void unstageFile();
void cleanProject(); void cleanProject();