commit db139329fbd71cb119815fd26e6cf5e66fb14c39
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jun 3 09:52:28 2019 -0300
encoder button analyze mean/max with a label
glade/app1.glade | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/gui/encoder.cs | 6 ++++--
2 files changed, 63 insertions(+), 4 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b8063aae..23936f39 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1917,6 +1917,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -20904,6 +20907,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26205,10 +26211,15 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_mean">
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_mean">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip"
translatable="yes">Analyze mean values</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_mean">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
@@ -26219,15 +26230,58 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_max">
+ <widget class="GtkLabel"
id="label_encoder_analyze_mean_text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Mean
values</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_max">
<property name="can_focus">False</property>
<property name="tooltip"
translatable="yes">Analyze max values</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_max">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</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="label_encoder_analyze_max_text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Max
values</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -29557,6 +29611,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index b184cb9b..6dce7a20 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -268,6 +268,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_analyze_force;
[Widget] Gtk.Image image_encoder_analyze_power;
+ [Widget] Gtk.HBox hbox_encoder_analyze_mean;
+ [Widget] Gtk.HBox hbox_encoder_analyze_max;
[Widget] Gtk.Image image_encoder_analyze_mean;
[Widget] Gtk.Image image_encoder_analyze_max;
[Widget] Gtk.Image image_encoder_analyze_range;
@@ -3715,8 +3717,8 @@ public partial class ChronoJumpWindow
}
private void on_check_encoder_analyze_mean_or_max_toggled (object obj, EventArgs args) {
- image_encoder_analyze_mean.Visible = check_encoder_analyze_mean_or_max.Active;
- image_encoder_analyze_max.Visible = ! check_encoder_analyze_mean_or_max.Active;
+ hbox_encoder_analyze_mean.Visible = check_encoder_analyze_mean_or_max.Active;
+ hbox_encoder_analyze_max.Visible = ! check_encoder_analyze_mean_or_max.Active;
}