[Xfce4-commits] <parole:bluesabre/gtk3> GTK+3 Save Playlist dialog.

[Sean Davis]

Updating branch refs/heads/bluesabre/gtk3
         to 2114d25306708c290ecaae4abdb9329cd8871e67 (commit)
       from 9a37941ca3c6cd55c31fd5171f6324891187c5c1 (commit)

commit 2114d25306708c290ecaae4abdb9329cd8871e67
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Feb 17 09:44:01 2013 -0500

    GTK+3 Save Playlist dialog.

 data/interfaces/Makefile.am                        |    4 +-
 .../{save-playlist.ui => save-playlist-3.ui}       |   36 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index cad214a..640e327 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -17,7 +17,7 @@ interfaces =					\
 	parole-settings-3.ui			\
 	playlist.ui				\
 	mediachooser-3.ui				\
-	save-playlist.ui			\
+	save-playlist-3.ui			\
 	plugins-3.ui				\
 	open-location-3.ui
 
@@ -36,7 +36,7 @@ playlist_ui.h: playlist.ui
 mediachooser_ui.h: mediachooser-3.ui
 	xdt-csource --static --strip-comments --strip-content --name=mediachooser_ui $< > $@
 
-save-playlist_ui.h: save-playlist.ui
+save-playlist_ui.h: save-playlist-3.ui
 	xdt-csource --static --strip-comments --strip-content --name=save_playlist_ui $< > $@
 
 open-location_ui.h: open-location-3.ui
diff --git a/data/interfaces/save-playlist.ui b/data/interfaces/save-playlist-3.ui
similarity index 85%
copy from data/interfaces/save-playlist.ui
copy to data/interfaces/save-playlist-3.ui
index 68bb6b8..5a2d511 100644
--- a/data/interfaces/save-playlist.ui
+++ b/data/interfaces/save-playlist-3.ui
@@ -1,53 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFileChooserDialog" id="filechooserdialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
+    <property name="role">GtkFileChooserDialog</property>
     <property name="window_position">center-on-parent</property>
-    <property name="type_hint">normal</property>
+    <property name="type_hint">dialog</property>
     <property name="action">save</property>
     <property name="do_overwrite_confirmation">True</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
+      <object class="GtkBox" id="filechooserdialog-vbox1">
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
+          <object class="GtkButtonBox" id="filechooserdialog-action_area1">
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button2">
+              <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_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="parole_media_list_close_save_dialog_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkButton" id="button2">
                 <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="parole_media_list_save_playlist_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -69,9 +66,12 @@
                 <property name="can_focus">True</property>
                 <property name="model">liststore</property>
                 <signal name="cursor-changed" handler="parole_media_list_format_cursor_changed_cb" swapped="no"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="title">File Type</property>
+                    <property name="title" translatable="yes">File Type</property>
                     <property name="expand">True</property>
                     <child>
                       <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -83,7 +83,7 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                    <property name="title">Extension</property>
+                    <property name="title" translatable="yes">Extension</property>
                     <child>
                       <object class="GtkCellRendererText" id="cellrenderertext2"/>
                       <attributes>
@@ -104,15 +104,15 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button2</action-widget>
       <action-widget response="0">button1</action-widget>
+      <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
   <object class="GtkListStore" id="liststore">
@@ -127,7 +127,7 @@
     <data>
       <row>
         <col id="0" translatable="yes">By Extension</col>
-        <col id="1" translatable="yes"></col>
+        <col id="1" translatable="yes"/>
         <col id="2">0</col>
       </row>
     </data>