[chronojump] Capture person snapshot working
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Capture person snapshot working
- Date: Fri, 19 Apr 2013 17:26:44 +0000 (UTC)
commit 615081e956d82b9e7aadaffd003b52ecac13cadc
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 19 19:26:15 2013 +0200
Capture person snapshot working
glade/chronojump.glade | 24 +++++++++++++++++++++++-
src/gui/chronojump.cs | 9 +++++----
src/gui/person.cs | 25 ++++++++++++++++---------
3 files changed, 44 insertions(+), 14 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 376c1ab..2b38ad2 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12749,6 +12749,17 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
+ <widget class="GtkVSeparator" id="vseparator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox85">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12803,6 +12814,17 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
+ <widget class="GtkVSeparator" id="vseparator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton"
id="button_encoder_delete_signal">
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -12823,7 +12845,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 88063d7..4c0b2f6 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2357,7 +2357,7 @@ public partial class ChronoJumpWindow
private void on_recuperate_person_clicked (object o, EventArgs args) {
Log.WriteLine("recuperate person");
- personRecuperateWin = PersonRecuperateWindow.Show(app1, currentSession, prefsDigitsNumber);
+ personRecuperateWin = PersonRecuperateWindow.Show(app1, currentSession, prefsDigitsNumber,
checkbutton_video);
personRecuperateWin.FakeButtonDone.Clicked += new EventHandler(on_recuperate_person_accepted);
}
@@ -2380,7 +2380,7 @@ public partial class ChronoJumpWindow
private void on_recuperate_persons_from_session_clicked (object o, EventArgs args) {
Log.WriteLine("recuperate persons from other session");
- personsRecuperateFromOtherSessionWin = PersonsRecuperateFromOtherSessionWindow.Show(app1,
currentSession);
+ personsRecuperateFromOtherSessionWin = PersonsRecuperateFromOtherSessionWindow.Show(app1,
currentSession, checkbutton_video);
personsRecuperateFromOtherSessionWin.FakeButtonDone.Clicked += new
EventHandler(on_recuperate_persons_from_session_accepted);
}
@@ -2404,7 +2404,7 @@ public partial class ChronoJumpWindow
private void on_person_add_single_activate (object o, EventArgs args) {
personAddModifyWin = PersonAddModifyWindow.Show(app1,
currentSession, new Person(-1),
- prefsDigitsNumber, false); //don't comes from recuperate window
+ prefsDigitsNumber, checkbutton_video, false); //don't comes from recuperate
window
//-1 means we are adding a new person
//if we were modifying it will be it's uniqueID
@@ -2496,9 +2496,10 @@ public partial class ChronoJumpWindow
private void on_edit_current_person_clicked (object o, EventArgs args) {
Log.WriteLine("modify person");
+
//personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession,
currentPerson.UniqueID, prefsDigitsNumber);
personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession, currentPerson,
- prefsDigitsNumber, false); //don't comes from recuperate window
+ prefsDigitsNumber, checkbutton_video, false); //don't comes from recuperate
window
personAddModifyWin.FakeButtonAccept.Clicked += new
EventHandler(on_edit_current_person_accepted);
}
diff --git a/src/gui/person.cs b/src/gui/person.cs
index d13050e..5469977 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -61,6 +61,7 @@ public class PersonRecuperateWindow {
protected int columnId = 0;
protected int firstColumn = 0;
protected int pDN;
+ protected Gtk.CheckButton app1_checkbutton_video;
public Gtk.Button fakeButtonDone;
@@ -97,12 +98,14 @@ public class PersonRecuperateWindow {
treeview_person_recuperate.Selection.Changed += onSelectionEntry;
}
- static public PersonRecuperateWindow Show (Gtk.Window parent, Session currentSession, int pDN)
+ static public PersonRecuperateWindow Show (Gtk.Window parent, Session currentSession,
+ int pDN, Gtk.CheckButton app1_checkbutton_video)
{
if (PersonRecuperateWindowBox == null) {
PersonRecuperateWindowBox = new PersonRecuperateWindow (parent, currentSession);
}
PersonRecuperateWindowBox.pDN = pDN;
+ PersonRecuperateWindowBox.app1_checkbutton_video = app1_checkbutton_video;
PersonRecuperateWindowBox.person_recuperate.Show ();
@@ -250,7 +253,7 @@ public class PersonRecuperateWindow {
Person person = SqlitePerson.Select(Convert.ToInt32(selected));
personAddModifyWin = PersonAddModifyWindow.Show(
- parent, currentSession, person, pDN, true); //comes from recuperate
window
+ parent, currentSession, person, pDN, app1_checkbutton_video, true);
//comes from recuperate window
personAddModifyWin.FakeButtonAccept.Clicked += new
EventHandler(on_edit_current_person_accepted);
}
}
@@ -364,12 +367,14 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
treeview_person_recuperate.Selection.Changed += onSelectionEntry;
}
- static public new PersonsRecuperateFromOtherSessionWindow Show (Gtk.Window parent, Session
currentSession)
+ static public new PersonsRecuperateFromOtherSessionWindow Show (
+ Gtk.Window parent, Session currentSession, Gtk.CheckButton app1_checkbutton_video)
{
if (PersonsRecuperateFromOtherSessionWindowBox == null) {
PersonsRecuperateFromOtherSessionWindowBox =
new PersonsRecuperateFromOtherSessionWindow (parent, currentSession);
}
+ PersonsRecuperateFromOtherSessionWindowBox.app1_checkbutton_video = app1_checkbutton_video;
PersonsRecuperateFromOtherSessionWindowBox.person_recuperate.Show ();
return PersonsRecuperateFromOtherSessionWindowBox;
@@ -571,7 +576,7 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
Person person = SqlitePerson.Select(
Convert.ToInt32(treeview_person_recuperate.Model.GetValue(iter, 1)) );
personAddModifyWin = PersonAddModifyWindow.Show(
- parent, currentSession, person, pDN, true); //comes
from recuperate window
+ parent, currentSession, person, pDN,
app1_checkbutton_video, true); //comes from recuperate window
PersonAddModifyWindow.MakeVisible();
personAddModifyWin.FakeButtonAccept.Clicked += new
EventHandler(on_edit_current_person_accepted);
personAddModifyWin.FakeButtonCancel.Clicked += new
EventHandler(on_edit_current_person_cancelled);
@@ -895,6 +900,7 @@ public class PersonAddModifyWindow
private string sex = Constants.M;
private double weightIni;
int pDN;
+ Gtk.CheckButton app1_checkbutton_video;
private int serverUniqueID;
@@ -983,10 +989,9 @@ public class PersonAddModifyWindow
CapturerBin capturer;
void on_button_take_photo_clicked (object o, EventArgs args)
{
+ //deactivate camera to allow camera on edit person. videoOn will have same value to light
checkbutton again later
+ app1_checkbutton_video.Active = false;
- new DialogMessage(Constants.MessageTypes.INFO,
- Catalog.GetString("Sorry, photos are disabled on this version."));
- /*
capturer = new CapturerBin();
CapturePropertiesStruct s = new CapturePropertiesStruct();
@@ -1009,7 +1014,6 @@ public class PersonAddModifyWindow
capturerWindow.Present();
capturerWindow.DeleteEvent += delegate(object sender, DeleteEventArgs e) {capturer.Close();
capturer.Dispose(); person_win.Show(); };
capturer.Run();
- */
}
private void on_snapshot_done(Pixbuf pixbuf) {
@@ -1125,7 +1129,9 @@ public class PersonAddModifyWindow
}
static public PersonAddModifyWindow Show (Gtk.Window parent,
- Session mySession, Person currentPerson, int pDN, bool comesFromRecuperateWin)
+ Session mySession, Person currentPerson, int pDN,
+ Gtk.CheckButton app1_checkbutton_video,
+ bool comesFromRecuperateWin)
{
if (comesFromRecuperateWin)
PersonAddModifyWindowBox = null;
@@ -1135,6 +1141,7 @@ public class PersonAddModifyWindow
}
PersonAddModifyWindowBox.pDN = pDN;
+ PersonAddModifyWindowBox.app1_checkbutton_video = app1_checkbutton_video;
PersonAddModifyWindowBox.comesFromRecuperateWin = comesFromRecuperateWin;
//No more hide cancel button.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
