[chronojump] Removed personName on top of contacts eventgraph that mades main gui messy when too long
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed personName on top of contacts eventgraph that mades main gui messy when too long
- Date: Wed, 8 Apr 2020 11:32:25 +0000 (UTC)
commit 227871fe4b01949eb04afd6a358e50512a02a00b
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Apr 8 13:31:37 2020 +0200
Removed personName on top of contacts eventgraph that mades main gui messy when too long
glade/app1.glade | 23 -----------------------
src/gui/eventExecute.cs | 29 +++++++++++++----------------
2 files changed, 13 insertions(+), 39 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index eb8f73b9..1a402311 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -8723,22 +8723,6 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox88">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel"
id="event_graph_label_graph_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkLabel"
id="event_graph_label_graph_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -8746,13 +8730,6 @@ EncoderInertialCapture</property>
<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>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 7ab727eb..44a85ccd 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -43,7 +43,6 @@ public partial class ChronoJumpWindow
// [Widget] Gtk.Label event_execute_label_event_type;
[Widget] Gtk.Label event_execute_label_phases_name;
[Widget] Gtk.Label event_execute_label_message;
- [Widget] Gtk.Label event_graph_label_graph_person;
[Widget] Gtk.Label event_graph_label_graph_test;
[Widget] Gtk.ProgressBar event_execute_progressbar_event;
@@ -189,9 +188,8 @@ public partial class ChronoJumpWindow
if(simulated)
event_execute_label_simulated = Catalog.GetString("Simulated");
- event_graph_label_graph_person.Text = "<b>" + personName + "</b>";
- event_graph_label_graph_person.UseMarkup = true;
- event_graph_label_graph_test.Text = " - " + event_execute_eventType;
+ event_graph_label_graph_test.Text = "<b>" + event_execute_eventType + "</b>";
+ event_graph_label_graph_test.UseMarkup = true;
event_execute_label_message.Text = "";
@@ -1030,7 +1028,12 @@ public partial class ChronoJumpWindow
{
int ancho=drawingarea.Allocation.Width;
int alto=drawingarea.Allocation.Height;
-
+
+ if(eventGraph.tc > 0)
+ addUnitsToLabel("s");
+ else
+ addUnitsToLabel("cm");
+
//fix problem on show graph at Chronojump start
if(event_execute_drawingarea == null || event_execute_pixmap == null)
return;
@@ -1129,11 +1132,6 @@ public partial class ChronoJumpWindow
count --;
}
- if(eventGraph.tc > 0)
- addUnitsToLabel("s");
- else
- addUnitsToLabel("cm");
-
//add legend box
if(eventGraph.tc > 0 && eventGraph.tv > 0)
{
@@ -1239,7 +1237,8 @@ public partial class ChronoJumpWindow
}
private void addUnitsToLabel(string unit) {
- event_graph_label_graph_test.Text = event_graph_label_graph_test.Text + " (" + unit + ")";
+ event_graph_label_graph_test.Text = "<b>" + event_graph_label_graph_test.Text + " </b>(" +
unit + ")";
+ event_graph_label_graph_test.UseMarkup = true;
}
private void addLegend(Gdk.GC pen1, string text1, Gdk.GC pen2, string text2, Pango.Layout layout)
@@ -1291,7 +1290,8 @@ public partial class ChronoJumpWindow
{
int ancho=drawingarea.Allocation.Width;
int alto=drawingarea.Allocation.Height;
-
+ addUnitsToLabel("m/s");
+
//fix problem on show graph at Chronojump start
if(event_execute_drawingarea == null ||
event_execute_pixmap == null ||
@@ -1379,8 +1379,6 @@ public partial class ChronoJumpWindow
count --;
}
-
- addUnitsToLabel("m/s");
}
@@ -1389,6 +1387,7 @@ public partial class ChronoJumpWindow
{
int ancho=drawingarea.Allocation.Width;
int alto=drawingarea.Allocation.Height;
+ addUnitsToLabel("s");
//fix problem on show graph at Chronojump start
if(event_execute_drawingarea == null || event_execute_pixmap == null)
@@ -1432,8 +1431,6 @@ public partial class ChronoJumpWindow
count --;
}
-
- addUnitsToLabel("s");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]