[chronojump] RepetitiveConditions Win close (force) stores ok feedback on SQL
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] RepetitiveConditions Win close (force) stores ok feedback on SQL
- Date: Wed, 19 May 2021 14:19:14 +0000 (UTC)
commit 2f0d2e444b8b907caa9b08b1fbc21ed6258e93aa
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 19 16:18:51 2021 +0200
RepetitiveConditions Win close (force) stores ok feedback on SQL
glade/repetitive_conditions.glade | 2 +-
src/gui/app1/chronojump.cs | 6 ++----
src/gui/repetitiveConditions.cs | 11 +++++++++++
3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/glade/repetitive_conditions.glade b/glade/repetitive_conditions.glade
index d30ed20ad..07f3bb820 100644
--- a/glade/repetitive_conditions.glade
+++ b/glade/repetitive_conditions.glade
@@ -5150,7 +5150,7 @@
<widget class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Line width</property>
+ <property name="label" translatable="yes">Line
width</property>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 235bc0dbf..2fbd73a1f 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -7392,8 +7392,7 @@ LogB.Debug("mc finished 5");
else if(m == Constants.Menuitem_modes.FORCESENSOR)
{
// TODO: fix this with path
- /*
- bool feedbackActive = repetitiveConditionsWin.GetForceSensorFeedbackRectangleActive;
+ Preferences.ForceSensorCaptureFeedbackActiveEnum feedbackActive =
repetitiveConditionsWin.GetForceSensorFeedback;
if(preferences.forceSensorCaptureFeedbackActive != feedbackActive)
{
SqlitePreferences.Update(SqlitePreferences.ForceSensorCaptureFeedbackActive,
feedbackActive.ToString(), false);
@@ -7401,7 +7400,7 @@ LogB.Debug("mc finished 5");
}
//change the rest of values only if feedback is active
- if(feedbackActive)
+ if(feedbackActive == Preferences.ForceSensorCaptureFeedbackActiveEnum.RECTANGLE)
{
int feedbackAt = repetitiveConditionsWin.GetForceSensorFeedbackRectangleAt;
if(preferences.forceSensorCaptureFeedbackAt != feedbackAt)
@@ -7417,7 +7416,6 @@ LogB.Debug("mc finished 5");
preferences.forceSensorCaptureFeedbackRange = feedbackRange;
}
}
- */
}
}
diff --git a/src/gui/repetitiveConditions.cs b/src/gui/repetitiveConditions.cs
index 70c5555fd..b6aa021ae 100644
--- a/src/gui/repetitiveConditions.cs
+++ b/src/gui/repetitiveConditions.cs
@@ -975,6 +975,17 @@ public class RepetitiveConditionsWindow
notebook_force_sensor_feedback.Page = 2;
}
+ public Preferences.ForceSensorCaptureFeedbackActiveEnum GetForceSensorFeedback {
+ get {
+ if(radio_force_sensor_capture_feedback_show_rectangle.Active)
+ return Preferences.ForceSensorCaptureFeedbackActiveEnum.RECTANGLE;
+ else if(radio_force_sensor_capture_feedback_show_path.Active)
+ return Preferences.ForceSensorCaptureFeedbackActiveEnum.PATH;
+ else //if(radio_force_sensor_capture_feedback_no.Active)
+ return Preferences.ForceSensorCaptureFeedbackActiveEnum.NO;
+ }
+ }
+
//force sensor feedback rectangle
public bool GetForceSensorFeedbackRectangleActive {
get { return radio_force_sensor_capture_feedback_show_rectangle.Active; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]