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

Git: Move msgRepositoryLabel from StashDialog to GitPlugin

Browse Source 
It's being used by many dialogs.

Change-Id: I3ef484cf8b9cc56210be1de5b4f201eb2f96ef67
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-02-04 22:02:04 +02:00
committed by Orgad Shaneh
parent 5b50854e57
commit 67933e4c1f
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/branchdialog.cpp
View File

@@ -32,7 +32,6 @@
#include "gitutils.h"
#include "gitconstants.h"
#include "ui_branchdialog.h"
#include "stashdialog.h" // Label helpers
#include <utils/qtcassert.h>
#include <utils/execmenu.h>
@@ -106,7 +105,7 @@ void BranchDialog::refresh(const QString &repository, bool force)
return;
m_repository = repository;
m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(m_repository));
m_ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(m_repository));
QString errorMessage;
if (!m_model->refresh(m_repository, &errorMessage))
VcsOutputWindow::appendError(errorMessage);

7
src/plugins/git/gitplugin.cpp
View File

@@ -167,6 +167,13 @@ GitClient *GitPlugin::client()
return m_instance->m_gitClient;
}
QString GitPlugin::msgRepositoryLabel(const QString &repository)
{
return repository.isEmpty() ?
tr("<No repository>") :
tr("Repository: %1").arg(QDir::toNativeSeparators(repository));
}
const VcsBaseSubmitEditorParameters submitParameters = {
Git::Constants::SUBMIT_MIMETYPE,
Git::Constants::GITSUBMITEDITOR_ID,

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

@@ -87,6 +87,7 @@ public:
Gerrit::Internal::GerritPlugin *gerritPlugin() const;
bool isCommitEditorOpen() const;
static QString msgRepositoryLabel(const QString &repository);
public slots:
void startCommit();

3
src/plugins/git/remotedialog.cpp
View File

@@ -28,7 +28,6 @@
#include "gitclient.h"
#include "gitplugin.h"
#include "remotemodel.h"
#include "stashdialog.h" // for messages
#include "ui_remotedialog.h"
#include "ui_remoteadditiondialog.h"
@@ -114,7 +113,7 @@ void RemoteDialog::refresh(const QString &repository, bool force)
if (m_remoteModel->workingDirectory() == repository && !force)
return;
// Refresh
m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(repository));
m_ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(repository));
if (repository.isEmpty()) {
m_remoteModel->clear();
} else {

9
src/plugins/git/stashdialog.cpp
View File

@@ -151,20 +151,13 @@ StashDialog::~StashDialog()
delete ui;
}
QString StashDialog::msgRepositoryLabel(const QString &repository)
{
return repository.isEmpty() ?
tr("<No repository>") :
tr("Repository: %1").arg(QDir::toNativeSeparators(repository));
}
void StashDialog::refresh(const QString &repository, bool force)
{
if (m_repository == repository && !force)
return;
// Refresh
m_repository = repository;
ui->repositoryLabel->setText(msgRepositoryLabel(repository));
ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(repository));
if (m_repository.isEmpty()) {
m_model->setStashes(QList<Stash>());
} else {

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

@@ -52,8 +52,6 @@ public:
explicit StashDialog(QWidget *parent = 0);
~StashDialog() override;
static QString msgRepositoryLabel(const QString &repository);
void refresh(const QString &repository, bool force);
private: