[chronojump] Removed encoder capture help
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed encoder capture help
- Date: Fri, 19 Apr 2013 10:58:44 +0000 (UTC)
commit aa7e8767c7bd494065725ba6241483acccb1562b
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 19 12:58:24 2013 +0200
Removed encoder capture help
glade/chronojump.glade | 30 ++++--------------------------
src/encoder.cs | 4 ++--
src/gui/encoder.cs | 28 +---------------------------
src/sqlite/encoder.cs | 2 +-
4 files changed, 8 insertions(+), 56 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 9eba0e5..eeb3ce1 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12536,29 +12536,7 @@ on current Chronojump version.</property>
<widget class="GtkHBox" id="hbox77">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_capture_help">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_capture_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-help</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox75">
<property name="visible">True</property>
@@ -12582,7 +12560,7 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkRadioButton"
id="radiobutton_encoder_capture_external">
- <property name="label"
translatable="yes">Ext.</property>
+ <property name="label"
translatable="yes">External</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -12603,7 +12581,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -12627,7 +12605,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
diff --git a/src/encoder.cs b/src/encoder.cs
index 3c995c0..7cb39b6 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -252,8 +252,8 @@ public class EncoderSQL
public int minHeight;
public double smooth; //unused on curves, since 1.3.7 it's in database
public string description;
- public string future1;
- public string future2;
+ public string future1; //active or inactive curves
+ public string future2; //URL of video of signals
public string future3;
public string exerciseName;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c6227be..ebb2e1a 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -277,33 +277,6 @@ public partial class ChronoJumpWindow
encoderThreadStart(encoderModes.CALCULECURVES);
}
- void on_button_encoder_capture_help_clicked (object o, EventArgs args)
- {
- new DialogMessage(Constants.MessageTypes.INFO,
- "<b>ENGLISH:</b> Since version 1.3.4 there are two methods of capture:\n\n" +
- "- <b>External</b>: Capture happens in a new window\n" +
- " Advantages: Has real-time graphs and lots of features\n" +
- " Disadvantages: Open new window is slow and there are problems on some
computers\n\n" +
- "- <b>Safe</b>: Capture happens in this window\n" +
- " Advantages: Fast and without problems\n" +
- " Disadvantages: Currently at realtime only plots a simple graph\n\n" +
- "Conclusion: In next versions 'Safe' mode will be the only one\n" +
- "Now it lacks features like real-time statistics and graphs\n" +
- "<b>After</b> capturing, both methods show the same results" +
- "\n\n" +
- "<b>CASTELLANO:</b> A partir de la versión 1.3.4 hay dos métodos de
capturar:\n\n" +
- "- <b>External (externo)</b>: Se captura en una nueva ventana\n" +
- " Ventajas: Tiene gráficos en tiempo real y muchas posibilidades\n" +
- " Desventajas: Abrir una nueva ventana es lento y da problemas en algunos
equipos\n\n" +
- "- <b>Safe (seguro)</b>: Se captura en esta ventana\n" +
- " Ventajas: Rápido y no da problemas\n" +
- " Desventajas: Actualmente en tiempo real sólo muestra un gráfico
sencillo\n\n" +
- "Conclusión: En las siguientes versiones el modo 'Seguro' será el único\n" +
- "En este momento carece de las ventajas del modo externo\n" +
- "<b>Después</b> de la captura, ambos métodos muestran los mismos resultados"
- );
- }
-
void on_button_encoder_cancel_clicked (object o, EventArgs args)
{
encoderProcessCancel = true;
@@ -3116,6 +3089,7 @@ Log.WriteLine(str);
} else {
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Chronopic port is not configured."));
+ createChronopicWindow(true);
return;
}
} else if(mode == encoderModes.CALCULECURVES || mode == encoderModes.RECALCULATE_OR_LOAD) {
diff --git a/src/sqlite/encoder.cs b/src/sqlite/encoder.cs
index b2cb96b..adb0514 100644
--- a/src/sqlite/encoder.cs
+++ b/src/sqlite/encoder.cs
@@ -55,7 +55,7 @@ class SqliteEncoder : Sqlite
"smooth FLOAT, " + //unused. since 1.3.7 is on preferences
"description TEXT, " +
"future1 TEXT, " + //works as status: "active", "inactive"
- "future2 TEXT, " +
+ "future2 TEXT, " + //URL of video of signals
"future3 TEXT )";
dbcmd.ExecuteNonQuery();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
