Skip to content

Commit

Permalink
Hide 'change syncthing binary' option from UI settings when setup wit…
Browse files Browse the repository at this point in the history 
…hout finddaemondialog. Fixes #427
  • Loading branch information
@kozec
kozec committed Jun 5, 2018
1 parent 7ad421b commit c95e822
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 31 deletions.
47 changes: 18 additions & 29 deletions glade/ui-settings.glade
View file
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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"/>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -1092,5 +1078,8 @@ Example:
</child>
</object>
</child>
<child>
<placeholder/>
</child>
</object>
</interface>
5 changes: 3 additions & 2 deletions syncthing_gtk/uisettingsdialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit c95e822

Please sign in to comment.