[chronojump] label_version shown on start window
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] label_version shown on start window
- Date: Sun, 16 Apr 2017 11:30:30 +0000 (UTC)
commit c90d6e1006eb5ed8dad6af2203f1be7b8e2ccc99
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Apr 16 12:36:29 2017 +0200
label_version shown on start window
glade/app1.glade | 177 +++++++++++++++++++-------------------------
src/gui/chronojump.cs | 2 +
src/gui/chronojumpIcons.cs | 5 +
3 files changed, 84 insertions(+), 100 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 28c4bc7..35a59cf 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -642,11 +642,56 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage" id="image_chronojump_logo">
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="ypad">6</property>
- <property name="stock">gtk-missing-image</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">16</property>
+ <child>
+ <widget class="GtkHBox" id="hbox77">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label_version_hidden">
+ <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="GtkImage" id="image_chronojump_logo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="ypad">6</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_version">
+ <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="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -1149,6 +1194,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1599,18 +1647,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox38">
+ <widget class="GtkHBox" id="hbox_gui_tests">
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox91">
+ <widget class="GtkVBox" id="vbox57">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label252">
+ <widget class="GtkLabel" id="label202">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Version</property>
+ <property name="label">Session</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -1619,10 +1668,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_version">
+ <widget class="GtkSpinButton" id="spin_gui_tests">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
+ <property name="climb_rate">1</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1638,79 +1693,12 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_gui_tests">
+ <widget class="GtkComboBox" id="combo_gui_tests">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkVBox" id="vbox57">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label202">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Session</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_gui_tests">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">1 1 100 1 10 0</property>
- <property name="climb_rate">1</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
- <child>
- <widget class="GtkComboBox" id="combo_gui_tests">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="active">1</property>
- <property name="items">EncoderGravitatoryCapture
+ <property name="active">1</property>
+ <property name="items">EncoderGravitatoryCapture
EncoderInertialCapture</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_gui_tests">
- <property name="label">GUI TESTS</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_gui_tests_clicked"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -1719,12 +1707,12 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_carles">
- <property name="label">Button
-Carles</property>
+ <widget class="GtkButton" id="button_gui_tests">
+ <property name="label">GUI TESTS</property>
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_carles_clicked" swapped="no"/>
+ <signal name="clicked" handler="on_button_gui_tests_clicked"
swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -1732,20 +1720,6 @@ Carles</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton" id="button_crash">
- <property name="label">CRASH_ME
-(debug purposes)</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_debug_crash_activate" swapped="no"/>
- </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>
@@ -20134,6 +20108,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 4d122a1..b25fd7a 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -84,6 +84,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton radio_mode_contacts_sprint;
[Widget] Gtk.Label label_version;
+ [Widget] Gtk.Label label_version_hidden; //just to have logo aligned on the middle
//[Widget] Gtk.Image image_selector_start_encoder_inertial;
[Widget] Gtk.Label label_start_selector_jumps;
[Widget] Gtk.Label label_start_selector_races;
@@ -624,6 +625,7 @@ public partial class ChronoJumpWindow
string buildVersion = UtilAll.ReadVersionFromBuildInfo();
label_version.Text = buildVersion;
+ label_version_hidden.Text = buildVersion;
LogB.Information("Build version:" + buildVersion);
LeastSquares ls = new LeastSquares();
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 4da6141..c9b6161 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -89,6 +89,11 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogoTransparent);
image_chronojump_logo.Pixbuf = pixbuf;
+ //hide label_version_hidden
+ label_version_hidden.ModifyFg(StateType.Normal, new Gdk.Color(0x0e,0x1e,0x46));
+ //show label_version on white
+ label_version.ModifyFg(StateType.Normal, new Gdk.Color(0xff,0xff,0xff));
+
//change colors of tests mode
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
