commit 31333a36c48aa31fe3733b46cf04b53299aca7ba
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jul 21 13:21:36 2021 +0200
Cont of last commit
glade/app1.glade | 52 ++++++++++++++++++++++++++++++++++++---
src/gui/app1/chronojump.cs | 9 ++++---
src/gui/app1/chronojumpPersons.cs | 2 +-
3 files changed, 55 insertions(+), 8 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 288d762ed..3286f9d34 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1704,7 +1704,7 @@
<child>
<widget class="GtkVBox" id="vbox_manage_persons">
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkVBox"
id="vbox_person_manage_create">
<property name="visible">True</property>
@@ -1724,6 +1724,11 @@
</packing>
</child>
<child>
+ <widget class="GtkAlignment" id="alignment52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">4</property>
+ <child>
<widget class="GtkHBox" id="hbox535">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1801,6 +1806,8 @@
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1833,6 +1840,11 @@
</packing>
</child>
<child>
+ <widget class="GtkAlignment" id="alignment85">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">4</property>
+ <child>
<widget class="GtkHBox" id="hbox537">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1910,6 +1922,8 @@
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -1924,6 +1938,28 @@
</packing>
</child>
<child>
+ <widget class="GtkVBox"
id="vbox_persons_bottom_no_photo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label131">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Current person</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment87">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">4</property>
+ <child>
<widget class="GtkHBox"
id="hbox_persons_bottom_no_photo">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1949,7 +1985,7 @@
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
@@ -1998,7 +2034,7 @@
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
@@ -2024,10 +2060,20 @@
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 1caf69e8b..367391647 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -321,6 +321,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Frame frame_persons_top;
[Widget] Gtk.VBox vbox_persons_bottom;
[Widget] Gtk.HBox hbox_persons_bottom_photo;
+ [Widget] Gtk.VBox vbox_persons_bottom_no_photo;
[Widget] Gtk.HBox hbox_persons_bottom_no_photo;
[Widget] Gtk.Button button_recuperate_person;
[Widget] Gtk.Button button_recuperate_persons_from_session;
@@ -2701,7 +2702,7 @@ public partial class ChronoJumpWindow
//for sure, jumpsExists is false, because we create a new session
hbox_persons_bottom_photo.Sensitive = false;
- hbox_persons_bottom_no_photo.Sensitive = false;
+ vbox_persons_bottom_no_photo.Sensitive = false;
label_top_person_name.Text = "";
label_top_encoder_person_name.Text = "";
@@ -2792,7 +2793,7 @@ public partial class ChronoJumpWindow
definedSession = true;
hbox_persons_bottom_photo.Sensitive = false;
- hbox_persons_bottom_no_photo.Sensitive = false;
+ vbox_persons_bottom_no_photo.Sensitive = false;
LogB.Information("foundPersons: " + foundPersons.ToString());
//if there are persons
if(foundPersons) {
@@ -7679,7 +7680,7 @@ LogB.Debug("mc finished 5");
}
hbox_persons_bottom_photo.Sensitive = option;
- hbox_persons_bottom_no_photo.Sensitive = option;
+ vbox_persons_bottom_no_photo.Sensitive = option;
}
private void sensitiveGuiNoSession ()
@@ -7695,7 +7696,7 @@ LogB.Debug("mc finished 5");
button_person_add_single.Sensitive = false;
button_person_add_multiple.Sensitive = false;
hbox_persons_bottom_photo.Sensitive = false;
- hbox_persons_bottom_no_photo.Sensitive = false;
+ vbox_persons_bottom_no_photo.Sensitive = false;
button_contacts_person_change.Sensitive = false;
button_encoder_person_change.Sensitive = false;
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index e75e808f9..bc926dca1 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -68,7 +68,7 @@ public partial class ChronoJumpWindow
private void showPersonPhoto (bool showPhoto)
{
hbox_persons_bottom_photo.Visible = showPhoto;
- hbox_persons_bottom_no_photo.Visible = ! showPhoto;
+ vbox_persons_bottom_no_photo.Visible = ! showPhoto;
}
private void label_person_change()