Git: Move "Include tags" to branches dialog

Change-Id: Icc06dbf8b80a55c3962967c1f37a9c506b8e5bd8
Reviewed-by: André Hartmann <aha_1980@gmx.de>

src/plugins/git/branchdialog.cpp

@@ -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();

src/plugins/git/branchdialog.ui

@@ -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">

src/plugins/git/settingspage.cpp

@@ -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));

src/plugins/git/settingspage.ui

@@ -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/>