mpris.py: convert from glade to gtk builder

thanks to mirsal

diff --git a/extras/misc/mpris.py b/extras/misc/mpris.py
index 67a6e79d6ec7ef7767bf952d3a42a41a6a757d1c..4f26bfcd919cc14b9cc5a04e74584890b7e0c944 100755 (executable)
--- a/extras/misc/mpris.py
+++ b/extras/misc/mpris.py
@@ -37,7 +37,6 @@ import dbus.glib
 
 # core interface stuff
 import gtk
-import gtk.glade
 
 # timer
 import gobject
@@ -287,34 +286,35 @@ def GetPlayStatus(widget):
     bt_loop.set_active( loop )
     repeat = status[3] == 1
     bt_repeat.set_active( repeat )
-# loads glade file from the directory where the script is,
+# loads UI file from the directory where the script is,
 # so we can use /path/to/mpris.py to execute it.
 import sys
-xml = gtk.glade.XML(os.path.join(os.path.dirname(sys.argv[0]) , 'mpris.glade'))
+xml = gtk.Builder()
+gtk.Builder.add_from_file(xml, os.path.join(os.path.dirname(sys.argv[0]) , 'mpris.xml'))
 
 # ui setup
-bt_close    = xml.get_widget('close')
-bt_quit     = xml.get_widget('quit')
-bt_file     = xml.get_widget('ChooseFile')
-bt_next     = xml.get_widget('next')
-bt_prev     = xml.get_widget('prev')
-bt_stop     = xml.get_widget('stop')
-bt_toggle   = xml.get_widget('toggle')
-bt_mrl      = xml.get_widget('AddMRL')
-bt_shuffle  = xml.get_widget('shuffle')
-bt_repeat   = xml.get_widget('repeat')
-bt_loop     = xml.get_widget('loop')
-l_artist    = xml.get_widget('l_artist')
-l_title     = xml.get_widget('l_title')
-e_mrl       = xml.get_widget('mrl')
-window      = xml.get_widget('window1')
-img_bt_toggle=xml.get_widget('image6')
-exp         = xml.get_widget('expander2')
-expvbox     = xml.get_widget('expandvbox')
-audioicon   = xml.get_widget('eventicon')
-vol         = xml.get_widget('vol')
-time_s      = xml.get_widget('time_s')
-time_l      = xml.get_widget('time_l')
+bt_close    = xml.get_object('close')
+bt_quit     = xml.get_object('quit')
+bt_file     = xml.get_object('ChooseFile')
+bt_next     = xml.get_object('next')
+bt_prev     = xml.get_object('prev')
+bt_stop     = xml.get_object('stop')
+bt_toggle   = xml.get_object('toggle')
+bt_mrl      = xml.get_object('AddMRL')
+bt_shuffle  = xml.get_object('shuffle')
+bt_repeat   = xml.get_object('repeat')
+bt_loop     = xml.get_object('loop')
+l_artist    = xml.get_object('l_artist')
+l_title     = xml.get_object('l_title')
+e_mrl       = xml.get_object('mrl')
+window      = xml.get_object('window1')
+img_bt_toggle=xml.get_object('image6')
+exp         = xml.get_object('expander2')
+expvbox     = xml.get_object('expandvbox')
+audioicon   = xml.get_object('eventicon')
+vol         = xml.get_object('vol')
+time_s      = xml.get_object('time_s')
+time_l      = xml.get_object('time_l')
 
 # connect to the different callbacks
 

diff --git a/extras/misc/mpris.glade b/extras/misc/mpris.xml
similarity index 70%
rename from extras/misc/mpris.glade
rename to extras/misc/mpris.xml
index de6aa30bbd4eab0bb0b25cfe53baf09c59be9b8c..fe71e6f81771c4f9b080c73eaaef87fbf3ea71e2 100644 (file)
--- a/extras/misc/mpris.glade
+++ b/extras/misc/mpris.xml
@@ -1,91 +1,102 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
 <!--Generated with glade3 3.3.4 on Fri Sep 14 02:55:34 2007 -->
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">1000</property>
+    <property name="lower">0</property>
+    <property name="page_increment">100</property>
+    <property name="step_increment">10</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="lower">0</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">100</property>
+  </object>
+  <object class="GtkWindow" id="window1">
     <property name="resizable">False</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
     <child>
-      <widget class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="hbox1">
+          <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
             <property name="homogeneous">True</property>
             <child>
-              <widget class="GtkButton" id="prev">
+              <object class="GtkButton" id="prev">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Previous</property>
+                <property name="tooltip-text" translatable="yes">Previous</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image8">
+                  <object class="GtkImage" id="image8">
                     <property name="visible">True</property>
                     <property name="stock">gtk-media-previous</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="toggle">
+              <object class="GtkButton" id="toggle">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Play/Pause</property>
+                <property name="tooltip-text" translatable="yes">Play/Pause</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image6">
+                  <object class="GtkImage" id="image6">
                     <property name="visible">True</property>
                     <property name="stock">gtk-media-play</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="next">
+              <object class="GtkButton" id="next">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Next</property>
+                <property name="tooltip-text" translatable="yes">Next</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image1">
+                  <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="stock">gtk-media-next</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="stop">
+              <object class="GtkButton" id="stop">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Stop</property>
+                <property name="tooltip-text" translatable="yes">Stop</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image9">
+                  <object class="GtkImage" id="image9">
                     <property name="visible">True</property>
                     <property name="stock">gtk-media-stop</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -93,175 +104,170 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="quit">
+              <object class="GtkButton" id="quit">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Quit Player</property>
+                <property name="tooltip-text" translatable="yes">Quit Player</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image5">
+                  <object class="GtkImage" id="image5">
                     <property name="width_request">26</property>
                     <property name="height_request">26</property>
                     <property name="visible">True</property>
                     <property name="stock">gtk-quit</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">4</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="close">
+              <object class="GtkButton" id="close">
                 <property name="width_request">37</property>
                 <property name="height_request">37</property>
                 <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Close controller</property>
+                <property name="tooltip-text" translatable="yes">Close controller</property>
                 <property name="relief">GTK_RELIEF_NONE</property>
-                <property name="response_id">0</property>
                 <child>
-                  <widget class="GtkImage" id="image2">
+                  <object class="GtkImage" id="image2">
                     <property name="visible">True</property>
                     <property name="stock">gtk-close</property>
-                  </widget>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">5</property>
               </packing>
             </child>
-          </widget>
+          </object>
         </child>
         <child>
-          <widget class="GtkExpander" id="expander2">
+          <object class="GtkExpander" id="expander2">
             <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Show more options</property>
+            <property name="tooltip-text" translatable="yes">Show more options</property>
             <child>
-              <widget class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox5">
+                  <object class="GtkHBox" id="hbox5">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkToggleButton" id="loop">
+                      <object class="GtkToggleButton" id="loop">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">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="tooltip" translatable="yes">Loop playlist</property>
-                        <property name="response_id">0</property>
+                        <property name="tooltip-text" translatable="yes">Loop playlist</property>
                         <child>
-                          <widget class="GtkImage" id="image3">
+                          <object class="GtkImage" id="image3">
                             <property name="visible">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="stock">gtk-missing-image</property>
                             <property name="icon_name">media-playlist-repeat</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkToggleButton" id="repeat">
+                      <object class="GtkToggleButton" id="repeat">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">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="tooltip" translatable="yes">Repeat current</property>
-                        <property name="response_id">0</property>
+                        <property name="tooltip-text" translatable="yes">Repeat current</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox6">
+                          <object class="GtkHBox" id="hbox6">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkLabel" id="label1">
+                              <object class="GtkLabel" id="label1">
                                 <property name="visible">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="label" translatable="yes">1.</property>
-                              </widget>
+                              </object>
                             </child>
                             <child>
-                              <widget class="GtkImage" id="image10">
+                              <object class="GtkImage" id="image10">
                                 <property name="visible">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="stock">gtk-missing-image</property>
                                 <property name="icon_name">media-playlist-repeat</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkToggleButton" id="shuffle">
+                      <object class="GtkToggleButton" id="shuffle">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">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="tooltip" translatable="yes">Randomize playlist order</property>
-                        <property name="response_id">0</property>
+                        <property name="tooltip-text" translatable="yes">Randomize playlist order</property>
                         <child>
-                          <widget class="GtkImage" id="image7">
+                          <object class="GtkImage" id="image7">
                             <property name="visible">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="stock">gtk-missing-image</property>
                             <property name="icon_name">media-playlist-shuffle</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox2">
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkHScale" id="time_s">
+                      <object class="GtkHScale" id="time_s">
                         <property name="width_request">180</property>
                         <property name="height_request">20</property>
                         <property name="visible">True</property>
-                        <property name="adjustment">0 0 1000 10 100 0</property>
+                        <property name="adjustment">adjustment1</property>
                         <property name="digits">-1</property>
                         <property name="draw_value">False</property>
                         <property name="value_pos">GTK_POS_RIGHT</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="vol">
+                      <object class="GtkSpinButton" id="vol">
                         <property name="width_request">42</property>
                         <property name="height_request">20</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Volume in %</property>
+                        <property name="tooltip-text" translatable="yes">Volume in %</property>
                         <property name="editable">False</property>
-                        <property name="adjustment">100 0 100 1 10 0</property>
+                        <property name="adjustment">adjustment2</property>
                         <property name="snap_to_ticks">True</property>
                         <property name="numeric">True</property>
                         <property name="update_policy">GTK_UPDATE_IF_VALID</property>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -269,73 +275,72 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox4">
+                  <object class="GtkHBox" id="hbox4">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkVBox" id="expandvbox">
+                      <object class="GtkVBox" id="expandvbox">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkFileChooserButton" id="ChooseFile">
+                          <object class="GtkFileChooserButton" id="ChooseFile">
                             <property name="width_request">185</property>
                             <property name="height_request">35</property>
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Choose a directory</property>
+                            <property name="tooltip-text" translatable="yes">Choose a directory</property>
                             <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                             <property name="title" translatable="yes">Select Da Directory !</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="mrl">
+                          <object class="GtkEntry" id="mrl">
                             <property name="width_request">185</property>
                             <property name="height_request">20</property>
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Enter a full MRL</property>
-                          </widget>
+                            <property name="tooltip-text" translatable="yes">Enter a full MRL</property>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkFixed" id="fixed1">
+                      <object class="GtkFixed" id="fixed1">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkButton" id="AddMRL">
+                          <object class="GtkButton" id="AddMRL">
                             <property name="width_request">35</property>
                             <property name="height_request">35</property>
                             <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Add MRL, or directory if empty</property>
+                            <property name="tooltip-text" translatable="yes">Add MRL, or directory if empty</property>
                             <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
                             <child>
-                              <widget class="GtkImage" id="image4">
+                              <object class="GtkImage" id="image4">
                                 <property name="width_request">100</property>
                                 <property name="height_request">80</property>
                                 <property name="visible">True</property>
-                                <property name="tooltip" translatable="yes">Add to playlist</property>
+                                <property name="tooltip-text" translatable="yes">Add to playlist</property>
                                 <property name="stock">gtk-add</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="y">10</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="l_artist">
+                  <object class="GtkLabel" id="l_artist">
                     <property name="width_request">180</property>
                     <property name="height_request">20</property>
                     <property name="visible">True</property>
@@ -343,16 +348,16 @@
                     <property name="wrap">True</property>
                     <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="l_title">
+                      <object class="GtkLabel" id="l_title">
                         <property name="width_request">180</property>
                         <property name="height_request">20</property>
                         <property name="visible">True</property>
@@ -360,47 +365,44 @@
                         <property name="wrap">True</property>
                         <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
                         <property name="single_line_mode">True</property>
-                      </widget>
+                      </object>
                     </child>
                     <child>
-                      <widget class="GtkEventBox" id="eventicon">
+                      <object class="GtkEventBox" id="eventicon">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkImage" id="audioicon">
+                          <object class="GtkImage" id="audioicon">
                             <property name="visible">True</property>
-                            <property name="events"></property>
-                            <property name="tooltip" translatable="yes">Update meta info</property>
+                            <property name="events"/>
+                            <property name="tooltip-text" translatable="yes">Update meta info</property>
                             <property name="xpad">8</property>
                             <property name="icon_name">audio-x-generic</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">4</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label2">
+            <child type="label">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">More</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>