From a1b696c7186305b4e4e6a6e608d0cbd2ff7b4959 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 31 Jul 2012 14:57:11 +0200 Subject: [PATCH] Git: Rename 'Undo uncommitted repository changes' to 'Reset...'. '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 --- src/plugins/git/gitplugin.cpp | 6 +++--- src/plugins/git/gitplugin.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 53797b5ad94..a6ff24ebcce 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -396,8 +396,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) globalcontext, true, &GitClient::status); createRepositoryAction(gitContainer, - tr("Undo Uncommitted Changes..."), Core::Id("Git.UndoRepository"), - globalcontext, false, SLOT(undoRepositoryChanges())); + tr("Reset..."), Core::Id("Git.Reset"), + globalcontext, false, SLOT(resetRepository())); createRepositoryAction(gitContainer, @@ -623,7 +623,7 @@ void GitPlugin::undoUnstagedFileChanges() undoFileChanges(false); } -void GitPlugin::undoRepositoryChanges() +void GitPlugin::resetRepository() { const VcsBase::VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index 8ccc44ade0b..4001b447616 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -112,7 +112,7 @@ private slots: void logProject(); void undoFileChanges(bool revertStaging = true); void undoUnstagedFileChanges(); - void undoRepositoryChanges(); + void resetRepository(); void stageFile(); void unstageFile(); void cleanProject();