[chronojump] radio_contacts_graph_currentPerson/allPersons with icons
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] radio_contacts_graph_currentPerson/allPersons with icons
- Date: Sun, 14 Jun 2020 01:07:35 +0000 (UTC)
commit c33a85e5b902b986911aded09d6017afa7c040ef
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Jun 14 03:06:54 2020 +0200
radio_contacts_graph_currentPerson/allPersons with icons
glade/app1.glade | 52 ++++++++++++++++++++++++++++++++++---------------
src/Makefile.am | 2 ++
src/gui/app1/icons.cs | 5 +++++
src/gui/eventExecute.cs | 2 ++
4 files changed, 45 insertions(+), 16 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1bd6b267..4fbf2fc8 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7856,13 +7856,20 @@ EncoderInertialCapture</property>
<property name="spacing">6</property>
<child>
<widget class="GtkRadioButton"
id="radio_contacts_graph_currentPerson">
- <property name="label">Current person</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip">Current
person</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<signal name="toggled"
handler="on_radio_contacts_graph_person_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_radio_contacts_graph_currentPerson">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7872,14 +7879,21 @@ EncoderInertialCapture</property>
</child>
<child>
<widget class="GtkRadioButton"
id="radio_contacts_graph_allPersons">
- <property name="label" translatable="yes">All
persons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip">All persons</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw_indicator">False</property>
<property
name="group">radio_contacts_graph_currentPerson</property>
<signal name="toggled"
handler="on_radio_contacts_graph_person_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_radio_contacts_graph_allPersons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -24183,6 +24197,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27027,6 +27044,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>
@@ -27063,18 +27092,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>
@@ -34989,6 +35006,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index 331e8720..890c3253 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -598,6 +598,8 @@ RESOURCES = \
../images/laterality-both.png,laterality-both.png \
../images/laterality-right.png,laterality-right.png \
../images/laterality-left.png,laterality-left.png \
+ ../images/individual.png,individual.png \
+ ../images/grupal.png,grupal.png \
../images/encoder-analyze-individual-current-set.png,encoder-analyze-individual-current-set.png \
../images/encoder-analyze-individual-current-session.png,encoder-analyze-individual-current-session.png \
../images/encoder-analyze-individual-all-sessions.png,encoder-analyze-individual-all-sessions.png \
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 2317a0ca..bd0715b8 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -349,6 +349,11 @@ public partial class ChronoJumpWindow
image_add_test5.Pixbuf = pixbuf;
image_run_encoder_exercise_add.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "individual.png");
+ image_radio_contacts_graph_currentPerson.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "grupal.png");
+ image_radio_contacts_graph_allPersons.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_test_inspect.png");
image_test_inspect.Pixbuf = pixbuf;
image_test_inspect1.Pixbuf = pixbuf;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 36bfda4e..be358dc4 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -51,6 +51,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_contacts_graph_person;
[Widget] Gtk.RadioButton radio_contacts_graph_currentPerson;
[Widget] Gtk.RadioButton radio_contacts_graph_allPersons;
+ [Widget] Gtk.Image image_radio_contacts_graph_currentPerson;
+ [Widget] Gtk.Image image_radio_contacts_graph_allPersons;
[Widget] Gtk.ProgressBar event_execute_progressbar_event;
[Widget] Gtk.ProgressBar event_execute_progressbar_time;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
