commit cf792b5778d1ebc2a260d8d72b2437db420e47b2
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 17 18:05:04 2022 +0200
ScrolledWin for Discover devices if needed
glade/app1.glade | 54 +++++++++++++++++++++++++++++++++-------------
src/gui/app1/chronojump.cs | 9 +++++---
2 files changed, 45 insertions(+), 18 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e2cf36f44..397bdfcc3 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -26575,6 +26575,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32983,6 +32986,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -33019,18 +33034,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -42365,6 +42368,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50285,7 +50291,7 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<widget class="GtkFrame" id="frame_micro_discover">
<property name="width_request">450</property>
- <property name="height_request">250</property>
+ <property name="height_request">350</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -50344,6 +50350,17 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
</packing>
</child>
<child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow29">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">never</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkViewport" id="viewport28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <child>
<widget class="GtkTable"
id="table_micro_discover">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -50358,10 +50375,17 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </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="position">1</property>
</packing>
</child>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 9a4f92dcc..4a2a7e38e 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4579,18 +4579,21 @@ public partial class ChronoJumpWindow
{
//Gtk.Label l = new Gtk.Label(connected_l[i].ToStringSepBy("\n"));
Gtk.Label l = new Gtk.Label(string.Format("{0}\n{1}", connected_l[i].Port,
connected_l[i].SerialNumber));
- table_micro_discover.Attach (l, (uint) 0, (uint) 1, (uint) i, (uint) i+1); //left,
right, top, bottom
+ table_micro_discover.Attach (l, (uint) 0, (uint) 1, (uint) i, (uint) i+1, //left,
right, top, bottom
+ AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
Gtk.ProgressBar pb = new Gtk.ProgressBar();
pb.Text = "----"; //to have height
pb.SetSizeRequest(125, -1);
progressbar_micro_discover_l.Add (pb);
- table_micro_discover.Attach (pb, (uint) 1, (uint) 2, (uint) i, (uint) i+1);
+ table_micro_discover.Attach (pb, (uint) 1, (uint) 2, (uint) i, (uint) i+1,
+ AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
Gtk.Button b = new Gtk.Button("Use this");
b.Sensitive = false;
button_micro_discover_l.Add (b);
- table_micro_discover.Attach (b, (uint) 2, (uint) 3, (uint) i, (uint) i+1);
+ table_micro_discover.Attach (b, (uint) 2, (uint) 3, (uint) i, (uint) i+1,
+ AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
}
table_micro_discover.ShowAll();
}