[gedit] Run gtk-builder-tool simplify on our ui files



commit ce5813531d3ed5d5111c1908f582bc981ad2b644
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Aug 30 11:53:28 2015 +0200

    Run gtk-builder-tool simplify on our ui files

 gedit/resources/ui/gedit-encodings-dialog.ui       |   24 -----
 gedit/resources/ui/gedit-highlight-mode-dialog.ui  |   22 ----
 .../resources/ui/gedit-highlight-mode-selector.ui  |    5 -
 gedit/resources/ui/gedit-open-document-selector.ui |    4 -
 gedit/resources/ui/gedit-preferences-dialog.ui     |   54 +----------
 gedit/resources/ui/gedit-print-preferences.ui      |  103 +-------------------
 gedit/resources/ui/gedit-print-preview.ui          |   88 -----------------
 gedit/resources/ui/gedit-progress-info-bar.ui      |   24 +-----
 gedit/resources/ui/gedit-replace-dialog.ui         |   40 --------
 gedit/resources/ui/gedit-status-menu-button.ui     |   13 ---
 gedit/resources/ui/gedit-statusbar.ui              |   24 -----
 gedit/resources/ui/gedit-tab-label.ui              |    8 +-
 gedit/resources/ui/gedit-view-frame.ui             |    8 --
 gedit/resources/ui/gedit-window.ui                 |   59 +-----------
 .../docinfo/resources/ui/gedit-docinfo-plugin.ui   |   65 +------------
 plugins/externaltools/tools/outputpanel.ui         |    2 -
 plugins/externaltools/tools/tools.ui               |   66 -------------
 .../resources/ui/gedit-file-browser-widget.ui      |   39 +++-----
 plugins/pythonconsole/pythonconsole/config.ui      |    3 -
 plugins/snippets/snippets/snippets.ui              |   57 -----------
 plugins/sort/resources/ui/gedit-sort-plugin.ui     |   51 +++-------
 plugins/spell/resources/ui/languages-dialog.ui     |    5 -
 plugins/spell/resources/ui/spell-checker.ui        |   27 -----
 plugins/time/resources/ui/gedit-time-dialog.ui     |   35 -------
 .../time/resources/ui/gedit-time-setup-dialog.ui   |   31 ------
 25 files changed, 39 insertions(+), 818 deletions(-)
---
diff --git a/gedit/resources/ui/gedit-encodings-dialog.ui b/gedit/resources/ui/gedit-encodings-dialog.ui
index 5a14ca8..d359052 100644
--- a/gedit/resources/ui/gedit-encodings-dialog.ui
+++ b/gedit/resources/ui/gedit-encodings-dialog.ui
@@ -36,7 +36,6 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="has_subtitle">False</property>
         <property name="title" translatable="yes">Character Encodings</property>
         <child>
@@ -63,13 +62,11 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkGrid" id="encodings_dialog_contents">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">6</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">18</property>
@@ -77,7 +74,6 @@
             <child>
               <object class="GtkLabel" id="available_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">A_vailable Encodings</property>
                 <property name="use_underline">True</property>
@@ -95,7 +91,6 @@
             <child>
               <object class="GtkLabel" id="chosen_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">Cho_sen Encodings</property>
                 <property name="use_underline">True</property>
@@ -113,7 +108,6 @@
             <child>
               <object class="GtkBox" id="box_available">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
@@ -161,22 +155,14 @@
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkToolbar" id="toolbar_available">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="toolbar_style">icons</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -189,7 +175,6 @@
             <child>
               <object class="GtkBox" id="box_chosen">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
@@ -237,21 +222,13 @@
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkToolbar" id="toolbar_chosen">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -264,7 +241,6 @@
           </object>
           <packing>
             <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-highlight-mode-dialog.ui 
b/gedit/resources/ui/gedit-highlight-mode-dialog.ui
index 2484d76..4011e26 100644
--- a/gedit/resources/ui/gedit-highlight-mode-dialog.ui
+++ b/gedit/resources/ui/gedit-highlight-mode-dialog.ui
@@ -13,16 +13,10 @@
     <property name="modal">True</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="layout_style">end</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
@@ -31,40 +25,26 @@
                 <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
                 <property name="label" translatable="yes">_Select</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="can_default">True</property>
                 <property name="use_underline">True</property>
               </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="pack_type">end</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -75,8 +55,6 @@
             <property name="is_focus">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-highlight-mode-selector.ui 
b/gedit/resources/ui/gedit-highlight-mode-selector.ui
index bcb5515..0f3f090 100644
--- a/gedit/resources/ui/gedit-highlight-mode-selector.ui
+++ b/gedit/resources/ui/gedit-highlight-mode-selector.ui
@@ -26,7 +26,6 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="has_focus">True</property>
-        <property name="is_focus">False</property>
         <property name="activates_default">True</property>
         <property name="placeholder_text" translatable="yes">Search highlight mode...</property>
       </object>
@@ -41,8 +40,6 @@
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -50,8 +47,6 @@
           <object class="GtkTreeView" id="treeview">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="model">treemodelfilter</property>
             <property name="headers_visible">False</property>
             <property name="headers_clickable">False</property>
diff --git a/gedit/resources/ui/gedit-open-document-selector.ui 
b/gedit/resources/ui/gedit-open-document-selector.ui
index 062ea83..ed54e4f 100644
--- a/gedit/resources/ui/gedit-open-document-selector.ui
+++ b/gedit/resources/ui/gedit-open-document-selector.ui
@@ -23,8 +23,6 @@
     </child>
     <child>
       <object class="GtkFrame" id="placeholder_box">
-        <property name="visible">False</property>
-        <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -39,7 +37,6 @@
                 <property name="visible">True</property>
                 <property name="icon_name">edit-find-symbolic</property>
                 <property name="pixel_size">64</property>
-                <property name="can_focus">False</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -49,7 +46,6 @@
               <object class="GtkLabel" id="placeholder_label">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">No results</property>
                 <style>
                   <class name="dim-label"/>
diff --git a/gedit/resources/ui/gedit-preferences-dialog.ui b/gedit/resources/ui/gedit-preferences-dialog.ui
index 83cd049..ab83057 100644
--- a/gedit/resources/ui/gedit-preferences-dialog.ui
+++ b/gedit/resources/ui/gedit-preferences-dialog.ui
@@ -14,26 +14,22 @@
       <object class="GtkHeaderBar" id="header_bar">
         <property name="title" translatable="yes">Preferences</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="show-close-button">True</property>
-       </object>
+      </object>
     </child>
     <child>
       <object class="GtkNotebook" id="notebook">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="border_width">0</property>
         <property name="show_border">False</property>
         <child>
           <object class="GtkGrid" id="grid6">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">6</property>
                 <child>
@@ -41,7 +37,6 @@
                     <property name="label" translatable="yes">_Display line numbers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -56,7 +51,6 @@
                     <property name="label" translatable="yes">Display right _margin at column:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -68,7 +62,6 @@
                 <child>
                   <object class="GtkGrid" id="right_margin_position_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkSpinButton" id="right_margin_position_spinbutton">
                         <property name="visible">True</property>
@@ -95,7 +88,6 @@
                     <property name="label" translatable="yes">Display _statusbar</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -110,7 +102,6 @@
                     <property name="label" translatable="yes">Display _overview map</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -125,7 +116,6 @@
                     <property name="label" translatable="yes">Display _grid pattern</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -144,12 +134,10 @@
             <child>
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label848">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Text Wrapping</property>
                     <attributes>
@@ -164,7 +152,6 @@
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <child>
@@ -172,7 +159,6 @@
                         <property name="label" translatable="yes">Enable text _wrapping</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -186,7 +172,6 @@
                         <property name="label" translatable="yes">Do not _split words over two 
lines</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -210,12 +195,10 @@
             <child>
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label876">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Highlighting</property>
                     <attributes>
@@ -230,7 +213,6 @@
                 <child>
                   <object class="GtkGrid" id="grid5">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <child>
@@ -238,7 +220,6 @@
                         <property name="label" translatable="yes">Highlight current _line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -252,7 +233,6 @@
                         <property name="label" translatable="yes">Highlight matching _brackets</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -281,7 +261,6 @@
         <child type="tab">
           <object class="GtkLabel" id="label853">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">View</property>
           </object>
           <packing>
@@ -291,18 +270,15 @@
         <child>
           <object class="GtkGrid" id="grid11">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid7">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label846">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Tab Stops</property>
                     <attributes>
@@ -318,14 +294,12 @@
                   <object class="GtkGrid" id="grid8">
                     <property name="name">12</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label98">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="label" translatable="yes">_Tab width:</property>
                         <property name="use_underline">True</property>
@@ -359,7 +333,6 @@
                         <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -374,7 +347,6 @@
                         <property name="label" translatable="yes">_Enable automatic indentation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -399,12 +371,10 @@
             <child>
               <object class="GtkGrid" id="grid9">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label859">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">File Saving</property>
                     <attributes>
@@ -419,7 +389,6 @@
                 <child>
                   <object class="GtkGrid" id="grid10">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
@@ -428,7 +397,6 @@
                         <property name="label" translatable="yes">Create a _backup copy of files before 
saving</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -443,7 +411,6 @@
                         <property name="label" translatable="yes">_Autosave files every</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -455,7 +422,6 @@
                     <child>
                       <object class="GtkLabel" id="label97">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_minutes</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -502,7 +468,6 @@
         <child type="tab">
           <object class="GtkLabel" id="label829">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Editor</property>
           </object>
           <packing>
@@ -513,18 +478,15 @@
         <child>
           <object class="GtkGrid" id="grid16">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid12">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label819">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Font</property>
                     <attributes>
@@ -539,7 +501,6 @@
                 <child>
                   <object class="GtkGrid" id="grid13">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
@@ -548,7 +509,6 @@
                         <property name="label">_Use the system fixed width font (%s)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                         <accessibility>
@@ -563,12 +523,10 @@
                     <child>
                       <object class="GtkGrid" id="font_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="font_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Editor _font: </property>
                             <property name="use_underline">True</property>
@@ -619,14 +577,12 @@
             <child>
               <object class="GtkGrid" id="grid14">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label798">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Color Scheme</property>
                     <attributes>
@@ -641,7 +597,6 @@
                 <child>
                   <object class="GtkGrid" id="grid15">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
@@ -667,13 +622,11 @@
                     <child>
                       <object class="GtkToolbar" id="schemes_toolbar">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="toolbar_style">icons</property>
                         <property name="icon_size">1</property>
                         <child>
                           <object class="GtkToolButton" id="install_scheme_button">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_markup" translatable="yes">Install scheme</property>
                             <property name="tooltip_text" translatable="yes">Install scheme</property>
@@ -682,14 +635,12 @@
                             <property name="icon_name">list-add-symbolic</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkToolButton" id="uninstall_scheme_button">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_markup" translatable="yes">Uninstall scheme</property>
                             <property name="tooltip_text" translatable="yes">Uninstall scheme</property>
@@ -698,7 +649,6 @@
                             <property name="icon_name">list-remove-symbolic</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
@@ -732,7 +682,6 @@
         <child type="tab">
           <object class="GtkLabel" id="label830">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Font &amp; Colors</property>
           </object>
           <packing>
@@ -757,7 +706,6 @@
         <child type="tab">
           <object class="GtkLabel" id="label868">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Plugins</property>
           </object>
           <packing>
diff --git a/gedit/resources/ui/gedit-print-preferences.ui b/gedit/resources/ui/gedit-print-preferences.ui
index f95c4ec..8928b6d 100644
--- a/gedit/resources/ui/gedit-print-preferences.ui
+++ b/gedit/resources/ui/gedit-print-preferences.ui
@@ -11,30 +11,25 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">window1</property>
     <child>
       <object class="GtkBox" id="contents">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="spacing">18</property>
         <child>
           <object class="GtkBox" id="vbox20">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox26">
                 <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="label33">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Syntax Highlighting</property>
                     <attributes>
@@ -42,9 +37,7 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -53,34 +46,24 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="margin_start">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </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="GtkBox" id="vbox22">
                 <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="label27">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Line Numbers</property>
                     <attributes>
@@ -88,15 +71,12 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
@@ -106,34 +86,27 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="line_numbers_hbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0.47999998927116394</property>
                             <property name="label" translatable="yes" comments="'Number every' from 'Number 
every 3 lines' in the 'Text Editor' tab of the print preferences.">_Number every</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">line_numbers_spinbutton</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -145,7 +118,6 @@
                             <property name="value">1</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
@@ -153,46 +125,37 @@
                         <child>
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" comments="'lines' from 'Number every 3 
lines' in the 'Text Editor' tab of the print preferences.">lines</property>
+                            <property name="label" translatable="yes" comments="&apos;lines&apos; from 
&apos;Number every 3 lines&apos; in the &apos;Text Editor&apos; tab of the print 
preferences.">lines</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </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">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="vbox24">
                 <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="label31">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Text Wrapping</property>
                     <attributes>
@@ -200,15 +163,12 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox25">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
@@ -218,53 +178,41 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="hbox20">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkCheckButton" id="do_not_split_checkbutton">
                             <property name="label" translatable="yes">Do not _split words over two 
lines</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
                           </packing>
                         </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">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
@@ -272,13 +220,11 @@
             <child>
               <object class="GtkBox" id="vbox39">
                 <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="label45">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Page header</property>
                     <attributes>
@@ -286,9 +232,7 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -297,47 +241,34 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="margin_start">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </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">3</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="GtkBox" id="vbox36">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox37">
                 <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="label43">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Fonts</property>
                     <attributes>
@@ -345,28 +276,23 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox4">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkGrid" id="fonts_grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="row_spacing">12</property>
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="body_font_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Body:</property>
                             <property name="use_underline">True</property>
@@ -384,7 +310,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"/>
+                            <property name="preview_text"></property>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -397,7 +323,6 @@
                         <child>
                           <object class="GtkLabel" id="numbers_font_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Line numbers:</property>
                             <property name="use_underline">True</property>
@@ -415,7 +340,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"/>
+                            <property name="preview_text"></property>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -428,7 +353,6 @@
                         <child>
                           <object class="GtkLabel" id="headers_font_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">He_aders and footers:</property>
                             <property name="use_underline">True</property>
@@ -446,7 +370,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"/>
+                            <property name="preview_text"></property>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -457,16 +381,10 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButtonBox" id="hbuttonbox1">
                         <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="layout_style">end</property>
                         <child>
@@ -475,39 +393,26 @@
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
                           </packing>
                         </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">1</property>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
diff --git a/gedit/resources/ui/gedit-print-preview.ui b/gedit/resources/ui/gedit-print-preview.ui
index 9745fea..83bc8a2 100644
--- a/gedit/resources/ui/gedit-print-preview.ui
+++ b/gedit/resources/ui/gedit-print-preview.ui
@@ -9,15 +9,9 @@
     <child>
       <object class="GtkToolbar" id="toolbar1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
-        <property name="toolbar_style">both-horiz</property>
         <child>
           <object class="GtkToolItem" id="toolbutton1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -26,7 +20,6 @@
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="prev_button">
                     <property name="visible">True</property>
@@ -36,9 +29,7 @@
                     <property name="image">previous_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -50,7 +41,6 @@
                     <property name="image">next_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -61,43 +51,27 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="valign">center</property>
                 <property name="column_spacing">4</property>
                 <child>
                   <object class="GtkEntry" id="page_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="has_focus">False</property>
-                    <property name="is_focus">False</property>
                     <property name="max_length">6</property>
                     <property name="width_chars">3</property>
                     <property name="primary_icon_tooltip_text" translatable="yes">Current page 
(Alt+P)</property>
@@ -105,31 +79,21 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_focus">False</property>
-                    <property name="is_focus">False</property>
                     <property name="label" translatable="yes" comments="the &quot;of&quot; from &quot;1 of 
19&quot; in print preview">of</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="last_page_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_focus">False</property>
-                    <property name="is_focus">False</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="last-atkobject">
                         <property name="AtkObject::accessible-name" translatable="yes">Page total</property>
@@ -140,35 +104,23 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton3">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -177,7 +129,6 @@
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="multi_pages_button">
                     <property name="visible">True</property>
@@ -187,36 +138,24 @@
                     <property name="image">multi_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator3">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton4">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -225,7 +164,6 @@
             <child>
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="zoom_one_button">
                     <property name="visible">True</property>
@@ -235,9 +173,7 @@
                     <property name="image">zoom_one_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -249,7 +185,6 @@
                     <property name="image">zoom_fit_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -263,7 +198,6 @@
                     <property name="image">zoom_in_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
@@ -277,7 +211,6 @@
                     <property name="image">zoom_out_image</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
@@ -288,28 +221,18 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator4">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -318,7 +241,6 @@
             <child>
               <object class="GtkBox" id="box4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="close_button">
                     <property name="visible">True</property>
@@ -328,18 +250,12 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">False</property>
-          </packing>
         </child>
         <style>
           <class name="inline-toolbar"/>
@@ -356,8 +272,6 @@
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -365,8 +279,6 @@
           <object class="GtkLayout" id="layout">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="has_tooltip">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
             <child internal-child="accessible">
diff --git a/gedit/resources/ui/gedit-progress-info-bar.ui b/gedit/resources/ui/gedit-progress-info-bar.ui
index 3f733e4..b810fc1 100644
--- a/gedit/resources/ui/gedit-progress-info-bar.ui
+++ b/gedit/resources/ui/gedit-progress-info-bar.ui
@@ -7,60 +7,43 @@
     <property name="message_type">other</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="infobar-content_area1">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="spacing">4</property>
             <child>
               <object class="GtkImage" id="image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon-size">2</property>
                 <property name="icon_name">image-missing</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="padding">4</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label">label</property>
                 <property name="use_markup">True</property>
                 <property name="ellipsize">end</property>
               </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="GtkProgressBar" id="progress">
             <property name="height_request">15</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -72,12 +55,7 @@
       </packing>
     </child>
     <child internal-child="action_area">
-      <object class="GtkButtonBox" id="infobar-action_area1">
-        <property name="can_focus">False</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
+      <object class="GtkButtonBox" id="infobar-action_area1"/>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
diff --git a/gedit/resources/ui/gedit-replace-dialog.ui b/gedit/resources/ui/gedit-replace-dialog.ui
index f1dbd4b..3aaf9ed 100644
--- a/gedit/resources/ui/gedit-replace-dialog.ui
+++ b/gedit/resources/ui/gedit-replace-dialog.ui
@@ -11,27 +11,22 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="label" translatable="yes">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -41,11 +36,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
@@ -57,11 +50,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
@@ -73,34 +64,28 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="row_spacing">12</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="search_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes" context="label on the left of the GtkEntry 
containing text to search">F_ind </property>
                 <property name="use_underline">True</property>
@@ -108,14 +93,11 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="replace_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Replace _with </property>
                 <property name="use_underline">True</property>
@@ -123,14 +105,11 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkGrid" id="checkbox_grid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">4</property>
                 <property name="column_spacing">12</property>
                 <child>
@@ -139,15 +118,12 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -156,15 +132,12 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -173,15 +146,12 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -190,15 +160,12 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -207,7 +174,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -215,22 +181,16 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-status-menu-button.ui b/gedit/resources/ui/gedit-status-menu-button.ui
index 54ae28f..c17765d 100644
--- a/gedit/resources/ui/gedit-status-menu-button.ui
+++ b/gedit/resources/ui/gedit-status-menu-button.ui
@@ -12,26 +12,15 @@
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_focus">False</property>
-            <property name="is_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">baseline</property>
             <property name="label">label</property>
             <property name="single_line_mode">True</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage" id="arrow">
@@ -40,8 +29,6 @@
             <property name="icon_name">pan-down-symbolic</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-statusbar.ui b/gedit/resources/ui/gedit-statusbar.ui
index 7e4242a..3bc9335 100644
--- a/gedit/resources/ui/gedit-statusbar.ui
+++ b/gedit/resources/ui/gedit-statusbar.ui
@@ -9,14 +9,10 @@
     <property name="margin_start">0</property>
     <child>
       <object class="GtkFrame" id="error_frame">
-        <property name="visible">False</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
         <property name="shadow_type">in</property>
         <child>
           <object class="GtkImage" id="error_image">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error-symbolic</property>
             <property name="icon_size">1</property>
           </object>
@@ -30,50 +26,31 @@
     </child>
     <child>
       <object class="GtkFrame" id="state_frame">
-        <property name="visible">False</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
         <property name="shadow_type">in</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="load_image">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">document-open-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="save_image">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">document-save-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkImage" id="print_image">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">printer-printing-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -89,7 +66,6 @@
     <child>
       <object class="GtkLabel" id="overwrite_mode_label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/gedit/resources/ui/gedit-tab-label.ui b/gedit/resources/ui/gedit-tab-label.ui
index 2ccf0a8..e202242 100644
--- a/gedit/resources/ui/gedit-tab-label.ui
+++ b/gedit/resources/ui/gedit-tab-label.ui
@@ -11,17 +11,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkImage" id="icon">
-        <property name="visible">False</property>
-      </object>
+      <object class="GtkImage" id="icon"/>
       <packing>
         <property name="pack_type">start</property>
       </packing>
     </child>
     <child>
-      <object class="GtkSpinner" id="spinner">
-        <property name="visible">False</property>
-      </object>
+      <object class="GtkSpinner" id="spinner"/>
       <packing>
         <property name="pack_type">start</property>
       </packing>
diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
index ec9f38b..26f7af8 100644
--- a/gedit/resources/ui/gedit-view-frame.ui
+++ b/gedit/resources/ui/gedit-view-frame.ui
@@ -41,21 +41,17 @@
     <child type="overlay">
       <object class="GtkRevealer" id="revealer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="halign">end</property>
         <property name="valign">start</property>
         <child>
           <object class="GtkFrame" id="frame">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <style>
               <class name="gedit-search-slider"/>
             </style>
             <child>
               <object class="GtkBox" id="hbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">horizontal</property>
                 <style>
                   <class name="linked"/>
                 </style>
@@ -70,11 +66,9 @@
                 <child>
                   <object class="GtkButton" id="go_up_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImage" id="up_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_size">1</property>
                         <property name="icon_name">go-up-symbolic</property>
                       </object>
@@ -84,11 +78,9 @@
                 <child>
                   <object class="GtkButton" id="go_down_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImage" id="down_image">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_size">1</property>
                         <property name="icon_name">go-down-symbolic</property>
                       </object>
diff --git a/gedit/resources/ui/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
index cac2005..147f2f1 100644
--- a/gedit/resources/ui/gedit-window.ui
+++ b/gedit/resources/ui/gedit-window.ui
@@ -15,7 +15,6 @@
         <child>
           <object class="GtkHeaderBar" id="side_headerbar">
             <property name="visible" bind-source="side_panel" bind-property="visible" 
bind-flags="sync-create"/>
-            <property name="show_close_button">False</property>
             <property name="title" translatable="yes">Documents</property>
             <style>
               <class name="gedit-titlebar-left"/>
@@ -39,7 +38,6 @@
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Open a file</property>
                 <property name="valign">center</property>
-                <property name="use_popover">True</property>
                 <style>
                   <class name="text-button"/>
                   <class name="image-button"/>
@@ -47,9 +45,6 @@
                 <child>
                   <object class="GtkBox" id="open_button_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_focus">False</property>
-                    <property name="is_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="open_button_name">
@@ -75,16 +70,12 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack_type">start</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="new_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Create a new document</property>
                 <property name="valign">center</property>
                 <property name="action_name">win.new-tab</property>
@@ -101,7 +92,6 @@
               <object class="GtkMenuButton" id="gear_button">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
-                <property name="use_popover">True</property>
                 <property name="image">menu_image</property>
               </object>
               <packing>
@@ -137,9 +127,6 @@
     <child>
       <object class="GtkOverlay" id="fullscreen_overlay">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="has_focus">False</property>
-        <property name="is_focus">False</property>
         <child>
           <object class="GtkBox" id="main_box">
             <property name="visible">True</property>
@@ -148,8 +135,6 @@
               <object class="GtkPaned" id="hpaned">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <style>
                   <class name="gedit-side-panel-paned"/>
                 </style>
@@ -166,18 +151,13 @@
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkStack" id="side_panel">
-                        <property name="visible">False</property>
-                      </object>
+                      <object class="GtkStack" id="side_panel"/>
                       <packing>
                         <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -195,8 +175,6 @@
                       <object class="GtkPaned" id="vpaned">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="has_focus">False</property>
-                        <property name="is_focus">False</property>
                         <property name="orientation">vertical</property>
                         <style>
                           <class name="gedit-bottom-panel-paned"/>
@@ -206,14 +184,12 @@
                             <property name="visible">True</property>
                           </object>
                           <packing>
-                            <property name="resize">True</property>
                             <property name="shrink">False</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="bottom_panel_box">
                             <property name="visible" bind-source="bottom_panel" bind-property="visible" 
bind-flags="sync-create"/>
-                            <property name="orientation">horizontal</property>
                             <style>
                               <class name="gedit-bottom-panel"/>
                             </style>
@@ -222,12 +198,9 @@
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkStack" id="bottom_panel">
-                                    <property name="visible">False</property>
-                                  </object>
+                                  <object class="GtkStack" id="bottom_panel"/>
                                   <packing>
                                     <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -240,7 +213,6 @@
                                     </style>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -248,7 +220,6 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -264,14 +235,12 @@
                                     <property name="action_name">win.bottom-panel</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
@@ -285,7 +254,6 @@
                       </object>
                       <packing>
                         <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -299,7 +267,6 @@
                             <child internal-child="label">
                               <object class="GtkLabel">
                                 <property name="width_chars">18</property>
-                                <property name="can_focus">False</property>
                               </object>
                             </child>
                           </object>
@@ -333,21 +300,14 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -356,13 +316,10 @@
         <child type="overlay">
           <object class="GtkEventBox" id="fullscreen_eventbox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="valign">start</property>
             <child>
               <object class="GtkRevealer" id="fullscreen_controls">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="reveal_child">False</property>
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkHeaderBar" id="fullscreen_headerbar">
@@ -372,7 +329,6 @@
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Open a file dialog</property>
                         <property name="valign">center</property>
-                        <property name="use_popover">True</property>
                         <style>
                           <class name="text-button"/>
                           <class name="image-button"/>
@@ -380,9 +336,6 @@
                         <child>
                           <object class="GtkBox" id="fullscreen_open_button_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="has_focus">False</property>
-                            <property name="is_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="fullscreen_open_button_name">
@@ -405,16 +358,12 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="pack_type">start</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="fullscreen_new_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Create a new document</property>
                         <property name="valign">center</property>
                         <property name="action_name">win.new-tab</property>
@@ -503,7 +452,6 @@
     <property name="icon_name">view-restore-symbolic</property>
   </object>
   <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
     <widgets>
       <widget name="side_headerbar"/>
       <widget name="side_panel"/>
@@ -516,7 +464,6 @@
       <widget name="open_button"/>
       <widget name="gear_button"/>
       <widget name="save_button"/>
-      <widget name="open_button"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
@@ -526,9 +473,7 @@
       <widget name="fullscreen_open_button"/>
       <widget name="fullscreen_gear_button"/>
       <widget name="fullscreen_save_button"/>
-      <widget name="fullscreen_open_button"/>
       <widget name="leave_fullscreen_button"/>
     </widgets>
   </object>
 </interface>
-
diff --git a/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui 
b/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
index 84cf918..bb9af4c 100644
--- a/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
+++ b/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkDialog" id="dialog">
-    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Document Statistics</property>
     <property name="resizable">False</property>
@@ -12,7 +11,6 @@
       <object class="GtkHeaderBar" id="header_bar">
         <property name="title" translatable="yes">Document Statistics</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="show-close-button">True</property>
         <child>
           <object class="GtkButton" id="update_button">
@@ -31,35 +29,28 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
         </child>
-       </object>
+      </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkBox" id="docinfo_dialog_content">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkGrid" id="grid_table">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">18</property>
                 <child>
                   <object class="GtkLabel" id="document_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Document</property>
                     <property name="use_markup">True</property>
@@ -70,14 +61,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selection_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Selection</property>
                     <property name="selectable">True</property>
@@ -85,14 +73,11 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lines_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Lines</property>
                     <property name="selectable">True</property>
@@ -100,14 +85,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="words_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Words</property>
                     <property name="selectable">True</property>
@@ -115,14 +97,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="chars_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Characters (with spaces)</property>
                     <property name="selectable">True</property>
@@ -130,14 +109,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="chars_ns_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Characters (no spaces)</property>
                     <property name="selectable">True</property>
@@ -145,14 +121,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bytes_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Bytes</property>
                     <property name="selectable">True</property>
@@ -160,14 +133,11 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_lines_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -175,14 +145,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_words_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -190,14 +157,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_chars_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -205,14 +169,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_chars_ns_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -220,14 +181,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_bytes_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -235,14 +193,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_lines_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -250,14 +205,11 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_words_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -265,14 +217,11 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_chars_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -280,14 +229,11 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_chars_ns_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -295,14 +241,11 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_bytes_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -310,21 +253,15 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </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">1</property>
           </packing>
         </child>
diff --git a/plugins/externaltools/tools/outputpanel.ui b/plugins/externaltools/tools/outputpanel.ui
index 4c163c2..44f8381 100644
--- a/plugins/externaltools/tools/outputpanel.ui
+++ b/plugins/externaltools/tools/outputpanel.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkOverlay" id="output-panel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
@@ -39,7 +38,6 @@
         <child>
           <object class="GtkImage" id="image1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">process-stop-symbolic</property>
           </object>
         </child>
diff --git a/plugins/externaltools/tools/tools.ui b/plugins/externaltools/tools/tools.ui
index a3f0ab1..5ceed1b 100644
--- a/plugins/externaltools/tools/tools.ui
+++ b/plugins/externaltools/tools/tools.ui
@@ -132,7 +132,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="tool-manager-dialog">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Manage External Tools</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
@@ -160,7 +159,6 @@
         <child>
           <object class="GtkBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window1">
@@ -184,14 +182,11 @@
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolbar" id="toolbar1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="toolbar_style">icons</property>
                 <style>
                   <class name="inline-toolbar"/>
@@ -200,7 +195,6 @@
                 <child>
                   <object class="GtkToolButton" id="add-tool-button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Add a new tool</property>
                     <property name="label" translatable="yes">Add Tool</property>
                     <property name="use_underline">True</property>
@@ -208,14 +202,12 @@
                     <signal name="clicked" handler="on_add_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="remove-tool-button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Remove selected tool</property>
                     <property name="label" translatable="yes">Remove Tool</property>
                     <property name="use_underline">True</property>
@@ -223,14 +215,12 @@
                     <signal name="clicked" handler="on_remove_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="revert-tool-button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Revert tool</property>
                     <property name="label" translatable="yes">Revert Tool</property>
                     <property name="use_underline">True</property>
@@ -238,14 +228,11 @@
                     <signal name="clicked" handler="on_remove_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -258,21 +245,17 @@
         <child>
           <object class="GtkBox" id="vbox5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="hbox7">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkGrid" id="tool-grid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_start">6</property>
                         <property name="margin_end">6</property>
                         <property name="margin_top">6</property>
@@ -282,7 +265,6 @@
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Shortcut _key:</property>
                             <property name="use_underline">True</property>
@@ -292,8 +274,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -309,14 +289,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Save:</property>
                             <property name="use_underline">True</property>
@@ -325,14 +302,11 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="save-files">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="model">model_save_files</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer1"/>
@@ -344,14 +318,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Input:</property>
                             <property name="use_underline">True</property>
@@ -360,14 +331,11 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="input">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="model">model_input</property>
                             <child>
                               <object class="GtkCellRendererText" id="input_renderer"/>
@@ -379,14 +347,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Output:</property>
                             <property name="use_underline">True</property>
@@ -395,14 +360,11 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="output">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="model">model_output</property>
                             <child>
                               <object class="GtkCellRendererText" id="output_renderer"/>
@@ -414,14 +376,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label23">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Applicability:</property>
                             <property name="use_underline">True</property>
@@ -430,19 +389,15 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="hbox1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkComboBox" id="applicability">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="model">model_applicability</property>
                                 <signal name="changed" handler="on_applicability_changed" swapped="no"/>
                                 <child>
@@ -452,23 +407,16 @@
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="languages_button">
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
                                 <signal name="clicked" handler="on_languages_button_clicked" swapped="no"/>
                                 <child>
                                   <object class="GtkLabel" id="languages_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">All Languages</property>
                                     <property name="ellipsize">end</property>
@@ -478,7 +426,6 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -486,16 +433,12 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -518,27 +461,18 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="resize">True</property>
             <property name="shrink">False</property>
           </packing>
         </child>
diff --git a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui 
b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
index 957d779..924a2ee 100644
--- a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
+++ b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
@@ -66,11 +66,9 @@
   </object>
   <object class="GtkMenu" id="location_previous_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
   </object>
   <object class="GtkMenu" id="location_next_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
   </object>
   <template class="GeditFileBrowserWidget" parent="GtkGrid">
     <property name="visible">True</property>
@@ -78,13 +76,11 @@
     <child>
       <object class="GtkBox" id="toolbar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin">3</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkBox" id="box1">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
+            <property name="visible">True</property>
             <child>
               <object class="GtkButton" id="previous_button">
                 <property name="visible">True</property>
@@ -109,9 +105,9 @@
                 </style>
               </object>
             </child>
-          <style>
-            <class name="linked"/>
-          </style>
+            <style>
+              <class name="linked"/>
+            </style>
           </object>
         </child>
         <child>
@@ -126,33 +122,27 @@
             </style>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkMenuButton" id="locations_button">
-          <property name="visible">True</property>
-          <property name="valign">center</property>
-          <property name="use_popover">True</property>
-          <property name="popover">locations_popover</property>
-          <style>
-            <class name="text-button"/>
-            <class name="image-button"/>
-            <class name="small-button"/>
-          </style>
+            <property name="visible">True</property>
+            <property name="valign">center</property>
+            <property name="popover">locations_popover</property>
+            <style>
+              <class name="text-button"/>
+              <class name="image-button"/>
+              <class name="small-button"/>
+            </style>
             <child>
               <object class="GtkBox" id="locations_button_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_focus">False</property>
-                <property name="is_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCellView" id="locations_cellview">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="model">locations_model</property>
                     <child>
                       <object class="GtkCellRendererPixbuf" id="cellview_icon_renderer"/>
@@ -177,7 +167,7 @@
                     <property name="icon_name">pan-down-symbolic</property>
                   </object>
                   <packing>
-                  <property name="pack-type">GTK_PACK_END</property>
+                    <property name="pack-type">GTK_PACK_END</property>
                   </packing>
                 </child>
               </object>
@@ -203,7 +193,6 @@
     </child>
     <child>
       <object class="GtkSearchEntry" id="location_entry">
-        <property name="visible">False</property>
         <property name="can_focus">True</property>
         <property name="invisible_char">●</property>
         <property name="primary_icon_name">folder-symbolic</property>
@@ -241,8 +230,6 @@
     <child>
       <object class="GtkRevealer" id="filter_entry_revealer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="reveal_child">False</property>
         <property name="valign">start</property>
         <child>
           <object class="GtkEntry" id="filter_entry">
diff --git a/plugins/pythonconsole/pythonconsole/config.ui b/plugins/pythonconsole/pythonconsole/config.ui
index 573be34..23cfff1 100644
--- a/plugins/pythonconsole/pythonconsole/config.ui
+++ b/plugins/pythonconsole/pythonconsole/config.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="grid">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="margin_start">12</property>
     <property name="margin_end">12</property>
     <property name="margin_top">12</property>
@@ -13,7 +12,6 @@
     <child>
       <object class="GtkLabel" id="label-command">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">C_ommand color:</property>
         <property name="use_underline">True</property>
@@ -27,7 +25,6 @@
     <child>
       <object class="GtkLabel" id="label-error">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">_Error color:</property>
         <property name="use_underline">True</property>
diff --git a/plugins/snippets/snippets/snippets.ui b/plugins/snippets/snippets/snippets.ui
index d6c7e3d..815c695 100644
--- a/plugins/snippets/snippets/snippets.ui
+++ b/plugins/snippets/snippets/snippets.ui
@@ -59,7 +59,6 @@
         <child>
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <child>
@@ -85,20 +84,16 @@
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolbar" id="toolbar">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="toolbar_style">icons</property>
                 <property name="icon_size">1</property>
                 <child>
                   <object class="GtkToolButton" id="add_snippet_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Create new snippet</property>
                     <property name="tooltip_text" translatable="yes">Create new snippet</property>
@@ -108,14 +103,12 @@
                     <signal name="clicked" handler="on_add_snippet_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="remove_snippet_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Delete selected snippet</property>
                     <property name="tooltip_text" translatable="yes">Delete selected snippet</property>
@@ -125,14 +118,12 @@
                     <signal name="clicked" handler="on_remove_snippet_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="import_snippets_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Import snippets</property>
                     <property name="tooltip_text" translatable="yes">Import snippets</property>
@@ -142,14 +133,12 @@
                     <signal name="clicked" handler="on_import_snippets_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="export_snippets_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Export selected snippets</property>
                     <property name="tooltip_text" translatable="yes">Export selected snippets</property>
@@ -159,7 +148,6 @@
                     <signal name="clicked" handler="on_export_snippets_button_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -168,21 +156,17 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="resize">False</property>
-            <property name="shrink">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="vbox_snippet">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window_snippet">
@@ -202,14 +186,11 @@
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">6</property>
                 <property name="margin_end">6</property>
                 <property name="margin_top">6</property>
@@ -219,7 +200,6 @@
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Activation</property>
                     <property name="use_markup">True</property>
@@ -228,37 +208,29 @@
                     </attributes>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">    </property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_tab_trigger">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes" comments="&quot;tab&quot; here means 
the tab key, not the notebook tab!">_Tab trigger:</property>
                             <property name="use_underline">True</property>
@@ -267,14 +239,11 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="hbox_tab_trigger">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkEntry" id="entry_tab_trigger">
                                 <property name="visible">True</property>
@@ -286,17 +255,12 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkImage" id="image_tab_trigger">
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="padding">3</property>
                                 <property name="position">1</property>
                               </packing>
@@ -305,14 +269,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_accelerator">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">S_hortcut key:</property>
                             <property name="use_underline">True</property>
@@ -321,8 +282,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -339,14 +298,11 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_drop_targets">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Drop targets:</property>
                             <property name="use_underline">True</property>
@@ -355,14 +311,11 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="combo_drop_targets">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="model">model1</property>
                             <property name="has_entry">True</property>
                             <child>
@@ -380,36 +333,26 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">True</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">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="resize">True</property>
-            <property name="shrink">True</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/sort/resources/ui/gedit-sort-plugin.ui b/plugins/sort/resources/ui/gedit-sort-plugin.ui
index 95a0e17..94d4a0f 100644
--- a/plugins/sort/resources/ui/gedit-sort-plugin.ui
+++ b/plugins/sort/resources/ui/gedit-sort-plugin.ui
@@ -9,7 +9,6 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="sort_dialog">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Sort</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
@@ -18,19 +17,16 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">10</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -38,15 +34,12 @@
                     <property name="label" translatable="yes">_Reverse order</property>
                     <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="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -54,13 +47,11 @@
                     <property name="label" translatable="yes">R_emove duplicates</property>
                     <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="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -70,13 +61,11 @@
                     <property name="label" translatable="yes">C_ase sensitive</property>
                     <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="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
@@ -84,20 +73,16 @@
                 <child>
                   <object class="GtkBox" id="hbox13">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">S_tart at column:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">col_num_spinbutton</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -109,49 +94,43 @@
                         <property name="numeric">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
-  <child type="action">
-    <object class="GtkButton" id="cancel">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Cancel</property>
-      <property name="use_underline">True</property>
-    </object>
-  </child>
-  <child type="action">
-    <object class="GtkButton" id="sort">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">_Sort</property>
-      <property name="can-default">True</property>
-      <property name="use_underline">True</property>
-    </object>
-  </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="sort">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Sort</property>
+        <property name="can-default">True</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
     <action-widgets>
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-5">sort</action-widget>
diff --git a/plugins/spell/resources/ui/languages-dialog.ui b/plugins/spell/resources/ui/languages-dialog.ui
index 6631114..8b63044 100644
--- a/plugins/spell/resources/ui/languages-dialog.ui
+++ b/plugins/spell/resources/ui/languages-dialog.ui
@@ -12,13 +12,11 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Select the _language of the current 
document.</property>
             <property name="use_underline">True</property>
             <property name="wrap">True</property>
@@ -26,9 +24,7 @@
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -50,7 +46,6 @@
           </object>
           <packing>
             <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/plugins/spell/resources/ui/spell-checker.ui b/plugins/spell/resources/ui/spell-checker.ui
index 8e23c6f..9270d26 100644
--- a/plugins/spell/resources/ui/spell-checker.ui
+++ b/plugins/spell/resources/ui/spell-checker.ui
@@ -11,19 +11,16 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="content">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Misspelled word:</property>
                 <property name="justify">center</property>
                 <property name="xalign">0</property>
@@ -36,7 +33,6 @@
             <child>
               <object class="GtkLabel" id="misspelled_word_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">word</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -53,7 +49,6 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Change _to:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -84,7 +79,6 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -93,22 +87,15 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Suggestions:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -126,7 +113,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -140,7 +126,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -156,7 +141,6 @@
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -171,7 +155,6 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -182,7 +165,6 @@
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
                 <property name="label" translatable="yes">User dictionary:</property>
                 <property name="use_markup">True</property>
@@ -200,7 +182,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -233,16 +214,8 @@
                 <property name="height">4</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/plugins/time/resources/ui/gedit-time-dialog.ui b/plugins/time/resources/ui/gedit-time-dialog.ui
index 811ad0f..da00b7c 100644
--- a/plugins/time/resources/ui/gedit-time-dialog.ui
+++ b/plugins/time/resources/ui/gedit-time-dialog.ui
@@ -2,29 +2,24 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="choose_format_dialog">
-    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Insert Date and Time</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="border_width">10</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkRadioButton" id="use_sel_format_radiobutton">
                 <property name="label" translatable="yes">Use the _selected format</property>
                 <property name="use_action_appearance">False</property>
                 <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="active">True</property>
@@ -34,7 +29,6 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -57,7 +51,6 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -66,7 +59,6 @@
                 <property name="use_action_appearance">False</property>
                 <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="active">True</property>
@@ -76,8 +68,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -92,14 +82,11 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="custom_format_example">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">1</property>
@@ -112,21 +99,13 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="help_button">
@@ -135,15 +114,9 @@
                 <property name="visible">True</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_underline">True</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
@@ -152,13 +125,10 @@
                 <property name="visible">True</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_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -174,17 +144,12 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/plugins/time/resources/ui/gedit-time-setup-dialog.ui 
b/plugins/time/resources/ui/gedit-time-setup-dialog.ui
index c2b14fb..135cbf2 100644
--- a/plugins/time/resources/ui/gedit-time-setup-dialog.ui
+++ b/plugins/time/resources/ui/gedit-time-setup-dialog.ui
@@ -2,19 +2,15 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="time_dialog">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Configure date/time plugin</property>
-    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
@@ -28,23 +24,17 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="time_dialog_content">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <property name="border_width">10</property>
             <property name="orientation">vertical</property>
@@ -52,7 +42,6 @@
             <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">When inserting date/time...</property>
                 <attributes>
@@ -60,15 +49,12 @@
                 </attributes>
               </object>
               <packing>
-                <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <child>
                   <object class="GtkRadioButton" id="always_prompt">
@@ -76,7 +62,6 @@
                     <property name="use_action_appearance">False</property>
                     <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="active">True</property>
@@ -86,7 +71,6 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -95,7 +79,6 @@
                     <property name="use_action_appearance">False</property>
                     <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="active">True</property>
@@ -106,7 +89,6 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -133,7 +115,6 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
                     <property name="width">2</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -142,7 +123,6 @@
                     <property name="use_action_appearance">False</property>
                     <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="active">True</property>
@@ -152,8 +132,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -168,14 +146,11 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom_format_example">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes" comments="Translators: This example should 
follow the date format defined in the entry above">01/11/2009 17:52:00</property>
@@ -187,21 +162,15 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </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">1</property>
           </packing>
         </child>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]