From 7d2216c5378e5d960dbeb8b0a9b2e9117c950ed5 Mon Sep 17 00:00:00 2001 From: John Darrington <john@darrington.wattle.id.au> Date: Sat, 5 Dec 2015 13:28:38 +0100 Subject: [PATCH] Entry Dialog: Remove deprecated widgets --- src/ui/gui/entry-dialog.ui | 42 ++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/src/ui/gui/entry-dialog.ui b/src/ui/gui/entry-dialog.ui index 5ce5797660..d1d5dba04b 100644 --- a/src/ui/gui/entry-dialog.ui +++ b/src/ui/gui/entry-dialog.ui @@ -1,32 +1,48 @@ -<?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="entry-dialog"> + <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="modal">True</property> <child> - <object class="GtkVBox" id="dialog-hbox8"> + <object class="GtkBox" id="dialog-hbox8"> <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> <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label"> + <child> + <object class="GtkLabel" id="label"> <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> - </object> - </child> - <child> - <object class="GtkEntry" id="entry"> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry"> <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="activates-default">True</property> - </object> - </child> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="PsppireHButtonBox" id="psppire-hbuttonbox5"> <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="border_width">5</property> <property name="layout_style">spread</property> -- 2.30.2