From 4bc283a4209fe9f11ddac86a05884dd037c5a89f Mon Sep 17 00:00:00 2001
From: fossfreedom <foss.freedom@gmail.com>
Date: Wed, 28 Jan 2015 20:40:04 +0000
Subject: [PATCH] remove lots of deprecated Gtk syntax

---
 coverart_export.py           |   1 +
 coverart_toolbar.py          |   2 +-
 ui/coverart_browser.ui       |   3 +-
 ui/coverart_browser_prefs.ui |  14 +----
 ui/coverart_leftsidebar.ui   |   1 -
 ui/coverart_rightsidebar.ui  |   1 -
 ui/coverart_topbar.ui        |  26 ++++-----
 ui/coverart_window.ui        | 103 ++++++++++++++++++++---------------
 8 files changed, 73 insertions(+), 78 deletions(-)

diff --git a/coverart_export.py b/coverart_export.py
index 348dd85..d43a1a9 100644
--- a/coverart_export.py
+++ b/coverart_export.py
@@ -83,6 +83,7 @@ class CoverArtExport(GObject.Object):
                                              'ui/coverart_exportembed.ui'))
         ui.connect_signals(self)
         embeddialog = ui.get_object('exportembeddialog')
+        embeddialog.set_transient_for(self.shell.props.window)
         folderchooserbutton = ui.get_object('folderchooserbutton')
         use_album_name_checkbutton = ui.get_object('use_album_name_checkbutton')
         open_filemanager_checkbutton = ui.get_object('open_filemanager_checkbutton')
diff --git a/coverart_toolbar.py b/coverart_toolbar.py
index 8dbbcda..2f09940 100644
--- a/coverart_toolbar.py
+++ b/coverart_toolbar.py
@@ -52,7 +52,7 @@ class Toolbar(GObject.Object):
         # create the toolbar
         builder = Gtk.Builder()
         builder.set_translation_domain(cl.Locale.LOCALE_DOMAIN)
-
+        print (ui_file)
         builder.add_from_file(ui_file)
 
         # assign the controllers to the buttons
diff --git a/ui/coverart_browser.ui b/ui/coverart_browser.ui
index 10c2f06..a627a58 100644
--- a/ui/coverart_browser.ui
+++ b/ui/coverart_browser.ui
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires coverart_widgets 1.0 -->
   <object class="GtkImage" id="cancel-icon">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-cancel</property>
+    <property name="icon_name">gtk-cancel</property>
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
diff --git a/ui/coverart_browser_prefs.ui b/ui/coverart_browser_prefs.ui
index 13f72af..2dc6ea4 100644
--- a/ui/coverart_browser_prefs.ui
+++ b/ui/coverart_browser_prefs.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkImage" id="add_image">
@@ -982,8 +982,6 @@ albums to play</property>
               <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>
@@ -1000,8 +998,6 @@ albums to play</property>
               <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>
@@ -1013,8 +1009,6 @@ albums to play</property>
               <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>
@@ -1026,8 +1020,6 @@ albums to play</property>
               <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>
@@ -1039,8 +1031,6 @@ albums to play</property>
               <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>
@@ -1052,8 +1042,6 @@ albums to play</property>
               <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>
diff --git a/ui/coverart_leftsidebar.ui b/ui/coverart_leftsidebar.ui
index 6e4c8d8..30713d2 100644
--- a/ui/coverart_leftsidebar.ui
+++ b/ui/coverart_leftsidebar.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires coverart_widgets 1.0 -->
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="toolbar">
     <property name="can_focus">False</property>
     <property name="valign">start</property>
diff --git a/ui/coverart_rightsidebar.ui b/ui/coverart_rightsidebar.ui
index b42b8b0..ad78731 100644
--- a/ui/coverart_rightsidebar.ui
+++ b/ui/coverart_rightsidebar.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires coverart_widgets 1.0 -->
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="toolbar">
     <property name="can_focus">False</property>
     <property name="valign">start</property>
diff --git a/ui/coverart_topbar.ui b/ui/coverart_topbar.ui
index 68cc980..9ea63db 100644
--- a/ui/coverart_topbar.ui
+++ b/ui/coverart_topbar.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires coverart_widgets 1.0 -->
+  <requires lib="coverart_widgets" version="1.0"/>
   <object class="GtkGrid" id="toolbar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="column-homogeneous">True</property>
+    <property name="column_homogeneous">True</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="visible">True</property>
@@ -17,7 +17,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
             <property name="relief">half</property>
           </object>
           <packing>
@@ -49,7 +48,6 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="margin_right">1</property>
-            <property name="use_action_appearance">False</property>
             <property name="relief">half</property>
           </object>
           <packing>
@@ -68,7 +66,6 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="margin_right">1</property>
-            <property name="use_action_appearance">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -79,14 +76,12 @@
         <child>
           <object class="PopupButton" id="sort_by_artist">
             <property name="use_action_appearance">False</property>
-            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="margin_right">1</property>
-            <property name="use_action_appearance">False</property>
             <property name="relief">half</property>
           </object>
           <packing>
@@ -98,14 +93,12 @@
         <child>
           <object class="ImageToggleButton" id="sort_order_artist">
             <property name="use_action_appearance">False</property>
-            <property name="visible">False</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="has_tooltip">True</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="margin_right">1</property>
-            <property name="use_action_appearance">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -161,7 +154,6 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="margin_right">1</property>
-            <property name="use_action_appearance">False</property>
             <property name="relief">half</property>
           </object>
           <packing>
@@ -201,8 +193,11 @@
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+      </packing>
     </child>
-    
     <child>
       <object class="GtkBox" id="box3">
         <property name="visible">True</property>
@@ -212,8 +207,8 @@
           <object class="GtkAlignment" id="entry_search_alignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xscale">0.50</property>
             <property name="xalign">1</property>
+            <property name="xscale">0.5</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -223,9 +218,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="left_attach">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
   </object>
diff --git a/ui/coverart_window.ui b/ui/coverart_window.ui
index 559cce4..9652ed1 100644
--- a/ui/coverart_window.ui
+++ b/ui/coverart_window.ui
@@ -1,23 +1,59 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="CoverWindow">
+    <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="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox">
+      <object class="GtkBox" id="vbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="vexpand">True</property>
+            <child>
+              <object class="GtkLayout" id="layout">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="width">400</property>
+                <property name="height">400</property>
+                <child>
+                  <object class="GtkImage" id="image">
+                    <property name="width_request">0</property>
+                    <property name="height_request">0</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">gtk-missing-image</property>
+                  </object>
+                </child>
+              </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">
             <property name="visible">True</property>
-            <property name="toolbar_style">text</property>
+            <property name="can_focus">False</property>
+            <property name="toolbar_style">icons</property>
             <child>
               <object class="GtkToolButton" id="save_as_button">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-save-as</property>
-                <signal name="clicked" handler="on_save_as_button_clicked"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-save-as</property>
+                <signal name="clicked" handler="on_save_as_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -27,8 +63,9 @@
             <child>
               <object class="GtkToolButton" id="zoom_in_button">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-zoom-in</property>
-                <signal name="clicked" handler="on_zoom_in_button_clicked"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-zoom-in</property>
+                <signal name="clicked" handler="on_zoom_in_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,8 +75,9 @@
             <child>
               <object class="GtkToolButton" id="zoom_out_button">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-zoom-out</property>
-                <signal name="clicked" handler="on_zoom_out_button_clicked"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-zoom-out</property>
+                <signal name="clicked" handler="on_zoom_out_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -49,8 +87,9 @@
             <child>
               <object class="GtkToolButton" id="zoom_100_button">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-zoom-100</property>
-                <signal name="clicked" handler="on_zoom_100_button_clicked"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-zoom-100</property>
+                <signal name="clicked" handler="on_zoom_100_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -60,8 +99,9 @@
             <child>
               <object class="GtkToolButton" id="zoom_fit_button">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-zoom-fit</property>
-                <signal name="clicked" handler="on_zoom_fit_button_clicked"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">gtk-zoom-fit</property>
+                <signal name="clicked" handler="on_zoom_fit_button_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -71,10 +111,11 @@
             <child>
               <object class="GtkToolButton" id="close_button">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-close</property>
+                <property name="icon_name">gtk-close</property>
+                <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
                 <accelerator key="Escape" signal="clicked"/>
-                <signal name="clicked" handler="on_close_button_clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -88,40 +129,14 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <child>
-              <object class="GtkLayout" id="layout">
-                <property name="visible">True</property>
-                <property name="has_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="width">400</property>
-                <property name="height">400</property>
-                <child>
-                  <object class="GtkImage" id="image">
-                    <property name="width_request">0</property>
-                    <property name="height_request">0</property>
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-missing-image</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>