Start updating glade files for GTK3

1 files changed, 59 insertions, 76 deletions

diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui
index cee67a0bb..69aad56e8 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/data/gui/add_new_contact_window.ui
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.12"/>
+  <object class="GtkListStore" id="groups_liststore">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="liststore3">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTextBuffer" id="textbuffer1">
+    <property name="text" translatable="yes">I would like to add you to my contact list.</property>
+  </object>
   <object class="GtkWindow" id="add_new_contact_window">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -10,9 +32,10 @@
     <signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/>
     <signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="vbox8">
+      <object class="GtkBox" id="vbox8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="prompt_label">
@@ -26,7 +49,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="account_hbox">
+          <object class="GtkBox" id="account_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -74,7 +97,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="protocol_hbox">
+          <object class="GtkBox" id="protocol_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -85,7 +108,6 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Protocol:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">uid_entry</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -133,15 +155,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTable" id="subscription_table">
+          <object class="GtkGrid" id="subscription_table">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
-            <property name="border_width">6</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="uid_label">
                 <property name="visible">True</property>
@@ -149,91 +167,80 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_User ID:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">uid_entry</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="uid_entry">
+              <object class="GtkLabel" id="label188">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="placeholder_text">Type User ID</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Nickname:</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label188">
+              <object class="GtkLabel" id="label223">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Nickname:</property>
+                <property name="label" translatable="yes">_Group:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">nickname_entry</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="nickname_entry">
+              <object class="GtkEntry" id="uid_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
                 <property name="activates_default">True</property>
-                <property name="placeholder_text">Type Nickname</property>
+                <property name="placeholder_text">Type User ID</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="y_options"/>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label223">
+              <object class="GtkEntry" id="nickname_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Group:</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="activates_default">True</property>
+                <property name="placeholder_text">Type Nickname</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="group_comboboxentry">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="has_entry">True</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
                 <child internal-child="entry">
                   <object class="GtkEntry" id="comboboxtext-entry">
                     <property name="can_focus">True</property>
-                    <property name="placeholder_text">Choose a group of type a new group</property>
+                    <property name="placeholder_text" translatable="yes">Choose a group of type a new group</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
               </packing>
             </child>
           </object>
@@ -251,7 +258,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="active">True</property>
@@ -293,7 +299,6 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -305,7 +310,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="register_hbox">
+          <object class="GtkBox" id="register_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
@@ -335,7 +340,8 @@ proceed.</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_register_button_clicked" swapped="no"/>
               </object>
@@ -367,7 +373,7 @@ to add a contact from this protocol.</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="border_width">5</property>
@@ -381,7 +387,6 @@ to add a contact from this protocol.</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
               </object>
@@ -400,7 +405,6 @@ to add a contact from this protocol.</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_add_button_clicked" swapped="no"/>
               </object>
@@ -420,25 +424,4 @@ to add a contact from this protocol.</property>
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="groups_liststore">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="liststore3">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">I would like to add you to my contact list.</property>
-  </object>
 </interface>