[chronojump] gui change (cont)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] gui change (cont)
- Date: Fri, 25 Mar 2011 09:24:29 +0000 (UTC)
commit 1bdd72471543bd59e8d3b24a951070615a3a4188
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 22 13:32:04 2011 +0100
gui change (cont)
glade/chronojump.glade | 45 ++++++++++++++++++++++++------
images/gtk-new-1.png | Bin 0 -> 760 bytes
images/gtk-new-plus.png | Bin 0 -> 754 bytes
images/gtk-open-1.png | Bin 0 -> 618 bytes
images/gtk-open-plus.png | Bin 0 -> 606 bytes
src/Makefile.am | 4 +++
src/constants.cs | 4 +++
src/gui/chronojump.cs | 68 +++++++++++++++++++++++++++++++++++-----------
src/gui/jump.cs | 6 ++++
9 files changed, 102 insertions(+), 25 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 99b6815..3ece505 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -17716,7 +17716,7 @@ by you</property>
<property name="tooltip" translatable="yes">New person</property>
<signal name="clicked" handler="on_person_add_single_activate"/>
<child>
- <widget class="GtkImage" id="image1470">
+ <widget class="GtkImage" id="image_persons_new_1">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
</widget>
@@ -17738,7 +17738,7 @@ by you</property>
<property name="tooltip" translatable="yes">New person</property>
<signal name="clicked" handler="on_person_add_multiple_clicked"/>
<child>
- <widget class="GtkImage" id="image15">
+ <widget class="GtkImage" id="image_persons_new_plus">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
</widget>
@@ -17760,7 +17760,7 @@ by you</property>
<property name="tooltip" translatable="yes">Load person</property>
<signal name="clicked" handler="on_recuperate_person_clicked"/>
<child>
- <widget class="GtkImage" id="image1471">
+ <widget class="GtkImage" id="image_persons_open_1">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
</widget>
@@ -17782,7 +17782,7 @@ by you</property>
<property name="tooltip" translatable="yes">Load person</property>
<signal name="clicked" handler="on_recuperate_persons_from_session_clicked"/>
<child>
- <widget class="GtkImage" id="image16">
+ <widget class="GtkImage" id="image_persons_open_plus">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
</widget>
@@ -18551,6 +18551,7 @@ Chronopic</property>
<child>
<widget class="GtkHBox" id="hbox20">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton" id="button20">
<property name="visible">True</property>
@@ -18684,7 +18685,6 @@ Chronopic</property>
<property name="visible">True</property>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rj_j">
- <property name="label" translatable="yes">RJ(j)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18694,6 +18694,12 @@ Chronopic</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
<signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rj_j">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">RJ(j)</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18703,7 +18709,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rj_t">
- <property name="label" translatable="yes">RJ(t)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18713,6 +18718,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_rj_j</property>
<signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rj_t">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">RJ(t)</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18722,7 +18733,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rj_unlimited">
- <property name="label" translatable="yes">Unlimited</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18732,6 +18742,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_rj_j</property>
<signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rj_unlimited">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Unlimited</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18741,7 +18757,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rj_hexagon">
- <property name="label" translatable="yes">Hexagon</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18751,6 +18766,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_rj_j</property>
<signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rj_hexagon">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Hexagon</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18760,7 +18781,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rj_more">
- <property name="label" translatable="yes">More jumps</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18770,6 +18790,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_rj_j</property>
<signal name="clicked" handler="on_extra_window_jumps_rj_more"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rj_more">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">More Jumps</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18787,6 +18813,7 @@ Chronopic</property>
<child>
<widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
diff --git a/images/gtk-new-1.png b/images/gtk-new-1.png
new file mode 100644
index 0000000..ee3f211
Binary files /dev/null and b/images/gtk-new-1.png differ
diff --git a/images/gtk-new-plus.png b/images/gtk-new-plus.png
new file mode 100644
index 0000000..711e9c3
Binary files /dev/null and b/images/gtk-new-plus.png differ
diff --git a/images/gtk-open-1.png b/images/gtk-open-1.png
new file mode 100644
index 0000000..ff3e840
Binary files /dev/null and b/images/gtk-open-1.png differ
diff --git a/images/gtk-open-plus.png b/images/gtk-open-plus.png
new file mode 100644
index 0000000..a864089
Binary files /dev/null and b/images/gtk-open-plus.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 34f96f2..e703295 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -319,6 +319,10 @@ RESOURCES = \
../images/gtk-zoom-fit.png,gtk-zoom-fit.png \
../images/gtk-zoom-in.png,gtk-zoom-in.png \
../images/gtk-zoom-in-with-text.png,gtk-zoom-in-with-text.png \
+ ../images/gtk-new-1.png,gtk-new-1.png \
+ ../images/gtk-new-plus.png,gtk-new-plus.png \
+ ../images/gtk-open-1.png,gtk-open-1.png \
+ ../images/gtk-open-plus.png,gtk-open-plus.png \
../images/chronojump_320.png,chronojump_320.png \
../images/calendar.png,calendar.png \
../images/chronojump_logo.png,chronojump_logo.png \
diff --git a/src/constants.cs b/src/constants.cs
index c0c0ba8..dc3af09 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -276,6 +276,10 @@ public class Constants
//public static string FileNameZoomOutIcon = "gtk-zoom-out.png";
public static string FileNameZoomInIcon = "gtk-zoom-in.png";
public static string FileNameZoomInWithTextIcon = "gtk-zoom-in-with-text.png";
+ public static string FileNameNew1 = "gtk-new-1.png";
+ public static string FileNameNewPlus = "gtk-new-plus.png";
+ public static string FileNameOpen1 = "gtk-open-1.png";
+ public static string FileNameOpenPlus = "gtk-open-plus.png";
public static string FileNameJumps = "stock_up.png";
public static string FileNameJumpsRJ = "stock_up_down.png";
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 4da7d56..cc9aa80 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -59,6 +59,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_mode_pulses;
[Widget] Gtk.Label label_mode_multi_chronopic;
+ [Widget] Gtk.Image image_persons_new_1;
+ [Widget] Gtk.Image image_persons_new_plus;
+ [Widget] Gtk.Image image_persons_open_1;
+ [Widget] Gtk.Image image_persons_open_plus;
[Widget] Gtk.Statusbar appbar2;
[Widget] Gtk.TreeView treeview_persons;
@@ -449,6 +453,7 @@ public partial class ChronoJumpWindow
on_extra_window_jumps_test_changed(new object(), new EventArgs());
on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
+ changeTestImage("", "", "LOGO");
repetitiveConditionsWin = RepetitiveConditionsWindow.Create();
@@ -518,7 +523,23 @@ public partial class ChronoJumpWindow
UtilGtk.ColorsMenuRadio(radio_mode_pulses);
UtilGtk.ColorsMenuRadio(radio_mode_multi_chronopic);
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
+ image_mode_jumps.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
+ image_mode_jumps_reactive.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRuns);
+ image_mode_runs.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
+ image_mode_runs_intervallic.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
+ image_mode_reaction_times.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
+ image_mode_pulses.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameMultiChronopic);
+ image_mode_multi_chronopic.Pixbuf = pixbuf;
+
+ //jumps changes
label_extra_window_radio_jump_free.ModifyFg(StateType.Active, UtilGtk.WHITE);
label_extra_window_radio_jump_sj.ModifyFg(StateType.Active, UtilGtk.WHITE);
label_extra_window_radio_jump_sjl.ModifyFg(StateType.Active, UtilGtk.WHITE);
@@ -541,21 +562,30 @@ public partial class ChronoJumpWindow
UtilGtk.ColorsMenuRadio(extra_window_radio_jump_takeoff);
UtilGtk.ColorsMenuRadio(extra_window_radio_jump_more);
+ //jumpsRj changes
+ label_extra_window_radio_jump_rj_j.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_rj_t.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_rj_unlimited.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_rj_hexagon.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_rj_more.ModifyFg(StateType.Active, UtilGtk.WHITE);
+
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rj_j);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rj_t);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rj_unlimited);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rj_hexagon);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rj_more);
+
+ //persons buttons
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameNew1);
+ image_persons_new_1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameNewPlus);
+ image_persons_new_plus.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameOpen1);
+ image_persons_open_1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameOpenPlus);
+ image_persons_open_plus.Pixbuf = pixbuf;
+
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
- image_mode_jumps.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
- image_mode_jumps_reactive.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRuns);
- image_mode_runs.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
- image_mode_runs_intervallic.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
- image_mode_reaction_times.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
- image_mode_pulses.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameMultiChronopic);
- image_mode_multi_chronopic.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell.png");
image_jump_reactive_bell.Pixbuf = pixbuf;
@@ -4897,12 +4927,18 @@ Console.WriteLine("X");
notebook_options.NextPage();
while(notebook_options.CurrentPage > desiredPage)
notebook_options.PrevPage();
+
+ //change test image according to notebook_execute
+ if(notebook_execute.CurrentPage == 0)
+ changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
+ else if(notebook_execute.CurrentPage == 1)
+ changeTestImage(EventType.Types.JUMP.ToString(), currentJumpRjType.Name, currentJumpRjType.ImageFileName);
}
//changed by user clicking on notebook tabs
private void on_notebook_change_by_user (object o, SwitchPageArgs args) {
//show chronojump logo on down-left area
- changeTestImage("", "", "LOGO");
+ //changeTestImage("", "", "LOGO");
}
//help
@@ -5056,7 +5092,7 @@ Console.WriteLine("X");
menuSessionSensitive(true);
menuToolsSensitive(true);
- changeTestImage("", "", "LOGO");
+ //changeTestImage("", "", "LOGO");
}
//only called by delete person functions (if we run out of persons)
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 19e1029..a6435f6 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -827,6 +827,12 @@ partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_radio_jump_takeoff;
[Widget] Gtk.RadioButton extra_window_radio_jump_more;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rj_j;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rj_t;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rj_unlimited;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rj_hexagon;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rj_more;
+
[Widget] Gtk.RadioButton extra_window_radio_jump_rj_j;
[Widget] Gtk.RadioButton extra_window_radio_jump_rj_t;
[Widget] Gtk.RadioButton extra_window_radio_jump_rj_unlimited;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
