commit cf774dbaa5aa09987299cc289eae3f318cb7dbc0
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 20 21:07:50 2017 +0100
Gui should fit on a 480H window (using CustomButtons option)
glade/app1.glade | 208 +++++++++++---------------------------------
src/gui/chronojumpIcons.cs | 6 +-
src/gui/networks.cs | 15 +++-
3 files changed, 68 insertions(+), 161 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5a6e166..7f0185d 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7,6 +7,7 @@
<property name="can_focus">False</property>
<property name="title" translatable="yes">Chronojump</property>
<property name="default_width">800</property>
+ <property name="default_height">480</property>
<signal name="delete_event" handler="on_delete_event" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox69">
@@ -594,7 +595,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox75">
+ <widget class="GtkVBox" id="vbox_start_window_main">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
@@ -618,7 +619,7 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment19">
+ <widget class="GtkAlignment" id="alignment_start_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">8</property>
@@ -626,7 +627,7 @@
<property name="left_padding">16</property>
<property name="right_padding">16</property>
<child>
- <widget class="GtkVBox" id="vbox77">
+ <widget class="GtkVBox" id="vbox_start_window_sub">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
@@ -1656,114 +1657,6 @@ Carles</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox_start_test">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkAlignment" id="alignment_start_test_l">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button_start_test_l">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkImage" id="image19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment_start_test_m">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button_start_test_m">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkImage" id="image69">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment_start_test_r">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button_start_test_r">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkImage" id="image70">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <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">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox76">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button2">
- <property name="label">reset</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -15253,7 +15146,7 @@ Concentric</property>
<property name="position">200</property>
<child>
<widget class="GtkAlignment"
id="alignment_encoder_capture_curves_bars_drawingarea">
- <property name="height_request">170</property>
+ <property name="height_request">10</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
@@ -15421,7 +15314,6 @@ Concentric</property>
<child>
<widget class="GtkVBox"
id="vbox_treview_encoder_capture_curves">
<property name="width_request">200</property>
- <property name="height_request">145</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -15487,7 +15379,7 @@ Concentric</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkAlignment" id="alignment20">
+ <widget class="GtkAlignment"
id="alignment_encoder_capture_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">10</property>
@@ -15502,7 +15394,6 @@ Concentric</property>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">40</property>
<child>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
@@ -16298,40 +16189,6 @@ Concentric</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button_11">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Close</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_encoder_exercise_close_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
- <child>
- <widget class="GtkImage"
id="image_encoder_exercise_close">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </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>
@@ -16344,11 +16201,22 @@ Concentric</property>
</widget>
</child>
<child>
+ <widget class="GtkButton" id="button_11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Close</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_exercise_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
<widget class="GtkImage"
id="image_encoder_exercise1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ </child>
+ </widget>
<packing>
<property name="type">label_item</property>
</packing>
@@ -16397,12 +16265,21 @@ Concentric</property>
<property
name="stock">gtk-missing-image</property>
</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">1</property>
</packing>
</child>
<child>
+ <widget class="GtkHBox" id="hbox189">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox190">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
<widget class="GtkLabel" id="label136">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -16414,7 +16291,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -16439,7 +16316,21 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -16451,7 +16342,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -16616,7 +16507,6 @@ then click this button.</property>
<child>
<widget class="GtkAlignment"
id="alignment_video_encoder">
<property name="width_request">275</property>
- <property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
@@ -17002,7 +16892,6 @@ then click this button.</property>
</child>
<child>
<widget class="GtkAlignment" id="alignment21">
- <property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">4</property>
@@ -19644,6 +19533,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -19861,7 +19756,6 @@ then click this button.</property>
<child>
<widget class="GtkScrolledWindow"
id="scrolledwindow_encoder_analyze_curves">
<property name="width_request">200</property>
- <property name="height_request">175</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="hscrollbar_policy">automatic</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 07bffcb..232092e 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -53,7 +53,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_capture_execute;
[Widget] Gtk.Image image_encoder_exercise_add;
[Widget] Gtk.Image image_encoder_exercise_edit;
- [Widget] Gtk.Image image_encoder_exercise_close;
+ //[Widget] Gtk.Image image_encoder_exercise_close;
[Widget] Gtk.Image image_inertial_rolled;
[Widget] Gtk.Image image_inertial_extended;
@@ -135,8 +135,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_edit.png");
image_encoder_exercise_edit.Pixbuf = pixbuf;
image_edit_current_person.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
- image_encoder_exercise_close.Pixbuf = pixbuf;
+ //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
+ //image_encoder_exercise_close.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_up.png");
image_persons_up.Pixbuf = pixbuf;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 7805d2b..b65c83e 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -33,6 +33,10 @@ public partial class ChronoJumpWindow
{
//custom buttons
[Widget] Gtk.HBox hbox_encoder_analyze_signal_or_curves;
+ [Widget] Gtk.VBox vbox_start_window_main;
+ [Widget] Gtk.VBox vbox_start_window_sub;
+ [Widget] Gtk.Alignment alignment_start_window;
+ [Widget] Gtk.Alignment alignment_encoder_capture_options;
//RFID
[Widget] Gtk.HBox hbox_rfid;
@@ -78,7 +82,16 @@ public partial class ChronoJumpWindow
if(configChronojump.Maximized)
app1.Maximize();
- if(configChronojump.CustomButtons) {
+ if(configChronojump.CustomButtons)
+ {
+ //---- start window ----
+
+ vbox_start_window_main.Spacing = 0;
+ vbox_start_window_sub.Spacing = 0;
+ alignment_start_window.TopPadding = 0;
+ alignment_start_window.BottomPadding = 2;
+ alignment_encoder_capture_options.TopPadding = 0;
+ alignment_encoder_capture_options.BottomPadding = 0;
//---- capture tab ----