From d1d847460df13e1ee97d755542874ba3ec8d5333 Mon Sep 17 00:00:00 2001 From: John Darrington <john@darrington.wattle.id.au> Date: Sat, 5 Dec 2015 12:38:59 +0100 Subject: [PATCH] Binomial Dialog: Remove deprecated widgets --- src/ui/gui/binomial.ui | 65 +++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/src/ui/gui/binomial.ui b/src/ui/gui/binomial.ui index 07abace813..80e2ed3a5e 100644 --- a/src/ui/gui/binomial.ui +++ b/src/ui/gui/binomial.ui @@ -15,34 +15,25 @@ <property name="modal">True</property> <property name="help_page">NPAR-TESTS#BINOMIAL</property> <child> - <object class="GtkHBox" id="dialog-hbox13"> + <object class="GtkBox" id="dialog-hbox13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkGrid" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="margin_start">5</property> <property name="margin_top">5</property> <property name="margin_bottom">5</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow5"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">etched-in</property> <child> @@ -60,14 +51,16 @@ </child> </object> <packing> - <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> @@ -114,8 +107,7 @@ </object> <packing> <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -124,28 +116,29 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="valign">center</property> <property name="border_width">5</property> <property name="source_widget">dict-view</property> <property name="dest_widget">variables-treeview</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options"/> - <property name="y_options">GTK_EXPAND</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="label_xalign">0</property> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox" id="vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_right">5</property> <property name="margin_start">12</property> + <property name="orientation">vertical</property> <child> <object class="GtkRadioButton" id="radiobutton3"> <property name="label" translatable="yes">_Get from data</property> @@ -164,7 +157,7 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -173,13 +166,14 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> <property name="group">radiobutton3</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -189,6 +183,8 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="margin_right">5</property> + <property name="margin_bottom">5</property> <property name="invisible_char">â</property> </object> <packing> @@ -216,16 +212,15 @@ </child> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="bottom_attach">3</property> - <property name="y_options">GTK_FILL</property> - <property name="x_padding">5</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="label3"> @@ -256,10 +251,20 @@ </object> <packing> <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> -- 2.30.2