[chronojump] persons window use video on all systems
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] persons window use video on all systems
- Date: Tue, 9 Apr 2019 13:48:11 +0000 (UTC)
commit af18fc927164ee5fe14503839ae5b5981a8df168
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Apr 9 15:35:50 2019 +0200
persons window use video on all systems
src/config.cs | 2 +-
src/gui/chronojump.cs | 6 ++++--
src/gui/encoder.cs | 6 +++---
src/gui/person.cs | 15 +++++++++------
4 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/src/config.cs b/src/config.cs
index 7cfd53e4..2a21936c 100644
--- a/src/config.cs
+++ b/src/config.cs
@@ -28,7 +28,7 @@ public class Config
public Preferences.MaximizedTypes Maximized;
public bool CustomButtons;
- public bool UseVideo;
+ //public bool UseVideo;
public bool OnlyEncoderGravitatory;
public bool OnlyEncoderInertial;
public bool EncoderCaptureShowOnlyBars;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index fd184a1a..507ef23b 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2703,7 +2703,8 @@ public partial class ChronoJumpWindow
{
personAddModifyWin = PersonAddModifyWindow.Show(app1,
currentSession, new Person(-1),
- preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo,
+ //preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo,
+ preferences.digitsNumber, checkbutton_video,
preferences.videoDevice
);
//-1 means we are adding a new person
@@ -2829,7 +2830,8 @@ public partial class ChronoJumpWindow
LogB.Information("modify person");
personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession, currentPerson,
- preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo,
+ //preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo,
+ preferences.digitsNumber, checkbutton_video,
preferences.videoDevice
);
personAddModifyWin.FakeButtonAccept.Clicked += new
EventHandler(on_edit_current_person_accepted);
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index ba37bc43..c7608345 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -5892,9 +5892,9 @@ public partial class ChronoJumpWindow
//image_encoder_width =
UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5;
//make graph half width of Chronojump window
//but if video is disabled, then make it wider because thegraph will be much
taller
- if(configChronojump.UseVideo)
- image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1) / 2);
- else
+ //if(configChronojump.UseVideo)
+ // image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1) / 2);
+ //else
image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1));
if(image_encoder_width < 100)
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 2480492d..3dc858db 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -889,7 +889,8 @@ public class PersonAddModifyWindow
//if we are adding a person, currentPerson.UniqueID it's -1
//if we are modifying a person, currentPerson.UniqueID is obviously it's ID
//showCapturePhoto is false on raspberry to not use camera
- PersonAddModifyWindow (Gtk.Window parent, Session currentSession, Person currentPerson, bool
showCapturePhoto)
+ //PersonAddModifyWindow (Gtk.Window parent, Session currentSession, Person currentPerson, bool
showCapturePhoto)
+ PersonAddModifyWindow (Gtk.Window parent, Session currentSession, Person currentPerson)
{
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_win.glade", "person_win",
null);
@@ -929,10 +930,10 @@ public class PersonAddModifyWindow
image_photo_preview.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_photo_preview.png");
image_photo_do.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_photo_do.png");
- if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX)
+ //if(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.LINUX)
hbox_camera.Visible = true;
- else
- hbox_camera.Visible = showCapturePhoto;
+ //else
+ // hbox_camera.Visible = showCapturePhoto;
//delete a -1.png or -1.jpg added before on a new user where "accept" button was not pressed
and window was closed
deleteOldPhotosIfAny(-1);
@@ -1221,11 +1222,13 @@ public class PersonAddModifyWindow
static public PersonAddModifyWindow Show (Gtk.Window parent,
Session mySession, Person currentPerson, int pDN,
- Gtk.CheckButton app1_checkbutton_video, bool showCapturePhoto,
+ //Gtk.CheckButton app1_checkbutton_video, bool showCapturePhoto,
+ Gtk.CheckButton app1_checkbutton_video,
string videoDevice)
{
if (PersonAddModifyWindowBox == null) {
- PersonAddModifyWindowBox = new PersonAddModifyWindow (parent, mySession,
currentPerson, showCapturePhoto);
+ //PersonAddModifyWindowBox = new PersonAddModifyWindow (parent, mySession,
currentPerson, showCapturePhoto);
+ PersonAddModifyWindowBox = new PersonAddModifyWindow (parent, mySession,
currentPerson);
}
PersonAddModifyWindowBox.pDN = pDN;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]