commit 4e0a2c8c80b3924cc7d53c17cf8b3a157224db70
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Jun 15 15:04:05 2014 +0200
Logo shown on chronojump start gui
glade/chronojump.glade | 273 +++++++++++++++++++++++++++++++-----------------
src/gui/chronojump.cs | 8 ++
2 files changed, 184 insertions(+), 97 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 6ed957c..17b2f08 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -14215,141 +14215,226 @@ Evaluator can use real name or nickname.</property>
<property name="top_padding">20</property>
<property name="left_padding">60</property>
<child>
- <widget class="GtkHBox" id="hbox38">
+ <widget class="GtkVBox" id="vbox74">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox92">
+ <widget class="GtkHBox" id="hbox38">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkLabel" id="label_selector_start">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Please, select
mode:</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="alignment12">
+ <widget class="GtkVBox" id="vbox92">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">20</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkTable" id="table11">
+ <widget class="GtkLabel" id="label_selector_start">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">20</property>
- <property name="row_spacing">20</property>
- <property name="homogeneous">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please, select
mode:</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="alignment12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
<child>
- <widget class="GtkButton" id="button_selector_start_jumps">
+ <widget class="GtkTable" id="table11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_selector_start_jumps_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">20</property>
+ <property name="row_spacing">20</property>
+ <property name="homogeneous">True</property>
<child>
- <widget class="GtkLabel" id="label59">
+ <widget class="GtkButton"
id="button_selector_start_jumps">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">8</property>
- <property name="label"
translatable="yes">Jumps</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_selector_start_jumps_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label59">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ <property name="label"
translatable="yes">Jumps</property>
+ </widget>
+ </child>
</widget>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button_selector_start_runs">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_selector_start_runs_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label52">
+ <widget class="GtkButton"
id="button_selector_start_runs">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">8</property>
- <property name="label"
translatable="yes">Runs</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_selector_start_runs_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ <property name="label"
translatable="yes">Runs</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_selector_start_other">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_selector_start_other_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label51">
+ <widget class="GtkButton"
id="button_selector_start_other">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">8</property>
- <property name="label"
translatable="yes">Other</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_selector_start_other_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ <property name="label"
translatable="yes">Other</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_selector_start_encoder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_selector_start_encoder_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label50">
+ <widget class="GtkButton"
id="button_selector_start_encoder">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">8</property>
- <property name="label"
translatable="yes">Encoder</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_selector_start_encoder_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ <property name="label"
translatable="yes">Encoder</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
</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>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkAlignment" id="alignment31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">10</property>
+ <property name="right_padding">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox121">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkImage" id="image_logo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="stock">gtk-network</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="GtkVBox" id="vbox75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label201">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property
name="label"><b>Chronojump</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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">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="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
</child>
@@ -14367,14 +14452,8 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Selector mode at start</property>
- </widget>
+ <placeholder/>
<packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
</child>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 40907c3..f540b5c 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -51,6 +51,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_sup;
[Widget] Gtk.Notebook notebook_sup_contacts;
+ [Widget] Gtk.Label label_version;
+ [Widget] Gtk.Image image_logo;
+
//gui for small screens
[Widget] Gtk.RadioButton radio_mode_jumps_small;
[Widget] Gtk.RadioButton radio_mode_jumps_reactive_small;
@@ -587,6 +590,8 @@ public partial class ChronoJumpWindow
//presentationInit();
videoCaptureInitialize();
+
+ label_version.Text = progVersion;
}
@@ -804,6 +809,9 @@ public partial class ChronoJumpWindow
image_auto_person_skip.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameAutoPersonRemoveIcon);
image_auto_person_remove.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo);
+ image_logo.Pixbuf = pixbuf;
}
private void loadPreferences ()