[chronojump] ... almost done
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] ... almost done
- Date: Thu, 30 Jan 2020 16:16:23 +0000 (UTC)
commit 617c27be436662ee6af0ec5d093f0345aa05e807
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jan 30 17:15:59 2020 +0100
... almost done
glade/app1.glade | 3 +--
src/gui/networks.cs | 9 +++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 60a9b6ee..731347bd 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -33967,7 +33967,6 @@ then click this button.</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Connect
encoder</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_chronopic_register_win_close_networks_check_encoder" swapped="no"/>
<child>
@@ -33980,7 +33979,7 @@ then click this button.</property>
<widget class="GtkLabel" id="label437">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Check</property>
+ <property name="label" translatable="yes">Check
connection</property>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 7eac0160..00e42f28 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -1056,6 +1056,15 @@ public partial class ChronoJumpWindow
{
if(missing) {
hbox_RFID_disconnected.Visible = true;
+
+ /*
+ * note rfid missing is more important than encoder missing,
+ * if both messages are active, then user can connect encoder, press check button
+ * and it will take to normal capture window (while rfid is not ok or Chronojump has
to reboot)
+ * so do not show the encoder message
+ */
+ hbox_encoder_disconnected.Visible = false;
+
notebook_start.CurrentPage = 3; //networks problems
}
else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]