[chronojump] Buttons to change gravitatory <-> inetial on session UNIQUE
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Buttons to change gravitatory <-> inetial on session UNIQUE
- Date: Wed, 25 Jan 2017 17:03:45 +0000 (UTC)
commit 0128730f0e8c7519ed7116d09256934ba218360f
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jan 25 17:38:17 2017 +0100
Buttons to change gravitatory <-> inetial on session UNIQUE
glade/app1.glade | 140 ++++++++++++++++++++++++++++++++++++++++++++----
src/gui/chronojump.cs | 12 ++++
src/gui/encoder.cs | 5 ++
src/gui/networks.cs | 4 +-
4 files changed, 147 insertions(+), 14 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 00f46b3..0b81f2f 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -13582,22 +13582,135 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_preferences_not_menu">
- <property name="width_request">50</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Preferences</property>
- <property name="relief">half</property>
- <signal name="clicked" handler="on_preferences_activate"
swapped="no"/>
+ <widget class="GtkHBox"
id="hbox_menu_and_preferences_outside_menu">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image64">
+ <widget class="GtkHBox" id="hbox73">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-preferences</property>
- <property name="icon-size">2</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label_encoder_not_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_gravitatory_not_menu">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Gravitatory</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_selector_start_encoder_gravitatory_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_gravitatory_not_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </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_inertial_not_menu">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Inertial</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_selector_start_encoder_inertial_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_inertial_not_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_menu_outside_menu">
+ <property name="width_request">50</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Main
menu</property>
+ <property name="relief">half</property>
+ <signal name="activate"
handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ <signal name="clicked"
handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-home</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </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_preferences_not_menu">
+ <property name="width_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Preferences</property>
+ <property name="relief">half</property>
+ <signal name="clicked" handler="on_preferences_activate"
swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
<packing>
@@ -18510,6 +18623,9 @@ Concentric</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 7164337..c12e743 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -103,6 +103,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_mode_multi_chronopic_small;
[Widget] Gtk.Image image_mode_encoder_gravitatory;
[Widget] Gtk.Image image_mode_encoder_inertial;
+ [Widget] Gtk.Image image_gravitatory_not_menu;
+ [Widget] Gtk.Image image_inertial_not_menu;
[Widget] Gtk.Image image_persons_new_1;
[Widget] Gtk.Image image_persons_new_plus;
@@ -727,8 +729,10 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderGravitatory);
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
+ image_gravitatory_not_menu.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderInertial);
image_mode_encoder_inertial.Pixbuf = pixbuf;
+ image_inertial_not_menu.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
image_mode_reaction_times_small.Pixbuf = pixbuf;
@@ -3110,6 +3114,10 @@ public partial class ChronoJumpWindow
}
hbox_encoder_capture_1_or_cont.Visible = true;
hbox_encoder_inertial_calibrate.Visible = false;
+
+ label_encoder_not_menu.Text = Catalog.GetString("Gravitatory");
+ button_gravitatory_not_menu.Sensitive = false;
+ button_inertial_not_menu.Sensitive = true;
} else {
menuitem_mode_selected_power_inertial.Visible = true;
@@ -3133,6 +3141,10 @@ public partial class ChronoJumpWindow
radio_encoder_capture_1set.Active = true;
hbox_encoder_capture_1_or_cont.Visible = false;
hbox_encoder_inertial_calibrate.Visible = true;
+
+ label_encoder_not_menu.Text = Catalog.GetString("Inertial");
+ button_gravitatory_not_menu.Sensitive = true;
+ button_inertial_not_menu.Sensitive = false;
}
encoderGuiChangesAfterEncoderConfigurationWin(true);
if(changed) {
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 970550c..64bea58 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -67,6 +67,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton radio_encoder_capture_1set;
[Widget] Gtk.RadioButton radio_encoder_capture_cont;
[Widget] Gtk.Button button_encoder_capture;
+
+ [Widget] Gtk.Label label_encoder_not_menu;
+ [Widget] Gtk.Button button_gravitatory_not_menu;
+ [Widget] Gtk.Button button_inertial_not_menu;
+
[Widget] Gtk.Image image_encoder_bell;
[Widget] Gtk.Button button_encoder_capture_cancel;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 1a18514..ea6ea1e 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -55,7 +55,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_treeview_encoder_at_second_page;
//shown when menu is hidden
- [Widget] Gtk.Button button_preferences_not_menu;
+ [Widget] Gtk.HBox hbox_menu_and_preferences_outside_menu;
//variables used on gui/chronojump.cs
@@ -150,7 +150,7 @@ public partial class ChronoJumpWindow
{
sessionIsUnique = true;
main_menu.Visible = false;
- button_preferences_not_menu.Visible = true;
+ hbox_menu_and_preferences_outside_menu.Visible = true;
if(! Sqlite.Exists(false, Constants.SessionTable, "session")) {
//this creates the session and inserts at DB
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
