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

Git: Replace "SHA1" with "hash" in translatable strings

Browse Source 
Change-Id: I4af9f995ea53236ab0108ce45d3fc26a59d8ef43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2024-09-09 20:28:41 +02:00
committed by André Hartmann
parent 0fd06d0805
commit 2b02b518b5
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -67,7 +67,7 @@ GerritDialog::GerritDialog(const std::shared_ptr<GerritServer> &s,
m_queryLineEdit = new FancyLineEdit(changesGroup); m_queryLineEdit = new FancyLineEdit(changesGroup);
m_queryLineEdit->setMinimumSize(QSize(400, 0)); m_queryLineEdit->setMinimumSize(QSize(400, 0));
m_queryLineEdit->setPlaceholderText(Git::Tr::tr("Change #, SHA-1, tr:id, owner:email or reviewer:email")); m_queryLineEdit->setPlaceholderText(Git::Tr::tr("Change #, hash, tr:id, owner:email or reviewer:email"));
m_queryLineEdit->setSpecialCompleter(new QCompleter(m_queryModel, this)); m_queryLineEdit->setSpecialCompleter(new QCompleter(m_queryModel, this));
m_queryLineEdit->setValidationFunction( m_queryLineEdit->setValidationFunction(
[this](FancyLineEdit *, QString *) { return m_model->state() != GerritModel::Error; }); [this](FancyLineEdit *, QString *) { return m_model->state() != GerritModel::Error; });

2
src/plugins/git/instantblame.cpp
View File

@@ -56,7 +56,7 @@ BlameMark::BlameMark(const FilePath &fileName, int lineNumber, const CommitInfo
setActionsProvider([info] { setActionsProvider([info] {
QAction *copyToClipboardAction = new QAction; QAction *copyToClipboardAction = new QAction;
copyToClipboardAction->setIcon(QIcon::fromTheme("edit-copy", Utils::Icons::COPY.icon())); copyToClipboardAction->setIcon(QIcon::fromTheme("edit-copy", Utils::Icons::COPY.icon()));
copyToClipboardAction->setToolTip(TextEditor::Tr::tr("Copy SHA1 to Clipboard")); copyToClipboardAction->setToolTip(TextEditor::Tr::tr("Copy Hash to Clipboard"));
QObject::connect(copyToClipboardAction, &QAction::triggered, [info] { QObject::connect(copyToClipboardAction, &QAction::triggered, [info] {
Utils::setClipboardAndSelection(info.hash); Utils::setClipboardAndSelection(info.hash);
}); });

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

@@ -66,8 +66,7 @@ LogChangeWidget::LogChangeWidget(QWidget *parent)
, m_model(new LogChangeModel(this)) , m_model(new LogChangeModel(this))
, m_hasCustomDelegate(false) , m_hasCustomDelegate(false)
{ {
QStringList headers; const QStringList headers = {Tr::tr("Hash"), Tr::tr("Subject")};
headers << Tr::tr("Sha1")<< Tr::tr("Subject");
m_model->setHorizontalHeaderLabels(headers); m_model->setHorizontalHeaderLabels(headers);
setModel(m_model); setModel(m_model);
setMinimumWidth(300); setMinimumWidth(300);