[chronojump] Removed buttons at right of personPhoto, now all managed from session manage (hbox)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed buttons at right of personPhoto, now all managed from session manage (hbox)
- Date: Mon, 4 Oct 2021 11:20:10 +0000 (UTC)
commit 53ebc42fd18425dc8108cb6d98fbd730af4f8617
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Oct 4 13:19:41 2021 +0200
Removed buttons at right of personPhoto, now all managed from session manage (hbox)
glade/app1.glade | 165 +++++---------------------------------
src/gui/app1/chronojumpPersons.cs | 3 -
src/gui/app1/icons.cs | 8 --
src/gui/app1/menu.cs | 9 ---
src/gui/app1/shortcuts.cs | 1 -
src/gui/networks.cs | 1 -
6 files changed, 18 insertions(+), 169 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 26b35c3e4..cf7f97ed0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -2265,141 +2265,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkVBox" id="vbox172">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkButton"
id="button_image_current_person_zoom">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Zoom
image</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_image_current_person_zoom_clicked" swapped="no"/>
- <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_current_person_zoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_current_person_zoom">
- <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>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_edit_current_person">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
selected person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
- <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_edit_current_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_edit_current_person">
- <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>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_show_all_person_events">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Show
all tests of this person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_show_all_person_events_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_show_all_person_events">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_all_persons_events">
- <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>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_delete_current_person">
- <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">Delete person from this session.</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_delete_current_person_from_session_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_delete_current_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_person_delete">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24752,6 +24617,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31063,6 +30931,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>
@@ -31099,18 +30979,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>
@@ -40453,6 +40321,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/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index f184d1d84..f3c03610a 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -54,7 +54,6 @@ public partial class ChronoJumpWindow
private void showPersonPhoto (bool showPhoto)
{
hbox_persons_bottom_photo.Visible = showPhoto;
- vbox_persons_bottom_no_photo.Visible = ! showPhoto;
}
private void label_person_change()
@@ -70,7 +69,6 @@ public partial class ChronoJumpWindow
{
Pixbuf pixbuf = new Pixbuf (filenameMini);
image_current_person.Pixbuf = pixbuf;
- button_image_current_person_zoom.Sensitive = true;
button_image_current_person_zoom_h.Sensitive = true;
} else {
//image_current_person.Pixbuf = null;
@@ -79,7 +77,6 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_no_photo_yellow.png");
image_current_person.Pixbuf = pixbuf;
- button_image_current_person_zoom.Sensitive = false;
button_image_current_person_zoom_h.Sensitive = false;
}
}
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index df60fa98c..34e451927 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -38,12 +38,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_db_backup;
[Widget] Gtk.Image image_db_view;
[Widget] Gtk.Image image_mode_encoder_capture;
- [Widget] Gtk.Image image_current_person_zoom;
[Widget] Gtk.Image image_current_person_zoom_h;
[Widget] Gtk.Image image_person;
[Widget] Gtk.Image image_person1;
[Widget] Gtk.Image image_person2;
- [Widget] Gtk.Image image_edit_current_person;
[Widget] Gtk.Image image_edit_current_person_h;
//[Widget] Gtk.Image image_persons_up;
//[Widget] Gtk.Image image_persons_down;
@@ -53,9 +51,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_contacts_session_overview;
[Widget] Gtk.Image image_encoder_session_overview;
[Widget] Gtk.Image image_contacts_recalculate;
- [Widget] Gtk.Image image_all_persons_events;
[Widget] Gtk.Image image_all_persons_events_h;
- [Widget] Gtk.Image image_person_delete;
[Widget] Gtk.Image image_person_delete_h;
[Widget] Gtk.Image image_chronopic_connect_contacts;
[Widget] Gtk.Image image_chronopic_connect_encoder;
@@ -381,7 +377,6 @@ public partial class ChronoJumpWindow
image_force_sensor_calibrate.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "portrait_zoom.png");
- image_current_person_zoom.Pixbuf = pixbuf;
image_current_person_zoom_h.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_no_photo.png");
@@ -528,7 +523,6 @@ public partial class ChronoJumpWindow
image_encoder_exercise_edit.Pixbuf = pixbuf;
image_force_sensor_exercise_edit.Pixbuf = pixbuf;
image_run_encoder_exercise_edit.Pixbuf = pixbuf;
- image_edit_current_person.Pixbuf = pixbuf;
image_edit_current_person_h.Pixbuf = pixbuf;
image_session_edit2.Pixbuf = pixbuf;
app1s_image_edit.Pixbuf = pixbuf;
@@ -584,7 +578,6 @@ public partial class ChronoJumpWindow
image_contacts_rest_time_clear_yellow.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_check.png");
- image_all_persons_events.Pixbuf = pixbuf;
image_all_persons_events_h.Pixbuf = pixbuf;
image_db_view.Pixbuf = pixbuf;
@@ -752,7 +745,6 @@ public partial class ChronoJumpWindow
image_encoder_bell.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
- image_person_delete.Pixbuf = pixbuf;
image_person_delete_h.Pixbuf = pixbuf;
image_delete_last_test.Pixbuf = pixbuf;
image_jump_delete.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index d6d22515e..ade14820b 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -54,10 +54,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_edit_current_person_h;
[Widget] Gtk.EventBox eventbox_show_all_person_events_h;
[Widget] Gtk.EventBox eventbox_delete_current_person_h;
- [Widget] Gtk.EventBox eventbox_current_person_zoom;
- [Widget] Gtk.EventBox eventbox_edit_current_person;
- [Widget] Gtk.EventBox eventbox_show_all_person_events;
- [Widget] Gtk.EventBox eventbox_delete_current_person;
[Widget] Gtk.Label label_current_session;
[Widget] Gtk.Label label_current_person;
@@ -193,7 +189,6 @@ public partial class ChronoJumpWindow
LogB.Information(string.Format("hbox_persons_bottom_no_photo: {0}",
hbox_persons_bottom_no_photo.SizeRequest().Width));
LogB.Information(string.Format("hbox_persons_bottom_photo: {0}",
hbox_persons_bottom_photo.SizeRequest().Width));
LogB.Information(string.Format("image_current_person: {0}",
image_current_person.SizeRequest().Width));
- LogB.Information(string.Format("button_image_current_person_zoom: {0}",
button_image_current_person_zoom.SizeRequest().Width));
LogB.Information(string.Format("hbox_rest_time: {0}", hbox_rest_time.SizeRequest().Width));
*/
@@ -281,10 +276,6 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_edit_current_person_h, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_show_all_person_events_h, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_delete_current_person_h, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_current_person_zoom, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_edit_current_person, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_show_all_person_events, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_delete_current_person, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
}
private void menuShowVerticalArrow (bool selected, Gtk.Arrow a_up, Gtk.Arrow a_down)
diff --git a/src/gui/app1/shortcuts.cs b/src/gui/app1/shortcuts.cs
index 30bf11ff2..cad743107 100644
--- a/src/gui/app1/shortcuts.cs
+++ b/src/gui/app1/shortcuts.cs
@@ -50,7 +50,6 @@ public partial class ChronoJumpWindow
string down = Catalog.GetString("Down");
//persons
- button_edit_current_person.TooltipText += string.Format(" ({0}+p)", kCtrl);
button_edit_current_person_h.TooltipText += string.Format(" ({0}+p)", kCtrl);
button_persons_up.TooltipText += string.Format(" ({0}+{1})", kCtrl, up);
button_persons_down.TooltipText += string.Format(" ({0}+{1})", kCtrl, down);
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 8531debdf..ce76e080c 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -60,7 +60,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_top_person_encoder;
[Widget] Gtk.Label label_top_person_name;
[Widget] Gtk.Label label_top_encoder_person_name;
- [Widget] Gtk.Button button_image_current_person_zoom;
[Widget] Gtk.Button button_image_current_person_zoom_h;
[Widget] Gtk.Image image_current_person;
[Widget] Gtk.Button button_contacts_person_change;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
