From a674f90a2d1d1573f194b1a620b3f78b9fa6752a Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Fri, 2 Mar 2018 13:00:05 +0100
Subject: python console: config.ui: avoid GtkButton:use-stock

---
 plugins/pythonconsole/pythonconsole/config.ui | 86 +++++++++++++++++----------
 1 file changed, 53 insertions(+), 33 deletions(-)

diff --git a/plugins/pythonconsole/pythonconsole/config.ui b/plugins/pythonconsole/pythonconsole/config.ui
index 14c36c70..8d337d6b 100644
--- a/plugins/pythonconsole/pythonconsole/config.ui
+++ b/plugins/pythonconsole/pythonconsole/config.ui
@@ -1,19 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.2 -->
 <interface>
-  <requires lib="gtk+" version="2.14"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close</property>
+  </object>
   <object class="GtkDialog" id="dialog-config">
+    <property name="can_focus">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="on_dialog_config_destroy"/>
-    <signal name="response" handler="on_dialog_config_response"/>
+    <signal name="destroy" handler="on_dialog_config_destroy" swapped="no"/>
+    <signal name="response" handler="on_dialog_config_response" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</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">
+                <property name="label" translatable="yes">_Close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">image1</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</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="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkTable" id="table2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
             <property name="n_rows">2</property>
             <property name="n_columns">2</property>
@@ -22,19 +58,21 @@
             <child>
               <object class="GtkLabel" id="label-command">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">C_ommand color:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">colorbutton-command</property>
+                <property name="xalign">0</property>
               </object>
             </child>
             <child>
               <object class="GtkLabel" id="label-error">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Error color:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">colorbutton-error</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -47,7 +85,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="color">#31314e4e6c6c</property>
-                <signal name="color_set" handler="on_colorbutton_command_color_set"/>
+                <signal name="color-set" handler="on_colorbutton_command_color_set" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -60,7 +98,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="color">#999900000000</property>
-                <signal name="color_set" handler="on_colorbutton_error_color_set"/>
+                <signal name="color-set" handler="on_colorbutton_error_color_set" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -70,31 +108,10 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -102,5 +119,8 @@
     <action-widgets>
       <action-widget response="-7">button1</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
-- 
cgit v1.2.1