[chronojump/michrolab] Renamed networks contacts/encoder device button
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Renamed networks contacts/encoder device button
- Date: Thu, 14 Jul 2022 16:37:55 +0000 (UTC)
commit 4ac1f7f23f1f3a0fc1127b46fecee295cb85116e
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 14 17:16:15 2022 +0200
Renamed networks contacts/encoder device button
glade/app1.glade | 10 +++++-----
src/gui/app1/chronojump.cs | 18 +++++++++---------
src/gui/app1/encoder.cs | 4 ++--
src/gui/app1/forceSensor.cs | 2 +-
src/gui/networks.cs | 20 ++++++++++----------
5 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index bded801d7..f9df8a582 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -6592,7 +6592,7 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkButton"
id="button_activate_chronopics">
+ <widget class="GtkButton"
id="button_contacts_devices_networks">
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
@@ -32581,7 +32581,7 @@ Concentric</property>
<property name="left_padding">6</property>
<property name="right_padding">6</property>
<child>
- <widget class="GtkButton"
id="button_activate_chronopics_encoder">
+ <widget class="GtkButton"
id="button_encoder_devices_networks">
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
@@ -48756,7 +48756,7 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_activate_chronopics_encoder_networks_problems">
+ <widget class="GtkButton"
id="button_encoder_devices_networks_problems">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -48893,14 +48893,14 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_activate_chronopics_networks_problems">
+ <widget class="GtkButton"
id="button_contacts_devices_networks_problems">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_activate_chronopics_networks_problems_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_contacts_devices_networks_problems_clicked" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox407">
<property name="visible">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index c42d427e3..accec4944 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -350,7 +350,7 @@ public partial class ChronoJumpWindow
//[Widget] Gtk.VBox vbox_last_test_buttons;
[Widget] Gtk.HBox hbox_chronopics_and_more;
- [Widget] Gtk.Button button_activate_chronopics;
+ [Widget] Gtk.Button button_contacts_devices_networks;
[Widget] Gtk.Button button_threshold;
[Widget] Gtk.Button button_force_sensor_adjust;
[Widget] Gtk.Button button_force_sensor_sync;
@@ -3308,8 +3308,8 @@ public partial class ChronoJumpWindow
if(configChronojump.Compujump)
{
viewport_chronopics.Sensitive = preferences.networksAllowChangeDevices;
- button_activate_chronopics_encoder.Sensitive = preferences.networksAllowChangeDevices;
- button_activate_chronopics_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
+ button_encoder_devices_networks.Sensitive = preferences.networksAllowChangeDevices;
+ button_contacts_devices_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
}
//change language works on windows. On Linux let's change the locale
@@ -6300,7 +6300,7 @@ public partial class ChronoJumpWindow
chronopicRegisterUpdate(true);
}
- private void on_button_activate_chronopics_networks_problems_clicked (object o, EventArgs args)
+ private void on_button_contacts_devices_networks_problems_clicked (object o, EventArgs args)
{
chronopicRegisterUpdate(true);
}
@@ -8478,8 +8478,8 @@ LogB.Debug("mc finished 5");
//do not allow to touch buttons on show table
notebook_results.Sensitive = false;
- button_activate_chronopics.Sensitive = false;
- button_activate_chronopics_encoder.Sensitive = false;
+ button_contacts_devices_networks.Sensitive = false;
+ button_encoder_devices_networks.Sensitive = false;
button_threshold.Sensitive = false;
button_force_sensor_adjust.Sensitive = false;
button_force_sensor_sync.Sensitive = false;
@@ -8540,10 +8540,10 @@ LogB.Debug("mc finished 5");
//allow to touch buttons on show table
notebook_results.Sensitive = true;
- button_activate_chronopics.Sensitive = true;
+ button_contacts_devices_networks.Sensitive = true;
if(! configChronojump.Compujump)
- button_activate_chronopics_encoder.Sensitive = true;
+ button_encoder_devices_networks.Sensitive = true;
button_threshold.Sensitive = true;
button_force_sensor_adjust.Sensitive = true;
@@ -8690,7 +8690,7 @@ LogB.Debug("mc finished 5");
//true: executing a test; false: waiting a test to be executed
private void sensitiveGuiAutoExecuteOrWait (bool execute) {
//if automode, sensitiveGuiEventDoing, sensitiveGuiEventDone don't work
- button_activate_chronopics.Sensitive = ! execute;
+ button_contacts_devices_networks.Sensitive = ! execute;
button_threshold.Sensitive = ! execute;
button_execute_test.Sensitive = ! execute;
sensitiveLastTestButtons(! execute);
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index bbab89bec..760952e56 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -120,8 +120,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_delete_signal;
[Widget] Gtk.Alignment alignment_encoder_capture_signal;
- [Widget] Gtk.Button button_activate_chronopics_encoder;
- //[Widget] Gtk.Button button_activate_chronopics_encoder_networks_problems;
+ [Widget] Gtk.Button button_encoder_devices_networks;
+ //[Widget] Gtk.Button button_encoder_devices_networks_problems;
[Widget] Gtk.Notebook notebook_encoder_sup;
[Widget] Gtk.Notebook notebook_encoder_capture;
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 899f50321..225e27e69 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -3200,7 +3200,7 @@ LogB.Information(" fs R ");
{
hbox_force_capture_buttons.Sensitive = s;
- button_activate_chronopics.Sensitive = s;
+ button_contacts_devices_networks.Sensitive = s;
image_test.Sensitive = s;
button_execute_test.Sensitive = (s && currentPerson != null && currentPerson.UniqueID > 0 &&
currentSession != null);
button_force_sensor_image_save_signal.Sensitive = s;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index c415be7b5..d5e9576f7 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -39,7 +39,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_start_window_sub;
[Widget] Gtk.Alignment alignment_start_window;
[Widget] Gtk.Alignment alignment_encoder_capture_options;
- [Widget] Gtk.Button button_activate_chronopics_networks_problems;
+ [Widget] Gtk.Button button_contacts_devices_networks_problems;
//RFID
[Widget] Gtk.Label label_rfid_wait;
@@ -191,7 +191,7 @@ public partial class ChronoJumpWindow
//on networks do not allow to change devices until preferences option is checked
viewport_chronopics.Sensitive = false;
- button_activate_chronopics_encoder.Sensitive = false;
+ button_encoder_devices_networks.Sensitive = false;
//do not allow camera controls
showWebcamCaptureContactsControls (false); //contacts
@@ -259,12 +259,12 @@ public partial class ChronoJumpWindow
}
if (configChronojump.Compujump) {
- button_activate_chronopics.Visible = true;
- button_activate_chronopics_encoder.Visible = true;
+ button_contacts_devices_networks.Visible = true;
+ button_encoder_devices_networks.Visible = true;
button_contacts_detect_small.Visible = false;
} else {
- button_activate_chronopics.Visible = false;
- button_activate_chronopics_encoder.Visible = false;
+ button_contacts_devices_networks.Visible = false;
+ button_encoder_devices_networks.Visible = false;
button_contacts_detect_small.Visible = true;
}
@@ -997,7 +997,7 @@ public partial class ChronoJumpWindow
//not allow to change devices if person changed. If you want to change again, go to
preferences/advanced networksAllowChangeDevices
preferences.networksAllowChangeDevices = false;
- button_activate_chronopics_encoder.Sensitive = false;
+ button_encoder_devices_networks.Sensitive = false;
}
//Wakeup screen if it's off
@@ -1314,7 +1314,7 @@ public partial class ChronoJumpWindow
//not allow to change devices if person changed. If you want to change again, go to
preferences/advanced networksAllowChangeDevices
preferences.networksAllowChangeDevices = false;
- button_activate_chronopics_encoder.Sensitive = false;
+ button_encoder_devices_networks.Sensitive = false;
}
private void compujumpPersonAutoLogoutChanged(object o, EventArgs args)
@@ -1372,7 +1372,7 @@ public partial class ChronoJumpWindow
hbox_RFID_disconnected.Visible = false;
hbox_encoder_disconnected.Visible = true;
label_encoder_checked_error.Visible = false;
- button_activate_chronopics_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
+ button_contacts_devices_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
}
else {
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.ENCODER);
@@ -1393,7 +1393,7 @@ public partial class ChronoJumpWindow
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.NETWORKSPROBLEMS);
hbox_RFID_disconnected.Visible = true;
- button_activate_chronopics_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
+ button_contacts_devices_networks_problems.Sensitive =
preferences.networksAllowChangeDevices;
hbox_encoder_disconnected.Visible = false;
}
else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
