From c95e822614cc03386ed8afe58f49a7df29ac4d7b Mon Sep 17 00:00:00 2001
From: kozec <kozec@kozec.com>
Date: Tue, 5 Jun 2018 17:26:44 +0200
Subject: [PATCH] Hide 'change syncthing binary' option from UI settings when
 setup without finddaemondialog. Fixes #427

---
 glade/ui-settings.glade           | 47 ++++++++++++-------------------
 syncthing_gtk/uisettingsdialog.py |  5 ++--
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/glade/ui-settings.glade b/glade/ui-settings.glade
index 40e400df..43be2fff 100644
--- a/glade/ui-settings.glade
+++ b/glade/ui-settings.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.4 -->
 <interface>
   <requires lib="gtk+" version="3.8"/>
   <object class="GtkAdjustment" id="adjKeepVersions">
@@ -755,7 +755,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">9</property>
+                    <property name="top_attach">6</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -772,7 +772,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">10</property>
+                    <property name="top_attach">7</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -789,7 +789,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="top_attach">0</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -807,7 +807,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
+                    <property name="top_attach">1</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -823,7 +823,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
+                    <property name="top_attach">2</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -840,7 +840,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">6</property>
+                    <property name="top_attach">3</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -856,7 +856,7 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">8</property>
+                    <property name="top_attach">5</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
@@ -872,28 +872,10 @@ Install blahblahblah to enable Caja support</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
+                    <property name="top_attach">4</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -923,9 +905,10 @@ Install blahblahblah to enable Caja support</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <child>
-                  <object class="GtkLabel" id="label6">
+                  <object class="GtkLabel" id="lblsyncthing_binary2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
                     <property name="margin_bottom">10</property>
                     <property name="label" translatable="yes">This binary will be started when syncthing daemon is not running and "&lt;i&gt;start daemon in background&lt;/i&gt;" option is checked on "&lt;i&gt;Interface&lt;/i&gt;" page.</property>
                     <property name="use_markup">True</property>
@@ -944,6 +927,7 @@ Install blahblahblah to enable Caja support</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="no_show_all">True</property>
                     <property name="use_underline">True</property>
                     <property name="yalign">0.51999998092651367</property>
                     <signal name="clicked" handler="cb_btBrowse_clicked" swapped="no"/>
@@ -954,9 +938,10 @@ Install blahblahblah to enable Caja support</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label3">
+                  <object class="GtkLabel" id="lblsyncthing_binary">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">Syncthing binary location</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -974,6 +959,7 @@ Install blahblahblah to enable Caja support</property>
                   <object class="GtkEntry" id="vsyncthing_binary">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
                     <signal name="changed" handler="cb_check_value" swapped="no"/>
                   </object>
@@ -1092,5 +1078,8 @@ Example:
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/syncthing_gtk/uisettingsdialog.py b/syncthing_gtk/uisettingsdialog.py
index 742e62b3..0c6b296b 100644
--- a/syncthing_gtk/uisettingsdialog.py
+++ b/syncthing_gtk/uisettingsdialog.py
@@ -125,8 +125,9 @@ def load_data(self):
 				log.warning("Cannot find %s.py required to support %s", plugin, name)
 		self["fmLblIntegrationStatus"].set_text("\n".join(status))
 		if StDownloader is None:
-			self["vst_autoupdate"].set_visible(False)
-			self["lblAutoupdate"].set_visible(False)
+			for name in ("vst_autoupdate", "lblAutoupdate", "lblsyncthing_binary",
+						 "lblsyncthing_binary2", "vsyncthing_binary", "btBrowse"):
+				self[name].set_visible(False)
 		self.cb_data_loaded(copy)
 		self.cb_check_value()