[chronojump] EncoderCaptureOptionsWin shows minHeight gravitatory/inertial
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] EncoderCaptureOptionsWin shows minHeight gravitatory/inertial
- Date: Fri, 27 May 2016 07:32:46 +0000 (UTC)
commit 5a67ed3834212aa24e7ecb3836226bf490d8da9d
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri May 27 09:21:42 2016 +0200
EncoderCaptureOptionsWin shows minHeight gravitatory/inertial
glade/chronojump.glade | 130 +++++++++++++++++++++++++++++-------------------
src/gui/encoder.cs | 20 ++++++--
2 files changed, 94 insertions(+), 56 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 34d9670..84f84e6 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -16548,6 +16548,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -21228,6 +21231,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22389,6 +22395,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24042,6 +24051,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24752,6 +24764,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -26720,18 +26735,6 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Minimal height</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox" id="hbox114">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -26897,20 +26900,27 @@ comments</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table1">
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Minimal height</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">16</property>
- <property name="row_spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox115">
- <property name="visible">True</property>
+ <widget class="GtkHBox" id="hbox_height_gravitatory">
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_min_height_not_inertial">
+ <widget class="GtkSpinButton" id="spin_encoder_capture_min_height_gravitatory">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -26949,13 +26959,13 @@ comments</property>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
+ <widget class="GtkHBox" id="hbox_height_inertial">
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
@@ -26998,30 +27008,9 @@ comments</property>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Not inertial</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Inertial</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -37685,6 +37674,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40292,6 +40299,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41556,9 +41575,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -42719,6 +42735,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -46766,6 +46785,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -47591,6 +47613,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48431,6 +48456,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index eb7813c..ff1ff54 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -534,7 +534,7 @@ public partial class ChronoJumpWindow
}
void on_button_encoder_capture_options_clicked (object o, EventArgs args) {
- encoderCaptureOptionsWin.View(repetitiveConditionsWin, preferences.volumeOn);
+ encoderCaptureOptionsWin.View(repetitiveConditionsWin, preferences.volumeOn,
currentEncoderGI);
}
private void on_encoder_capture_options_closed(object o, EventArgs args) {
@@ -5615,8 +5615,10 @@ public class EncoderCaptureOptionsWindow {
[Widget] public Gtk.RadioButton radiobutton_encoder_capture_external;
[Widget] public Gtk.SpinButton spin_encoder_capture_time;
[Widget] public Gtk.SpinButton spin_encoder_capture_inactivity_end_time;
+ [Widget] Gtk.HBox hbox_height_gravitatory;
+ [Widget] Gtk.HBox hbox_height_inertial;
+ [Widget] private Gtk.SpinButton spin_encoder_capture_min_height_gravitatory;
[Widget] private Gtk.SpinButton spin_encoder_capture_min_height_inertial;
- [Widget] private Gtk.SpinButton spin_encoder_capture_min_height_not_inertial;
[Widget] Gtk.Box hbox_combo_main_variable;
[Widget] Gtk.ComboBox combo_main_variable;
[Widget] public Gtk.CheckButton check_show_start_and_duration;
@@ -5653,13 +5655,21 @@ public class EncoderCaptureOptionsWindow {
return EncoderCaptureOptionsWindowBox;
}
- public void View (RepetitiveConditionsWindow repetitiveConditionsWin, bool volumeOn)
+ public void View (RepetitiveConditionsWindow repetitiveConditionsWin, bool volumeOn,
Constants.EncoderGI encoderGI)
{
if (EncoderCaptureOptionsWindowBox == null)
EncoderCaptureOptionsWindowBox = new EncoderCaptureOptionsWindow ();
EncoderCaptureOptionsWindowBox.repetitiveConditionsWin = repetitiveConditionsWin;
EncoderCaptureOptionsWindowBox.volumeOn = volumeOn;
+
+ if(encoderGI == Constants.EncoderGI.GRAVITATORY) {
+ hbox_height_gravitatory.Visible = true;
+ hbox_height_inertial.Visible = false;
+ } else {
+ hbox_height_gravitatory.Visible = false;
+ hbox_height_inertial.Visible = true;
+ }
//show window
EncoderCaptureOptionsWindowBox.encoder_capture_options.Show ();
@@ -5724,13 +5734,13 @@ public class EncoderCaptureOptionsWindow {
if(inertial)
return (int) spin_encoder_capture_min_height_inertial.Value;
else
- return (int) spin_encoder_capture_min_height_not_inertial.Value;
+ return (int) spin_encoder_capture_min_height_gravitatory.Value;
}
public void SetMinHeight (bool inertial, int height) {
if(inertial)
spin_encoder_capture_min_height_inertial.Value = height;
else
- spin_encoder_capture_min_height_not_inertial.Value = height;
+ spin_encoder_capture_min_height_gravitatory.Value = height;
}
private void on_button_inactivity_help_clicked (object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
