From acbd1d006cd4e74b30a1a007b7c0ce60029f297a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 2 Apr 2019 14:33:32 +0300
Subject: BranchAddDialog: Simplify a bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove redundant "Checkbox" translatable string.
* Hide "Track remote" checkbox by default.

Change-Id: Iec72d035e7b5493b320f8c21dd2f1b90eed0b5e6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/git/branchadddialog.cpp | 13 +++++++------
 src/plugins/git/branchadddialog.ui  |  6 +-----
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'src/plugins/git')

diff --git a/src/plugins/git/branchadddialog.cpp b/src/plugins/git/branchadddialog.cpp
index edc50889ec..ccb2b37633 100644
--- a/src/plugins/git/branchadddialog.cpp
+++ b/src/plugins/git/branchadddialog.cpp
@@ -110,6 +110,7 @@ BranchAddDialog::BranchAddDialog(const QStringList &localBranches, bool addBranc
     m_ui(new Ui::BranchAddDialog)
 {
     m_ui->setupUi(this);
+    m_ui->trackingCheckBox->setVisible(false);
     setCheckoutVisible(false);
     setWindowTitle(addBranch ? tr("Add Branch") : tr("Rename Branch"));
     m_ui->branchNameEdit->setValidator(new BranchNameValidator(localBranches, this));
@@ -134,14 +135,14 @@ QString BranchAddDialog::branchName() const
 
 void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote)
 {
-    m_ui->trackingCheckBox->setVisible(true);
-    if (!name.isEmpty()) {
-        m_ui->trackingCheckBox->setText(remote ? tr("Track remote branch \'%1\'").arg(name) :
-                                                 tr("Track local branch \'%1\'").arg(name));
-        m_ui->trackingCheckBox->setChecked(remote);
-    } else {
+    if (name.isEmpty()) {
         m_ui->trackingCheckBox->setVisible(false);
         m_ui->trackingCheckBox->setChecked(false);
+    } else {
+        m_ui->trackingCheckBox->setText(remote ? tr("Track remote branch \"%1\"").arg(name) :
+                                                 tr("Track local branch \"%1\"").arg(name));
+        m_ui->trackingCheckBox->setVisible(true);
+        m_ui->trackingCheckBox->setChecked(remote);
     }
 }
 
diff --git a/src/plugins/git/branchadddialog.ui b/src/plugins/git/branchadddialog.ui
index 4ee0b5d787..41f9fc5caf 100644
--- a/src/plugins/git/branchadddialog.ui
+++ b/src/plugins/git/branchadddialog.ui
@@ -32,11 +32,7 @@
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="trackingCheckBox">
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
+    <widget class="QCheckBox" name="trackingCheckBox"/>
    </item>
    <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
-- 
cgit v1.2.1