commit 94dfaaf7fb6221b61067be3bb83843688b7d3630
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Feb 19 16:59:07 2013 +0100
capture help en both methods
glade/chronojump.glade | 97 +++++++++++++++++++++++------------------------
src/gui/encoder.cs | 27 +++++++++++++
2 files changed, 74 insertions(+), 50 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 61c8577..ae1200f 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12450,12 +12450,12 @@ on current Chronojump version.</property>
<widget class="GtkHBox" id="hbox76">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkHBox" id="hbox77">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_encoder_bells">
<property name="visible">True</property>
@@ -12512,6 +12512,18 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label113">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Capture:</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton"
id="button_encoder_capture">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -12522,41 +12534,17 @@ on current Chronojump version.</property>
<property name="xalign">0</property>
<signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox83">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-apply</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="label93">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Capture from encoder</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label">External</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -12570,48 +12558,57 @@ on current Chronojump version.</property>
<property name="xalign">0</property>
<signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox74">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkLabel" id="label111">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-apply</property>
+ <property name="label">Safe</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label111">
+ <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="label">Capture safe</property>
+ <property name="stock">gtk-help</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</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">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12636,7 +12633,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -12691,7 +12688,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">3</property>
</packing>
</child>
<child>
@@ -12744,7 +12741,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -12804,7 +12801,7 @@ on current Chronojump version.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 3025c53..8338305 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -246,6 +246,33 @@ 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 realtime graphs and lots of features\n" +
+ " Disavantages: 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" +
+ " Disavantages: Currently It doesn't plot graphs or calculates power at
realtime\n\n" +
+ "Conclusion: In next versions 'Safe' mode will be the only one\n" +
+ "Now it lacks features like realtime 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 no calcula estadíticos ni pinta gráficos en
tiempo real\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)
{