[chronojump] Copied to contacts encoder top right buttons: (rfid, home, preferences, quit)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Copied to contacts encoder top right buttons: (rfid, home, preferences, quit)
- Date: Mon, 8 May 2017 18:59:20 +0000 (UTC)
commit 54a1872ac2a46fcf0ee77bd5b1e10b401965a4d7
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 8 20:58:17 2017 +0200
Copied to contacts encoder top right buttons: (rfid, home, preferences, quit)
glade/app1.glade | 226 ++++++++++++++++++++++----------------------
src/gui/chronojump.cs | 22 +----
src/gui/chronojumpIcons.cs | 8 +-
src/gui/encoder.cs | 3 -
src/gui/networks.cs | 15 ++-
5 files changed, 131 insertions(+), 143 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 0219f60..192b11b 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1242,6 +1242,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3113,6 +3116,17 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label_rfid_contacts">
+ <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">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -3120,6 +3134,95 @@ EncoderInertialCapture</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_menu_and_preferences_outside_menu_contacts">
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton" id="button_menu_outside_menu1">
+ <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">Main
menu</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_home1">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_preferences_not_menu1">
+ <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="image_settings1">
+ <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_preferences_not_menu_quit1">
+ <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">Quit</property>
+ <property name="relief">half</property>
+ <signal name="clicked" handler="on_quit1_activate"
swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_quit1">
+ <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">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -14407,7 +14510,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_rfid">
+ <widget class="GtkLabel" id="label_rfid_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
@@ -14425,119 +14528,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_menu_and_preferences_outside_menu">
+ <widget class="GtkHBox"
id="hbox_menu_and_preferences_outside_menu_encoder">
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox73">
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_gravitatory_not_menu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Gravitatory</property>
- <property name="relief">none</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_button_selector_start_encoder_gravitatory_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox121">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <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>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_gravitatory">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Gravitatory</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_inertial_not_menu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Inertial</property>
- <property name="relief">none</property>
- <property name="draw_indicator">False</property>
- <property
name="group">radiobutton_gravitatory_not_menu</property>
- <signal name="toggled"
handler="on_button_selector_start_encoder_inertial_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox123">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <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>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_inertial">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Inertial</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</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="visible">True</property>
@@ -14547,7 +14541,6 @@ Concentric</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="image_home">
@@ -14561,7 +14554,7 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -14587,7 +14580,7 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -14612,7 +14605,7 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -20280,6 +20273,9 @@ then click this button.</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 2ca1dbc..6481d63 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -104,8 +104,6 @@ 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;
@@ -2950,13 +2948,6 @@ public partial class ChronoJumpWindow
//hbox_encoder_capture_1_or_cont.Visible = true;
vbox_angle_now.Visible = false;
- if(! radiobutton_gravitatory_not_menu.Active)
- {
- radiobutton_dont_follow_signals = true;
- radiobutton_gravitatory_not_menu.Active = true;
- radiobutton_dont_follow_signals = false;
- }
-
notebook_encoder_top.Page = 0;
} else {
menuitem_mode_selected_power_inertial.Visible = true;
@@ -2989,13 +2980,6 @@ public partial class ChronoJumpWindow
//hbox_encoder_capture_1_or_cont.Visible = false;
vbox_angle_now.Visible = true;
- if(! radiobutton_inertial_not_menu.Active)
- {
- radiobutton_dont_follow_signals = true;
- radiobutton_inertial_not_menu.Active = true;
- radiobutton_dont_follow_signals = false;
- }
-
notebook_encoder_top.Page = 1;
}
encoderGuiChangesAfterEncoderConfigurationWin(true);
@@ -6662,7 +6646,8 @@ LogB.Debug("X");
{
session_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
- hbox_menu_and_preferences_outside_menu.Sensitive = false;
+ hbox_menu_and_preferences_outside_menu_contacts.Sensitive = false;
+ hbox_menu_and_preferences_outside_menu_encoder.Sensitive = false;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
@@ -6721,7 +6706,8 @@ LogB.Debug("X");
session_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
- hbox_menu_and_preferences_outside_menu.Sensitive = true;
+ hbox_menu_and_preferences_outside_menu_contacts.Sensitive = true;
+ hbox_menu_and_preferences_outside_menu_encoder.Sensitive = true;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index ace0d3a..f9c4452 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -28,8 +28,11 @@ public partial class ChronoJumpWindow
{
[Widget] Gtk.Image image_mode_main_menu;
[Widget] Gtk.Image image_home;
+ [Widget] Gtk.Image image_home1;
[Widget] Gtk.Image image_settings;
+ [Widget] Gtk.Image image_settings1;
[Widget] Gtk.Image image_quit;
+ [Widget] Gtk.Image image_quit1;
[Widget] Gtk.Image image_session_new;
[Widget] Gtk.Image image_session_load;
[Widget] Gtk.Image image_mode_encoder_capture;
@@ -105,19 +108,20 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_home.png");
image_mode_main_menu.Pixbuf = pixbuf;
image_home.Pixbuf = pixbuf;
+ image_home1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_settings.png");
image_settings.Pixbuf = pixbuf;
+ image_settings1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_quit.png");
image_quit.Pixbuf = pixbuf;
+ image_quit1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
- image_gravitatory_not_menu.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia.png");
image_mode_encoder_inertial.Pixbuf = pixbuf;
- image_inertial_not_menu.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_capture.png");
image_tests_capture.Pixbuf = pixbuf;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 754044e..9568956 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -83,9 +83,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_inertial_calibrate;
[Widget] Gtk.Label label_wait;
- [Widget] Gtk.RadioButton radiobutton_gravitatory_not_menu;
- [Widget] Gtk.RadioButton radiobutton_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 8b01721..7ca780b 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -40,7 +40,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_encoder_capture_options;
//RFID
- [Widget] Gtk.Label label_rfid;
+ [Widget] Gtk.Label label_rfid_contacts;
+ [Widget] Gtk.Label label_rfid_encoder;
//better raspberry controls
[Widget] Gtk.Entry entry_raspberry_extra_weight;
@@ -61,7 +62,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_treeview_encoder_at_second_page;
//shown when menu is hidden
- [Widget] Gtk.HBox hbox_menu_and_preferences_outside_menu;
+ [Widget] Gtk.HBox hbox_menu_and_preferences_outside_menu_contacts;
+ [Widget] Gtk.HBox hbox_menu_and_preferences_outside_menu_encoder;
private enum linuxTypeEnum { NOTLINUX, LINUX, RASPBERRY, NETWORKS }
private bool encoderUpdateTreeViewWhileCapturing = true;
@@ -241,7 +243,8 @@ public partial class ChronoJumpWindow
{
//main_menu.Visible = false;
//app1.Decorated = false;
- hbox_menu_and_preferences_outside_menu.Visible = true;
+ hbox_menu_and_preferences_outside_menu_contacts.Visible = true;
+ hbox_menu_and_preferences_outside_menu_encoder.Visible = true;
if(configChronojump.SessionMode == Config.SessionModeEnum.UNIQUE)
{
@@ -321,7 +324,8 @@ public partial class ChronoJumpWindow
}
*/
- label_rfid.Visible = (UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX);
+ label_rfid_contacts.Visible = (UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX);
+ label_rfid_encoder.Visible = (UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX);
}
private bool pulseRFID ()
@@ -345,7 +349,8 @@ public partial class ChronoJumpWindow
updatingRFIDGuiStuff = true;
//TODO: this pulseRFID need only the GTK stuff, not the rest
- label_rfid.Text = capturedRFID; //GTK
+ label_rfid_contacts.Text = capturedRFID; //GTK
+ label_rfid_encoder.Text = capturedRFID; //GTK
Person p = SqlitePerson.SelectByRFID(capturedRFID);
if(p.UniqueID == -1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
