[chronojump] Fixed top button person change for contacts
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed top button person change for contacts
- Date: Sat, 15 Apr 2017 21:07:22 +0000 (UTC)
commit 01e33c323a9ed5bb673e879e3911f13b7ca7c79c
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Apr 15 23:07:01 2017 +0200
Fixed top button person change for contacts
glade/app1.glade | 11 +++++++++--
src/gui/chronojump.cs | 25 +++++++++++++++----------
src/gui/networks.cs | 1 +
3 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 78fef67..fed3764 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1140,6 +1140,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>
@@ -3018,13 +3021,14 @@ Carles</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_person_change1">
+ <widget class="GtkButton"
id="button_contacts_person_change">
<property name="width_request">80</property>
<property name="height_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Person</property>
+ <signal name="clicked"
handler="on_button_top_person_change_clicked" swapped="no"/>
<child>
<widget class="GtkImage" id="image_person1">
<property name="visible">True</property>
@@ -14243,7 +14247,7 @@ Concentric</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Person</property>
- <signal name="clicked"
handler="on_button_encoder_person_change_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_top_person_change_clicked" swapped="no"/>
<child>
<widget class="GtkImage" id="image_person">
<property name="visible">True</property>
@@ -20110,6 +20114,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 7609085..4d122a1 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2622,31 +2622,31 @@ public partial class ChronoJumpWindow
}
}
- private void on_button_encoder_person_change_clicked (object o, EventArgs args)
+ private void on_button_top_person_change_clicked (object o, EventArgs args)
{
ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
personSelectWin = PersonSelectWindow.Show(app1, myPersons);
- personSelectWin.FakeButtonAddPerson.Clicked += new
EventHandler(on_button_encoder_person_add_person);
- personSelectWin.FakeButtonEditPerson.Clicked += new
EventHandler(on_button_encoder_person_edit_person);
- personSelectWin.FakeButtonDeletePerson.Clicked += new
EventHandler(on_button_encoder_person_delete_person);
- personSelectWin.FakeButtonDone.Clicked += new
EventHandler(on_button_encoder_person_change_done);
+ personSelectWin.FakeButtonAddPerson.Clicked += new
EventHandler(on_button_top_person_add_person);
+ personSelectWin.FakeButtonEditPerson.Clicked += new
EventHandler(on_button_top_person_edit_person);
+ personSelectWin.FakeButtonDeletePerson.Clicked += new
EventHandler(on_button_top_person_delete_person);
+ personSelectWin.FakeButtonDone.Clicked += new EventHandler(on_button_top_person_change_done);
}
- private void on_button_encoder_person_add_person(object o, EventArgs args)
+ private void on_button_top_person_add_person(object o, EventArgs args)
{
person_add_single_called_from_person_select_window = true;
person_add_single();
}
- private void on_button_encoder_person_edit_person(object o, EventArgs args)
+ private void on_button_top_person_edit_person(object o, EventArgs args)
{
currentPerson = personSelectWin.SelectedPerson;
person_edit_single_called_from_person_select_window = true;
person_edit_single();
}
- private void on_button_encoder_person_delete_person(object o, EventArgs args)
+ private void on_button_top_person_delete_person(object o, EventArgs args)
{
currentPerson = personSelectWin.SelectedPerson;
@@ -2659,7 +2659,7 @@ public partial class ChronoJumpWindow
personSelectWin.Update(myPersons);
personSelectWin.Button_delete_confirm_focus(false, false);
}
- private void on_button_encoder_person_change_done(object o, EventArgs args)
+ private void on_button_top_person_change_done(object o, EventArgs args)
{
currentPerson = personSelectWin.SelectedPerson;
currentPersonSession = SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
@@ -2883,7 +2883,8 @@ public partial class ChronoJumpWindow
* interface has to change to YESPERSON (meaning no_signal).
* But, if there's no person shoud continue on NOPERSON
*/
- if(selectRowTreeView_persons(treeview_persons, 0))
+ if(currentPerson != null &&
+ selectRowTreeView_persons(treeview_persons,
myTreeViewPersons.FindRow(currentPerson.UniqueID)))
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
blankEncoderInterface();
@@ -6523,6 +6524,7 @@ LogB.Debug("X");
button_edit_current_person.Sensitive = false;
button_delete_current_person.Sensitive = false;
+ button_contacts_person_change.Sensitive = false;
button_encoder_person_change.Sensitive = false;
//notebooks
@@ -6553,6 +6555,7 @@ LogB.Debug("X");
button_person_add_single.Sensitive = true;
button_person_add_multiple.Sensitive = true;
+ button_contacts_person_change.Sensitive = true;
button_encoder_person_change.Sensitive = true;
menuSessionSensitive(true);
@@ -6652,6 +6655,7 @@ LogB.Debug("X");
button_execute_test.Sensitive = false;
+ button_contacts_person_change.Sensitive = false;
button_encoder_person_change.Sensitive = false;
encoderButtonsSensitive(encoderSensEnum.PROCESSINGR);
@@ -6709,6 +6713,7 @@ LogB.Debug("X");
button_execute_test.Sensitive = true;
+ button_contacts_person_change.Sensitive = true;
button_encoder_person_change.Sensitive = true;
if(encoderCaptureCurves != null && encoderCaptureCurves.Count > 0)
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 99fd990..a9b6145 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -54,6 +54,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_top_person_encoder;
[Widget] Gtk.Label label_top_person_name;
[Widget] Gtk.Label label_top_encoder_person_name;
+ [Widget] Gtk.Button button_contacts_person_change;
[Widget] Gtk.Button button_encoder_person_change;
//config.EncoderCaptureShowOnlyBars
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]