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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
This commit is contained in:
Eike Ziller
2018-02-07 11:58:23 +01:00
parent d3bb3c0953 631d9cd711
commit 5432dd1f5c
119 changed files with 1204 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -226,22 +226,22 @@ void GerritPushDialog::onRemoteChanged(bool force)
m_currentSupportsWip = supportsWip;
m_ui->wipCheckBox->setEnabled(supportsWip);
if (supportsWip) {
m_ui->wipCheckBox->setToolTip(tr("Checked - Mark change as WIP\n"
"Unchecked - Mark change as ready\n"
"Partially checked - Do not change current state"));
m_ui->wipCheckBox->setToolTip(tr("Checked - Mark change as WIP.\n"
"Unchecked - Mark change as ready for review.\n"
"Partially checked - Do not change current state."));
m_ui->draftCheckBox->setTristate(true);
if (m_ui->draftCheckBox->checkState() != Qt::Checked)
m_ui->draftCheckBox->setCheckState(Qt::PartiallyChecked);
m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as private\n"
"Unchecked - Unmark change as private\n"
"Partially checked - Do not change current state"));
m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as private.\n"
"Unchecked - Remove mark.\n"
"Partially checked - Do not change current state."));
} else {
m_ui->wipCheckBox->setToolTip(tr("Supported on Gerrit 2.15 and up"));
m_ui->wipCheckBox->setToolTip(tr("Supported on Gerrit 2.15 and later."));
m_ui->draftCheckBox->setTristate(false);
if (m_ui->draftCheckBox->checkState() != Qt::Checked)
m_ui->draftCheckBox->setCheckState(Qt::Unchecked);
m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as draft\n"
"Unchecked - Unmark change as draft"));
m_ui->draftCheckBox->setToolTip(tr("Checked - The change is a draft.\n"
"Unchecked - The change is not a draft."));
}
}

4
src/plugins/git/gerrit/gerritpushdialog.ui
View File

@@ -82,14 +82,14 @@ Unchecked - Unmark change as private
Semi-checked - Do not change current state</string>
</property>
<property name="text">
<string>&amp;Draft/Private</string>
<string>&amp;Draft/private</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="wipCheckBox">
<property name="text">
<string>&amp;Work-In-Progress</string>
<string>&amp;Work-in-progress</string>
</property>
<property name="tristate">
<bool>true</bool>