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

Git: Move "Include tags" to branches dialog

Browse Source 
Change-Id: Icc06dbf8b80a55c3962967c1f37a9c506b8e5bd8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-06-25 19:56:01 +03:00
committed by Orgad Shaneh
parent 3418070a4f
commit 844f9f47de
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ BranchDialog::BranchDialog(QWidget *parent) :
m_ui->includeOldCheckBox->setToolTip(
tr("Include branches and tags that have not been active for %n days.", 0,
Constants::OBSOLETE_COMMIT_AGE_IN_DAYS));
m_ui->includeTagsCheckBox->setChecked(GitPlugin::client()->settings().boolValue(
GitSettings::showTagsKey));
connect(m_ui->refreshButton, &QAbstractButton::clicked, this, &BranchDialog::refreshCurrentRepository);
connect(m_ui->addButton, &QAbstractButton::clicked, this, &BranchDialog::add);
@@ -83,6 +85,10 @@ BranchDialog::BranchDialog(QWidget *parent) :
m_model->setOldBranchesIncluded(value);
refreshCurrentRepository();
});
connect(m_ui->includeTagsCheckBox, &QCheckBox::toggled, this, [this](bool value) {
GitPlugin::client()->settings().setValue(GitSettings::showTagsKey, value);
refreshCurrentRepository();
});
m_ui->branchView->setModel(m_model);
m_ui->branchView->setFocus();

7
src/plugins/git/branchdialog.ui
View File

@@ -65,6 +65,13 @@
</attribute>
</widget>
</item>
<item>
<widget class="QCheckBox" name="includeTagsCheckBox">
<property name="text">
<string>Include ta&amp;gs</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="includeOldCheckBox">
<property name="text">

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

@@ -76,7 +76,6 @@ VcsBaseClientSettings SettingsPageWidget::settings() const
rc.setValue(GitSettings::logCountKey, m_ui.logCountSpinBox->value());
rc.setValue(GitSettings::timeoutKey, m_ui.timeoutSpinBox->value());
rc.setValue(GitSettings::pullRebaseKey, m_ui.pullRebaseCheckBox->isChecked());
rc.setValue(GitSettings::showTagsKey, m_ui.showTagsCheckBox->isChecked());
rc.setValue(GitSettings::winSetHomeEnvironmentKey, m_ui.winHomeCheckBox->isChecked());
rc.setValue(GitSettings::gitkOptionsKey, m_ui.gitkOptionsLineEdit->text().trimmed());
rc.setValue(GitSettings::repositoryBrowserCmd, m_ui.repBrowserCommandPathChooser->path().trimmed());
@@ -90,7 +89,6 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.logCountSpinBox->setValue(s.intValue(GitSettings::logCountKey));
m_ui.timeoutSpinBox->setValue(s.intValue(GitSettings::timeoutKey));
m_ui.pullRebaseCheckBox->setChecked(s.boolValue(GitSettings::pullRebaseKey));
m_ui.showTagsCheckBox->setChecked(s.boolValue(GitSettings::showTagsKey));
m_ui.winHomeCheckBox->setChecked(s.boolValue(GitSettings::winSetHomeEnvironmentKey));
m_ui.gitkOptionsLineEdit->setText(s.stringValue(GitSettings::gitkOptionsKey));
m_ui.repBrowserCommandPathChooser->setPath(s.stringValue(GitSettings::repositoryBrowserCmd));

10
src/plugins/git/settingspage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>705</width>
<height>427</height>
<height>403</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -123,13 +123,6 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="showTagsCheckBox">
<property name="text">
<string>Show tags in Branches dialog</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -214,7 +207,6 @@
<tabstop>logCountSpinBox</tabstop>
<tabstop>timeoutSpinBox</tabstop>
<tabstop>pullRebaseCheckBox</tabstop>
<tabstop>showTagsCheckBox</tabstop>
<tabstop>gitkOptionsLineEdit</tabstop>
</tabstops>
<resources/>