Skip to content

Commit 402a078

Browse files
shawnlaffanshawnlaffan
committed
GUI: add scrolled window parent to import parameters table
widget height is tracked under #777 Updates #770
1 parent f0d6876 commit 402a078

File tree

3 files changed

+36
-19
lines changed

3 files changed

+36
-19
lines changed

‎bin/ui/dlgImportParameters.ui

+26-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<interface>
3+
<!-- interface-requires gtk+ 3.0 -->
34
<object class="GtkDialog" id="dlgImportParameters">
5+
<property name="height_request">700</property>
46
<property name="can_focus">False</property>
57
<property name="border_width">5</property>
68
<property name="title" translatable="yes">Import options</property>
79
<property name="window_position">center-on-parent</property>
10+
<property name="destroy_with_parent">True</property>
811
<property name="type_hint">dialog</property>
912
<child internal-child="vbox">
10-
<object class="GtkVBox" id="import_parameters_vbox">
13+
<object class="GtkBox" id="import_parameters_vbox">
1114
<property name="visible">True</property>
1215
<property name="can_focus">False</property>
1316
<property name="spacing">2</property>
1417
<child internal-child="action_area">
15-
<object class="GtkHButtonBox" id="dialog-action_area17">
18+
<object class="GtkButtonBox" id="dialog-action_area17">
1619
<property name="visible">True</property>
1720
<property name="can_focus">False</property>
1821
<property name="layout_style">end</property>
@@ -106,14 +109,27 @@
106109
<property name="xalign">0</property>
107110
<property name="left_padding">12</property>
108111
<child>
109-
<object class="GtkTable" id="tableImportParameters">
112+
<object class="GtkScrolledWindow" id="scrolledwindow1">
110113
<property name="visible">True</property>
111-
<property name="can_focus">False</property>
112-
<property name="n_columns">2</property>
113-
<property name="column_spacing">3</property>
114-
<property name="row_spacing">3</property>
114+
<property name="can_focus">True</property>
115+
<property name="shadow_type">in</property>
115116
<child>
116-
<placeholder/>
117+
<object class="GtkTable" id="tableImportParameters">
118+
<property name="visible">True</property>
119+
<property name="can_focus">False</property>
120+
<property name="n_columns">2</property>
121+
<property name="column_spacing">2</property>
122+
<property name="row_spacing">2</property>
123+
<child>
124+
<placeholder/>
125+
</child>
126+
<child>
127+
<placeholder/>
128+
</child>
129+
<child>
130+
<placeholder/>
131+
</child>
132+
</object>
117133
</child>
118134
</object>
119135
</child>
@@ -129,7 +145,7 @@
129145
</child>
130146
</object>
131147
<packing>
132-
<property name="expand">False</property>
148+
<property name="expand">True</property>
133149
<property name="fill">True</property>
134150
<property name="position">2</property>
135151
</packing>

‎lib/Biodiverse/GUI/BasedataImport.pm

+7-7
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ sub show_expl_dialog {
11571157
#$scroll->set_policy('never', 'automatic');
11581158
#$dlg->vbox->pack_start($scroll, 1, 1, 5);
11591159

1160-
$dlg->vbox->pack_start( $table, 1, 1, 5 );
1160+
$dlg->get_content_area->pack_start( $table, 1, 1, 5 );
11611161

11621162
my $col = 0;
11631163

@@ -1580,16 +1580,16 @@ sub make_columns_dialog {
15801580
my $file_title = Gtk3::Label->new('<b>Files:</b>');
15811581
$file_title->set_use_markup(1);
15821582
$file_title->set_alignment( 0, 1 );
1583-
$dlg->vbox->pack_start( $file_title, 0, 0, 0 );
1583+
$dlg->get_content_area->pack_start( $file_title, 0, 0, 0 );
15841584

15851585
my $file_list_label = Gtk3::Label->new( $file_list . "\n\n" );
15861586
$file_list_label->set_alignment( 0, 1 );
1587-
$dlg->vbox->pack_start( $file_list_label, 0, 0, 0 );
1587+
$dlg->get_content_area->pack_start( $file_list_label, 0, 0, 0 );
15881588
}
15891589

15901590
my $label = Gtk3::Label->new('<b>Set column options</b>');
15911591
$label->set_use_markup(1);
1592-
$dlg->vbox->pack_start( $label, 0, 0, 0 );
1592+
$dlg->get_content_area->pack_start( $label, 0, 0, 0 );
15931593

15941594
# Make table
15951595
my $table = Gtk3::Table->new( $num_columns + 1, 8, 0 );
@@ -1600,7 +1600,7 @@ sub make_columns_dialog {
16001600
my $scroll = Gtk3::ScrolledWindow->new;
16011601
$scroll->add_with_viewport($table);
16021602
$scroll->set_policy( 'never', 'automatic' );
1603-
$dlg->vbox->pack_start( $scroll, 1, 1, 5 );
1603+
$dlg->get_content_area->pack_start( $scroll, 1, 1, 5 );
16041604

16051605
my $col = 0;
16061606

@@ -1983,7 +1983,7 @@ sub make_remap_columns_dialog {
19831983
);
19841984
my $label = Gtk3::Label->new("<b>Select column types</b>");
19851985
$label->set_use_markup(1);
1986-
$dlg->vbox->pack_start( $label, 0, 0, 0 );
1986+
$dlg->get_content_area->pack_start( $label, 0, 0, 0 );
19871987

19881988
# Make table
19891989
my $table = Gtk3::Table->new( $num_columns + 1, 8, 0 );
@@ -1994,7 +1994,7 @@ sub make_remap_columns_dialog {
19941994
my $scroll = Gtk3::ScrolledWindow->new;
19951995
$scroll->add_with_viewport($table);
19961996
$scroll->set_policy( 'never', 'automatic' );
1997-
$dlg->vbox->pack_start( $scroll, 1, 1, 5 );
1997+
$dlg->get_content_area->pack_start( $scroll, 1, 1, 5 );
19981998

19991999
my $col = 0;
20002000

‎lib/Biodiverse/GUI/ParametersTable.pm

+3-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ sub fill {
112112
#$label->set_text( $label_text );
113113

114114
my $fill_flags = 'fill';
115+
my $fill_flags = [qw/expand fill/];
115116
if ($param->{type} =~ 'text') {
116117
$fill_flags = ['expand', 'fill']
117118
}
@@ -156,8 +157,8 @@ sub fill {
156157
else {
157158
$rows++;
158159
$table->set('n-rows' => $rows);
159-
$table->attach($label, 0, 1, $rows, $rows + 1, 'fill', [], 0, 0);
160-
$table->attach($widget, 1, 2, $rows, $rows + 1, $fill_flags, [], 0, 0);
160+
$table->attach($label, 0, 1, $rows, $rows + 1, $fill_flags, [qw /shrink/], 0, 0);
161+
$table->attach($widget, 1, 2, $rows, $rows + 1, [qw/shrink fill/], [qw /shrink/], 0, 0);
161162
}
162163

163164
# Add a tooltip

0 commit comments

Comments
 (0)