commit ec10cf789e4e4123296cadde95ccbd680714c8c8
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jan 30 16:50:55 2020 +0100
continuing...
glade/app1.glade | 92 +++++++++++++++++++++++++++++++++++++++-------
src/gui/app1/chronojump.cs | 10 +++++
2 files changed, 89 insertions(+), 13 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5c842a3b..7b215121 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23115,6 +23115,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -25386,18 +25389,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -25434,6 +25425,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -32703,6 +32706,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34009,10 +34015,70 @@ then click this button.</property>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="padding">12</property>
- <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox358">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_activate_chronopics_encoder_networks_problems1">
+ <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="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>
+ <widget class="GtkHBox" id="hbox359">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label437">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Check</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_chronopic_connect_encoder2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 15ee71a4..b1eea316 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -7549,9 +7549,11 @@ LogB.Debug("mc finished 5");
{
chronopicRegisterWin.Show(networksNeedCheckEncoder);
+ /*
if (networksNeedCheckEncoder)
chronopicRegisterWin.FakeButtonNetworksCheckSensors.Clicked +=
new
EventHandler(on_chronopic_register_win_close_networks_check_encoder);
+ */
} else
needToShowChronopicRegisterWindow = true;
}
@@ -7565,6 +7567,7 @@ LogB.Debug("mc finished 5");
* so check here if encodee is configured
* when ChronopicRegisterWindow is close or destroyed (delete_event)
*/
+ /*
private void on_chronopic_register_win_close_networks_check_encoder (object o, EventArgs args)
{
chronopicRegisterWin.FakeButtonNetworksCheckSensors.Clicked -=
@@ -7574,6 +7577,13 @@ LogB.Debug("mc finished 5");
if(chronopicRegister.NumConnectedOfType(ChronopicRegisterPort.Types.ENCODER) > 0)
notebook_start.CurrentPage = 1;
}
+ */
+ private void on_chronopic_register_win_close_networks_check_encoder (object o, EventArgs args)
+ {
+ chronopicRegisterUpdate(false, false);
+ if(chronopicRegister.NumConnectedOfType(ChronopicRegisterPort.Types.ENCODER) > 0)
+ notebook_start.CurrentPage = 1;
+ }
//trying to fix when an OSX disconnects and reconnects same chronopic (and it has captured)
private void closeSerialPort (object o, EventArgs args)