commit 746fcc8122a22c997fa5d4d08cf52a018a33cee0
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Aug 2 21:44:20 2015 +0200
Better bigger Buttons config
glade/chronojump.glade | 94 ++++++++++++++++++++++++++++++++++++-----------
src/gui/networks.cs | 11 ++++++
2 files changed, 83 insertions(+), 22 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 79922e5..bda9bd5 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7669,6 +7669,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9092,6 +9095,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10156,6 +10162,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -14738,10 +14747,6 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
<widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14828,7 +14833,7 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_1">
- <property name="label">-1</property>
+ <property name="label"> -1 </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -14866,7 +14871,7 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_1">
- <property name="label">+1</property>
+ <property name="label"> +1 </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -14908,13 +14913,6 @@ on current Chronojump version.</property>
<property name="position">0</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="hbox45">
<property name="visible">True</property>
@@ -15019,8 +15017,8 @@ on current Chronojump version.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -15354,7 +15352,7 @@ on current Chronojump version.</property>
<property name="spacing">8</property>
<child>
<widget class="GtkButton"
id="button_encoder_recalculate">
- <property name="width_request">50</property>
+ <property name="width_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -15380,7 +15378,7 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_load_signal">
- <property name="width_request">50</property>
+ <property name="width_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -15423,6 +15421,7 @@ on current Chronojump version.</property>
<property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_encoder_capture_options">
+ <property name="width_request">30</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -15448,6 +15447,7 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_bells">
+ <property name="width_request">30</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -15479,7 +15479,6 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_delete_signal">
- <property name="width_request">50</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -16562,7 +16561,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox73">
+ <widget class="GtkHBox"
id="hbox_encoder_analyze_signal_or_curves">
<property name="height_request">30</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -21843,6 +21842,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22806,6 +22808,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24261,6 +24266,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>
@@ -24773,6 +24781,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36453,6 +36464,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>
@@ -38268,6 +38297,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>
@@ -39605,9 +39646,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>
@@ -40570,6 +40608,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>
@@ -44320,6 +44361,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>
@@ -44947,6 +44991,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -45589,6 +45636,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/networks.cs b/src/gui/networks.cs
index 07e35d9..b2c1376 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -30,6 +30,9 @@ using System.Collections.Generic; //List
public partial class ChronoJumpWindow
{
+ //custom buttons
+ [Widget] Gtk.HBox hbox_encoder_analyze_signal_or_curves;
+
//RFID
[Widget] Gtk.Box hbox_rfid;
[Widget] Gtk.Label label_rfid;
@@ -79,6 +82,9 @@ public partial class ChronoJumpWindow
if(config.Maximized)
app1.Maximize();
if(config.CustomButtons) {
+
+ //---- capture tab ----
+
hbox_encoder_capture_extra_mass_no_raspberry.Visible = false;
hbox_encoder_capture_extra_mass_raspberry.Visible = true;
@@ -90,6 +96,11 @@ public partial class ChronoJumpWindow
spin_encoder_im_weights_n.Visible = false;
hbox_encoder_im_weights_n.Visible = true;
+
+ //---- analyze tab ----
+
+ hbox_encoder_analyze_signal_or_curves.HeightRequest = 40;
+ button_encoder_analyze.SetSizeRequest(120,40);
}
if(! config.UseVideo) {
useVideo = false;