[chronojump] Added deleted icon for encoder exercises
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Added deleted icon for encoder exercises
- Date: Wed, 17 Sep 2014 09:49:08 +0000 (UTC)
commit 7de19858fc6c9c2653d9d9bb3a702cbf2d94d009
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Sep 17 11:47:35 2014 +0200
Added deleted icon for encoder exercises
glade/chronojump.glade | 147 +++++++++++++++++++++++++++++++++++++++++-----
src/gui/genericWindow.cs | 12 ++++-
2 files changed, 143 insertions(+), 16 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 2984e38..3223a94 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6239,6 +6239,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6894,6 +6900,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7683,6 +7695,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8231,6 +8249,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -17748,6 +17772,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18204,6 +18234,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19130,6 +19166,18 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -25707,27 +25755,30 @@ One serie can contain several tests.</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">10</property>
+ <property name="top_padding">12</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox42">
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <property name="layout_style">edge</property>
<child>
<widget class="GtkButton" id="button_delete">
- <property name="label">gtk-remove</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <child>
+ <widget class="GtkImage" id="image_delete">
+ <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">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -25743,8 +25794,8 @@ One serie can contain several tests.</property>
<accelerator key="Escape" signal="clicked"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -25759,8 +25810,9 @@ One serie can contain several tests.</property>
<signal name="clicked" handler="on_button_accept_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -25769,8 +25821,7 @@ One serie can contain several tests.</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -27264,6 +27315,42 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -29110,6 +29197,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -29625,6 +29718,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -32113,6 +32212,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -32233,6 +32338,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -32368,6 +32479,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/genericWindow.cs b/src/gui/genericWindow.cs
index 7fd6db3..58e60f1 100644
--- a/src/gui/genericWindow.cs
+++ b/src/gui/genericWindow.cs
@@ -19,6 +19,7 @@
*/
using System;
+using Gdk;
using Gtk;
using Glade;
//using Gnome;
@@ -86,6 +87,8 @@ public class GenericWindow
[Widget] Gtk.Label label_spin_double2;
[Widget] Gtk.SpinButton spin_double2;
+ [Widget] Gtk.Image image_delete;
+
private ArrayList nonSensitiveRows;
static GenericWindow GenericWindowBox;
@@ -131,7 +134,13 @@ public class GenericWindow
GenericWindowBox.generic_window.Resizable = false;
GenericWindowBox.label_header.Text = textHeader;
- //maybe more things have to be done before showing
+
+ Pixbuf pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
+ GenericWindowBox.image_delete.Pixbuf = pixbuf;
+
+ GenericWindowBox.label_header.Text = textHeader;
+
+
if(showNow)
GenericWindowBox.generic_window.Show ();
GenericWindowBox.HideOnAccept = true;
@@ -150,6 +159,7 @@ public class GenericWindow
GenericWindowBox.hideWidgets();
GenericWindowBox.showWidget(stuff);
+ GenericWindowBox.generic_window.Resizable = false;
GenericWindowBox.label_header.Text = textHeader;
GenericWindowBox.generic_window.Show ();
GenericWindowBox.HideOnAccept = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
