[chronojump] Implemented Guest button for Networks/Encoder
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Implemented Guest button for Networks/Encoder
- Date: Fri, 11 Mar 2022 09:40:36 +0000 (UTC)
commit d96fd79e1a08c359dcc0ffa9a91b197ec6219c7b
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 11 10:39:34 2022 +0100
Implemented Guest button for Networks/Encoder
glade/app1.glade | 87 +++++++++++++++++++++++++++++++++++------------
src/gui/app1/menu_tiny.cs | 2 ++
src/gui/networks.cs | 9 +++++
3 files changed, 76 insertions(+), 22 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8f398b1b1..88fd21feb 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -26249,6 +26249,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31024,26 +31027,63 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_person_change">
- <property name="width_request">80</property>
- <property name="height_request">40</property>
+ <widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Person</property>
- <signal name="clicked"
handler="on_button_top_person_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_encoder_person_change">
+ <widget class="GtkButton"
id="button_encoder_person_change">
+ <property name="width_request">80</property>
+ <property name="height_request">40</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Person</property>
+ <signal name="clicked"
handler="on_button_top_person_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image_person">
+ <widget class="GtkEventBox"
id="eventbox_button_encoder_person_change">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_person">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_networks_encoder_guest">
+ <property name="height_request">40</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Person</property>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_networks_encoder_guest">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label447">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Guest</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -32619,6 +32659,18 @@ 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>
@@ -32655,18 +32707,6 @@ 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>
@@ -42318,6 +42358,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index ee3ec29af..17b232104 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -42,6 +42,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_exit1;
[Widget] Gtk.EventBox eventbox_button_contacts_person_change;
[Widget] Gtk.EventBox eventbox_button_encoder_person_change;
+ [Widget] Gtk.EventBox eventbox_button_networks_encoder_guest;
[Widget] Gtk.CheckButton check_menu_session1;
[Widget] Gtk.Button button_menu_news1;
[Widget] Gtk.VBox vbox_menu_session1;
@@ -151,6 +152,7 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_contacts_person_change,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_encoder_person_change, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_networks_encoder_guest,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
}
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 0f3977399..4837b57bb 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -64,6 +64,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_current_person;
[Widget] Gtk.Button button_contacts_person_change;
[Widget] Gtk.Button button_encoder_person_change;
+ [Widget] Gtk.Button button_networks_encoder_guest;
//encoder exercise stuff
[Widget] Gtk.Label label_encoder_exercise_encoder;
@@ -204,6 +205,9 @@ public partial class ChronoJumpWindow
configChronojump.PersonWinHide = true;
showPersonsOnTop(true);
+ button_networks_encoder_guest.Visible = true;
+ button_encoder_person_change.Visible = false;
+
if(configChronojump.CompujumpStationMode != Constants.Modes.UNDEFINED)
{
//changeModeCheckRadios (configChronojump.CompujumpStationMode);
@@ -854,6 +858,9 @@ public partial class ChronoJumpWindow
{
compujumpAutologout = new CompujumpAutologout();
+ button_networks_encoder_guest.Visible = false;
+ button_encoder_person_change.Visible = true;
+
/*TODO:
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1)
@@ -1178,6 +1185,8 @@ public partial class ChronoJumpWindow
currentPerson = null;
currentPersonSession = null;
sensitiveGuiNoPerson ();
+ button_networks_encoder_guest.Visible = true;
+ button_encoder_person_change.Visible = false;
//not allow to change devices if person changed. If you want to change again, go to
preferences/advanced networksAllowChangeDevices
preferences.networksAllowChangeDevices = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]