[chronojump] button_start_selector_back works ok
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] button_start_selector_back works ok
- Date: Fri, 30 Aug 2019 06:08:19 +0000 (UTC)
commit 33f31dbb5ffba4de0dc09a5d32dfb8a20ee19f2e
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Aug 30 07:18:09 2019 +0200
button_start_selector_back works ok
glade/app1.glade | 6 +++---
src/gui/chronojump.cs | 9 ++++++---
src/gui/chronojumpIcons.cs | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 66602395..c2eaf9dc 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -2750,11 +2750,11 @@
<property name="can_focus">False</property>
<property name="layout_style">center</property>
<child>
- <widget class="GtkButton" id="button_start_cancel">
+ <widget class="GtkButton" id="button_start_back">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_start_cancel_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_start_back_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
<child>
<widget class="GtkHBox" id="hbox38">
@@ -2762,7 +2762,7 @@
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkImage"
id="image_selector_start_cancel">
+ <widget class="GtkImage"
id="image_selector_start_back">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 18bd474e..ae32c7b2 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -71,7 +71,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_start; //start window or program
[Widget] Gtk.Notebook notebook_start_selector; //use to display the start images to select different
modes
- [Widget] Gtk.Notebook notebook_start_selector2; //for selection of jumps, runs, encoder
+ [Widget] Gtk.Notebook notebook_start_selector2; //for selection of jumps, runs, runs photocell,
encoder
[Widget] Gtk.Notebook notebook_sup;
[Widget] Gtk.HBox hbox_other;
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
@@ -3764,9 +3764,12 @@ public partial class ChronoJumpWindow
on_menuitem_mode_activate(menuitem_mode_other, new EventArgs());
}
- private void on_button_start_cancel_clicked(object o, EventArgs args)
+ private void on_button_start_back_clicked(object o, EventArgs args)
{
- notebook_start_selector.CurrentPage = 0;
+ if(notebook_start_selector2.CurrentPage == 2) //runs photocell
+ notebook_start_selector2.CurrentPage = 1; //runs
+ else
+ notebook_start_selector.CurrentPage = 0; //main
}
/*
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 66654fe8..243f7db4 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -84,7 +84,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_encoder;
[Widget] Gtk.Image image_selector_start_rt;
[Widget] Gtk.Image image_selector_start_other;
- [Widget] Gtk.Image image_selector_start_cancel;
+ [Widget] Gtk.Image image_selector_start_back;
[Widget] Gtk.Image image_menuitem_mode_jumps_simple;
[Widget] Gtk.Image image_menuitem_mode_jumps_reactive;
@@ -310,7 +310,7 @@ public partial class ChronoJumpWindow
image_tests_sprint.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
- image_selector_start_cancel.Pixbuf = pixbuf;
+ image_selector_start_back.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_pin.png");
image_manage_persons.Pixbuf = pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]