av-cp: Move Playlist TreeModel & columns to glade

Signed-off-by: Jens Georg <mail@jensge.org>

1 files changed, 115 insertions, 75 deletions

diff --git a/data/gupnp-av-cp.ui.in b/data/gupnp-av-cp.ui.in
index ff56838..bdd15a4 100644
--- a/data/gupnp-av-cp.ui.in
+++ b/data/gupnp-av-cp.ui.in
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkAboutDialog" id="about-dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">12</property>
-    <property name="type_hint">normal</property>
-    <property name="transient_for">main-window</property>
-    <property name="copyright" translatable="yes">Copyright (C) 2007 Zeeshan Ali (Khattak)</property>
-    <property name="comments" translatable="yes">An UPnP AV Control Point based on GUPnP framework.
-Inspired by Intel Tools for UPnP.</property>
-    <property name="website">http://www.gupnp.org</property>
-    <property name="website_label" translatable="yes">GUPnP homepage</property>
-    <property name="authors">Zeeshan Ali (Khattak) &lt;zeeshanak@gnome.org&gt;</property>
-    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
-    <property name="artists">Lapo Calamandrei &lt;calamandrei@gmail.com&gt;
-Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
-    <property name="logo_icon_name">image-missing</property>
-    <property name="license_type">gpl-2-0</property>
-    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-          </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>
-    </child>
-  </object>
+  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtksourceview" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -47,6 +13,47 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkMenu" id="playlist-popup">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="play-menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">_Play</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_play_button_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="didl-menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Fetch the DIDL-Lite XML for this media object</property>
+        <property name="label" translatable="yes">Fetch _DIDL-Lite</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_didl_menuitem_activate" swapped="no"/>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTreeStore" id="playlist-tree-store">
+    <columns>
+      <!-- column-name icon -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name title -->
+      <column type="gchararray"/>
+      <!-- column-name device_proxy -->
+      <column type="GObject"/>
+      <!-- column-name service_proxy -->
+      <column type="GObject"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name is_container -->
+      <column type="gboolean"/>
+      <!-- column-name child_count -->
+      <column type="gint"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="main-window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">GUPnP AV Control Point</property>
@@ -55,6 +62,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_bottom">12</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
@@ -569,13 +577,34 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                       <object class="GtkTreeView" id="playlist-treeview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="model">playlist-tree-store</property>
                         <property name="headers_visible">False</property>
                         <signal name="button-release-event" handler="on_playlist_treeview_button_release" swapped="no"/>
                         <signal name="row-activated" handler="on_play_button_clicked" swapped="no"/>
                         <signal name="row-collapsed" handler="on_playlist_row_collapsed" swapped="no"/>
                         <signal name="row-expanded" handler="on_playlist_row_expanded" swapped="no"/>
                         <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                          <object class="GtkTreeSelection" id="playlist-treeview-selection">
+                            <signal name="changed" handler="on_playlist_treeview_item_selected" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn">
+                            <property name="sizing">autosize</property>
+                            <property name="title" translatable="yes">column</property>
+                            <child>
+                              <object class="GtkCellRendererPixbuf"/>
+                              <attributes>
+                                <attribute name="pixbuf">0</attribute>
+                              </attributes>
+                            </child>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
@@ -598,28 +627,49 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
             <property name="top_attach">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkStatusbar" id="statusbar">
-            <property name="visible">True</property>
+      </object>
+    </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+  </object>
+  <object class="GtkAboutDialog" id="about-dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="type_hint">normal</property>
+    <property name="transient_for">main-window</property>
+    <property name="copyright" translatable="yes">Copyright (C) 2007 Zeeshan Ali (Khattak)</property>
+    <property name="comments" translatable="yes">An UPnP AV Control Point based on GUPnP framework.
+Inspired by Intel Tools for UPnP.</property>
+    <property name="website">http://www.gupnp.org</property>
+    <property name="website_label" translatable="yes">GUPnP homepage</property>
+    <property name="authors">Zeeshan Ali (Khattak) &lt;zeeshanak@gnome.org&gt;</property>
+    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
+    <property name="artists">Lapo Calamandrei &lt;calamandrei@gmail.com&gt;
+Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
+    <property name="logo_icon_name">image-missing</property>
+    <property name="license_type">gpl-2-0</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
-  </object>
-  <object class="GtkSizeGroup" id="playback-button-sizegroup">
-    <widgets>
-      <widget name="play-button"/>
-      <widget name="pause-button"/>
-      <widget name="stop-button"/>
-      <widget name="previous-button"/>
-      <widget name="next-button"/>
-      <widget name="rescan-button"/>
-    </widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
   <object class="GtkDialog" id="didl-dialog">
     <property name="width_request">640</property>
@@ -627,8 +677,8 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">GUPnP AV CP - Metadata View</property>
-    <property name="transient_for">main-window</property>
     <property name="type_hint">normal</property>
+    <property name="transient_for">main-window</property>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -687,28 +737,18 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
     <action-widgets>
       <action-widget response="0">didl-close-button</action-widget>
     </action-widgets>
-  </object>
-  <object class="GtkMenu" id="playlist-popup">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="play-menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Play</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_play_button_clicked" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="didl-menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Fetch the DIDL-Lite XML for this media object</property>
-        <property name="label" translatable="yes">Fetch _DIDL-Lite</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_didl_menuitem_activate" swapped="no"/>
-      </object>
+      <placeholder/>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="playback-button-sizegroup">
+    <widgets>
+      <widget name="play-button"/>
+      <widget name="pause-button"/>
+      <widget name="stop-button"/>
+      <widget name="previous-button"/>
+      <widget name="next-button"/>
+      <widget name="rescan-button"/>
+    </widgets>
+  </object>
 </interface>