commit ab4b86553eb3d5da5be234be11aee7ad62ed53be
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Dec 11 17:22:15 2019 +0100
Better gui for pulses
glade/app1.glade | 78 +++++++++++++++++++++++++++------------------------
src/gui/app1/pulse.cs | 4 +--
2 files changed, 43 insertions(+), 39 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 0c06f1d7..0e336705 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -14748,17 +14748,17 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox27">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox163">
- <property name="height_request">32</property>
+ <widget class="GtkVBox"
id="vbox_extra_window_pulses">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
<child>
- <widget class="GtkHBox"
id="hbox_extra_window_pulses">
+ <widget class="GtkHBox" id="hbox163">
+ <property name="height_request">32</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
@@ -14827,6 +14827,32 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_fake_pulses">
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox188">
<property name="visible">True</property>
@@ -14843,15 +14869,15 @@ EncoderInertialCapture</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">60 0 1000 1 1
0</property>
+ <property name="adjustment">50 0 1000 1 1
0</property>
<property name="digits">2</property>
<property name="numeric">True</property>
<property
name="update_policy">if-valid</property>
<signal name="changed"
handler="on_extra_window_pulses_spinbutton_ppm_changed" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -14872,14 +14898,8 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -14897,7 +14917,8 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -14943,30 +14964,13 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_fake_pulses">
- <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">1</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
diff --git a/src/gui/app1/pulse.cs b/src/gui/app1/pulse.cs
index b55f119f..91680d0a 100644
--- a/src/gui/app1/pulse.cs
+++ b/src/gui/app1/pulse.cs
@@ -32,7 +32,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_radio_pulses_custom;
[Widget] Gtk.RadioButton extra_window_radio_pulses_free;
- [Widget] Gtk.HBox hbox_extra_window_pulses;
+ [Widget] Gtk.VBox vbox_extra_window_pulses;
[Widget] Gtk.SpinButton extra_window_pulses_spinbutton_pulse_step;
[Widget] Gtk.SpinButton extra_window_pulses_spinbutton_ppm;
[Widget] Gtk.SpinButton extra_window_pulses_spinbutton_total_pulses;
@@ -69,7 +69,7 @@ public partial class ChronoJumpWindow
}
private void extra_window_pulses_showNoOptions(bool hasOptions) {
- hbox_extra_window_pulses.Visible = hasOptions;
+ vbox_extra_window_pulses.Visible = hasOptions;
}