From af8fe020fa47f88b896924092297fb40c7831b1e Mon Sep 17 00:00:00 2001 From: John Darrington <john@darrington.wattle.id.au> Date: Sun, 6 Dec 2015 16:05:45 +0100 Subject: [PATCH] Count Dialog: Replace deprecated widgets --- src/ui/gui/count.ui | 365 +++++++++++++++++++++++--------------------- 1 file changed, 194 insertions(+), 171 deletions(-) diff --git a/src/ui/gui/count.ui b/src/ui/gui/count.ui index 3bb7fc8d49..488496b6da 100644 --- a/src/ui/gui/count.ui +++ b/src/ui/gui/count.ui @@ -1,219 +1,229 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires psppire 0.0 --> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.0"/> + <requires lib="psppire" version="0.0"/> <object class="PsppireDialog" id="count-dialog"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Count Occurrences of Values within Cases</property> <property name="modal">True</property> - <property name="help-page">COUNT</property> + <property name="help_page">COUNT</property> <child> - <object class="GtkHBox" id="dialog-hbox5"> + <object class="GtkBox" id="dialog-hbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkGrid" id="table1"> <property name="visible">True</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> + <property name="can_focus">False</property> + <property name="margin_left">5</property> + <property name="margin_right">5</property> + <property name="margin_top">5</property> + <property name="row_spacing">5</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">3</property> + <property name="can_focus">True</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> + <object class="PsppireDictView" id="dict-view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">5</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="selection_mode">single</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="psppire-dictview-selection"/> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="PsppireSelector" id="count-selector1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="border_width">5</property> + <property name="source_widget">dict-view</property> + <property name="dest_widget">treeview2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin_start">12</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> <child> - <object class="PsppireDictView" id="dict-view"> + <object class="PsppireVarView" id="treeview2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">5</property> + <property name="border_width">0</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="psppire-var-view-selection"/> + </child> </object> </child> </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">4</property> - </packing> </child> - <child> - <object class="PsppireSelector" id="count-selector1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="border_width">5</property> - <property name="source_widget">dict-view</property> - <property name="dest_widget">treeview2</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Numeric _Variables:</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">treeview2</property> </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="x_options"></property> - <property name="y_options"></property> - </packing> </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <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">none</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkEntry" id="entry1"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">etched-in</property> - <child> - <object class="PsppireVarView" id="treeview2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Numeric _Variables:</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">treeview2</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="margin_start">12</property> + <property name="invisible_char">â¢</property> </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> - </packing> </child> - <child> - <object class="GtkFrame" id="frame2"> + <child type="label"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <object class="GtkEntry" id="entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Target Variable:</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry1</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Target Variable:</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry1</property> </object> - <packing> - <property name="y_options">GTK_SHRINK</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkEntry" id="entry2"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <object class="GtkEntry" id="entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Target _Label:</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">entry2</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="margin_start">12</property> + <property name="invisible_char">â¢</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="y_options">GTK_SHRINK</property> - </packing> </child> - <child> - <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">_Define Values...</property> + <child type="label"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Target _Label:</property> + <property name="use_markup">True</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">entry2</property> </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_EXPAND</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button1"> + <property name="label" translatable="yes">_Define Values...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </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">0</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="eventbox2"> + <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">2</property> + </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="PsppireHButtonBox" id="psppire-hbuttonbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">5</property> </object> <packing> @@ -227,47 +237,55 @@ </child> </object> <object class="PsppireDialog" id="values-dialog"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Count Values within Cases: Values to Count</property> <property name="modal">True</property> <child> - <object class="GtkVBox" id="dialog-hbox6"> + <object class="GtkBox" id="dialog-hbox6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</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> + <property name="margin_left">5</property> + <property name="margin_right">5</property> + <property name="margin_top">5</property> <child> <object class="PsppireValChooser" id="value-chooser"> <property name="visible">True</property> - <property name="show-else">False</property> - <property name="label" translatable="yes">Value</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="show_else">False</property> </object> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame-acr"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">etched-in</property> <child> - <object class="GtkAlignment" id="alignment-acr"> + <object class="PsppireAcr" id="acr"> <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <object class="PsppireAcr" id="acr"> - <property name="visible">True</property> - <property name="border_width">5</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="margin_start">12</property> + <property name="hexpand">True</property> + <property name="border_width">5</property> </object> </child> <child type="label"> <object class="GtkLabel" id="label-v2c"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Values _to Count:</property> <property name="use_markup">True</property> <property name="use_underline">True</property> @@ -276,17 +294,22 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="PsppireHButtonBox" id="psppire-hbuttonbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="buttons">PSPPIRE_BUTTON_CONTINUE_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_HELP_MASK</property> <property name="default">PSPPIRE_BUTTON_CONTINUE_MASK</property> -- 2.30.2