From: John Darrington <john@darrington.wattle.id.au> Date: Sat, 5 Dec 2015 12:24:08 +0000 (+0100) Subject: Transpose Dialog: Remove deprecated widgets X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228b6dc249231db9018965412f572fff51ea7805;p=pspp Transpose Dialog: Remove deprecated widgets --- diff --git a/src/ui/gui/transpose.ui b/src/ui/gui/transpose.ui index ff3d6060ad..c5944c33b6 100644 --- a/src/ui/gui/transpose.ui +++ b/src/ui/gui/transpose.ui @@ -1,23 +1,27 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> + <requires lib="gtk+" version="3.0"/> <requires lib="psppire" version="2054.17080"/> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy project-wide --> <object class="PsppireDialog" id="transpose-dialog"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Transpose</property> <property name="modal">True</property> - <property name="help-page">FLIP</property> + <property name="help_page">FLIP</property> <child> - <object class="GtkHBox" id="dialog-hbox1"> + <object class="GtkBox" id="dialog-hbox1"> <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 | GDK_ENTER_NOTIFY_MASK</property> <property name="spacing">2</property> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkFrame" id="frame3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> @@ -25,11 +29,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <child> <object class="PsppireDictView" id="source-treeview"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">0</property> <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="psppire-dictview-selection1"/> + </child> </object> </child> </object> @@ -39,23 +47,26 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid" id="table2"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">5</property> + <property name="can_focus">False</property> <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> - <object class="GtkVBox" id="vbox5"> + <object class="GtkBox" id="vbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Name Variable:</property> </object> @@ -68,6 +79,7 @@ <child> <object class="GtkEntry" id="new-name-entry"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -78,19 +90,19 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Variable(s):</property> </object> @@ -103,6 +115,7 @@ <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">in</property> <child> @@ -110,11 +123,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <child> <object class="PsppireVarView" id="variables-treeview"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">0</property> <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="psppire-var-view-selection1"/> + </child> </object> </child> </object> @@ -124,13 +141,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -143,10 +162,8 @@ <property name="dest_widget">new-name-entry</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -154,24 +171,29 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> + <property name="valign">center</property> <property name="border_width">5</property> <property name="primary">True</property> <property name="source_widget">source-treeview</property> <property name="dest_widget">variables-treeview</property> </object> <packing> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="padding">5</property> <property name="position">0</property> </packing> @@ -179,6 +201,7 @@ <child> <object class="PsppireVButtonBox" id="psppire-buttonbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">5</property> </object> <packing>