[chronojump] ctrl+v/d video play/delete. And force sensor save comment button done!
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] ctrl+v/d video play/delete. And force sensor save comment button done!
- Date: Wed, 18 Sep 2019 09:33:22 +0000 (UTC)
commit 0ba54a4ea58265b31f60545de74a0822956f4f8b
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Sep 18 11:31:23 2019 +0200
ctrl+v/d video play/delete. And force sensor save comment button done!
glade/app1.glade | 57 ++++++++++++++++++++++++++++++++++++++---------
src/forceSensor.cs | 5 +++++
src/gui/chronojump.cs | 6 ++---
src/gui/forceSensor.cs | 11 +++++++++
src/sqlite/forceSensor.cs | 12 ++++++++++
5 files changed, 77 insertions(+), 14 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 84c5d9c3..80be2221 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -9329,22 +9329,46 @@ Inverted values</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
+ <property
name="label_yalign">0.20000000298023224</property>
<property name="shadow_type">in</property>
<child>
+ <widget class="GtkHBox" id="hbox335">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
<widget class="GtkTextView"
id="textview_force_sensor_capture_comment">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</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="label384">
+ <widget class="GtkButton"
id="button_force_sensor_save_comment">
+ <property name="label" translatable="yes">Save
comment</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Comments</property>
- <property name="use_markup">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">2</property>
+ <signal name="clicked"
handler="on_button_force_sensor_save_comment_clicked" swapped="no"/>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
<property name="type">label_item</property>
</packing>
</child>
@@ -11512,9 +11536,9 @@ Inverted values</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
Video (v)</property>
+ <property name="tooltip" translatable="yes">Play
Video <Control>v</property>
<signal name="clicked"
handler="on_video_play_last_test_clicked" swapped="no"/>
- <accelerator key="v" signal="clicked"/>
+ <accelerator key="v" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_video_play_this_test">
<property name="visible">True</property>
@@ -11537,9 +11561,9 @@ Inverted values</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete last test (d)</property>
+ <property name="tooltip"
translatable="yes">Delete last test <Control>d</property>
<signal name="clicked"
handler="on_delete_last_test_clicked" swapped="no"/>
- <accelerator key="d" signal="clicked"/>
+ <accelerator key="d" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_delete_last_test">
<property name="visible">True</property>
@@ -11561,7 +11585,6 @@ Inverted values</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Inspect</property>
<signal name="clicked"
handler="on_button_inspect_last_test_clicked" swapped="no"/>
- <accelerator key="v" signal="clicked"/>
<child>
<widget class="GtkImage" id="image_test_inspect">
<property name="visible">True</property>
@@ -21936,6 +21959,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24024,9 +24053,9 @@ Concentric</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
Video (v)</property>
+ <property name="tooltip" translatable="yes">Play
Video <Control>v</property>
<signal name="clicked"
handler="on_button_video_play_this_test_encoder_clicked" swapped="no"/>
- <accelerator key="v" signal="clicked"/>
+ <accelerator key="v" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_video_play_this_test_encoder">
<property name="visible">True</property>
@@ -30821,6 +30850,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/forceSensor.cs b/src/forceSensor.cs
index b9b7fcb7..32973379 100644
--- a/src/forceSensor.cs
+++ b/src/forceSensor.cs
@@ -111,6 +111,11 @@ public class ForceSensor
"\" WHERE uniqueID = " + uniqueID;
}
+ public void UpdateSQLJustComments()
+ {
+ SqliteForceSensor.UpdateComments (false, comments); //SQL not opened
+ }
+
public string [] ToStringArray (int count)
{
int all = 8;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 3b6f363e..ec035295 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -6757,13 +6757,13 @@ LogB.Debug("mc finished 5");
"\n" + Catalog.GetString("Jumps") + "/" + Catalog.GetString("Races") + ". " +
Catalog.GetString("On capture tab:") + "\n" +
- "\t<tt><b>v</b></tt> " + Catalog.GetString("Play video of this test") + " " +
Catalog.GetString("(if available)")+ "\n" +
- "\t<tt><b>d</b></tt> " + Catalog.GetString("Delete this test") + "\n" +
+ "\t<tt><b>CTRL+v</b></tt> " + Catalog.GetString("Play video of this test") +
" " + Catalog.GetString("(if available)")+ "\n" +
+ "\t<tt><b>CTRL+d</b></tt> " + Catalog.GetString("Delete this test") + "\n" +
"\n" + Catalog.GetString("Jumps") + "/" + Catalog.GetString("Races") + ". " +
Catalog.GetString("On analyze tab:") + "\n" +
"\t<tt><b>z</b></tt> " + Catalog.GetString("Zoom change") + "\n" +
- "\t<tt><b>v</b></tt> " + Catalog.GetString("Play video of selected test") + "
" + Catalog.GetString("(if available)")+ "\n" +
+ "\t<tt><b>CTRL+v</b></tt> " + Catalog.GetString("Play video of selected
test") + " " + Catalog.GetString("(if available)")+ "\n" +
"\t<tt><b>e</b></tt> " + Catalog.GetString("Edit selected test") + "\n" +
"\t<tt><b>d</b></tt> " + Catalog.GetString("Delete selected test") + "\n" +
"\t<tt><b>r</b></tt> " + Catalog.GetString("Repair selected test") + " " +
Catalog.GetString("(if available)") + "\n" +
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 625b729f..fa76bff3 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -81,6 +81,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_force_sensor_tare;
[Widget] Gtk.Button button_force_sensor_calibrate;
[Widget] Gtk.Button button_force_sensor_capture_recalculate;
+ [Widget] Gtk.Button button_force_sensor_save_comment;
[Widget] Gtk.Label label_force_sensor_value_max;
[Widget] Gtk.Label label_force_sensor_value;
[Widget] Gtk.Label label_force_sensor_value_min;
@@ -423,6 +424,7 @@ public partial class ChronoJumpWindow
{
currentForceSensor = new ForceSensor();
button_force_sensor_capture_recalculate.Sensitive = false;
+ button_force_sensor_save_comment.Sensitive = false;
notebook_force_sensor_analyze.Sensitive = false;
button_force_sensor_analyze_analyze.Sensitive = false;
button_delete_last_test.Sensitive = false;
@@ -994,6 +996,7 @@ LogB.Information(" re C ");
forceSensorDoGraphAI();
}
button_force_sensor_capture_recalculate.Sensitive = true;
+ button_force_sensor_save_comment.Sensitive = true;
button_delete_last_test.Sensitive = true;
notebook_force_sensor_analyze.Sensitive = true;
@@ -1020,6 +1023,7 @@ LogB.Information(" re C ");
button_force_sensor_image_save_rfd_manual.Sensitive = false;
checkbutton_force_sensor_ai_b.Sensitive = false;
button_force_sensor_capture_recalculate.Sensitive = false;
+ button_force_sensor_save_comment.Sensitive = false;
button_delete_last_test.Sensitive = false;
}
else
@@ -1393,6 +1397,7 @@ LogB.Information(" re R ");
}
//event_execute_label_message.Text = "Loaded: " +
Util.GetLastPartOfPath(filechooser.Filename);
button_force_sensor_capture_recalculate.Sensitive = true;
+ button_force_sensor_save_comment.Sensitive = true;
notebook_force_sensor_analyze.Sensitive = true;
}
@@ -1547,6 +1552,12 @@ LogB.Information(" re R ");
currentForceSensor.UpdateSQL(false);
}
+ private void on_button_force_sensor_save_comment_clicked (object o, EventArgs args)
+ {
+ currentForceSensor.Comments =
UtilGtk.TextViewGetCommentValidSQL(textview_force_sensor_capture_comment);
+ currentForceSensor.UpdateSQLJustComments();
+ }
+
private void on_button_force_sensor_analyze_analyze_clicked (object o, EventArgs args)
{
if(! Util.FileExists(lastForceSensorFullPath))
diff --git a/src/sqlite/forceSensor.cs b/src/sqlite/forceSensor.cs
index cdfbfcd9..bd89b25c 100644
--- a/src/sqlite/forceSensor.cs
+++ b/src/sqlite/forceSensor.cs
@@ -91,6 +91,18 @@ class SqliteForceSensor : Sqlite
closeIfNeeded(dbconOpened);
}
+ public static void UpdateComments (bool dbconOpened, string comments)
+ {
+ openIfNeeded(dbconOpened);
+
+ dbcmd.CommandText = "UPDATE " + table + " SET comments = " + comments;
+
+ LogB.SQL(dbcmd.CommandText.ToString());
+ dbcmd.ExecuteNonQuery();
+
+ closeIfNeeded(dbconOpened);
+ }
+
/* right now unused
public static void DeleteSQLAndFile (bool dbconOpened, int uniqueID)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
