[Xfce4-commits] <parole:master> GTK+3 Playlist.

Sean Davis noreply at xfce.org
Fri Oct 11 11:50:09 CEST 2013


Updating branch refs/heads/master
         to 5172df1b1d530b7ecccee022e397fa055ae3d207 (commit)
       from 2114d25306708c290ecaae4abdb9329cd8871e67 (commit)

commit 5172df1b1d530b7ecccee022e397fa055ae3d207
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Feb 17 11:25:30 2013 -0500

    GTK+3 Playlist.

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

diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 640e327..14d7218 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -15,7 +15,7 @@ if ENABLE_GTK3
 interfaces =					\
 	parole.ui				\
 	parole-settings-3.ui			\
-	playlist.ui				\
+	playlist-3.ui				\
 	mediachooser-3.ui				\
 	save-playlist-3.ui			\
 	plugins-3.ui				\
@@ -30,7 +30,7 @@ parole_ui.h: parole.ui
 parole-settings_ui.h: parole-settings-3.ui
 	xdt-csource --static --strip-comments --strip-content --name=parole_settings_ui $< > $@
 
-playlist_ui.h: playlist.ui
+playlist_ui.h: playlist-3.ui
 	xdt-csource --static --strip-comments --strip-content --name=playlist_ui $< > $@
 
 mediachooser_ui.h: mediachooser-3.ui
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist-3.ui
similarity index 83%
copy from data/interfaces/playlist.ui
copy to data/interfaces/playlist-3.ui
index 898fd26..30b5b09 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist-3.ui
@@ -1,16 +1,13 @@
 <?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="GtkMenu" id="dvd-menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="ubuntu_local">True</property>
     <child>
       <object class="GtkMenuItem" id="dvd-menu-menu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">DVD Menu</property>
         <property name="use_underline">True</property>
       </object>
@@ -19,7 +16,6 @@
       <object class="GtkMenuItem" id="dvd-menu-title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Title Menu</property>
         <property name="use_underline">True</property>
       </object>
@@ -28,7 +24,6 @@
       <object class="GtkMenuItem" id="dvd-menu-audio">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Audio Menu</property>
         <property name="use_underline">True</property>
       </object>
@@ -37,7 +32,6 @@
       <object class="GtkMenuItem" id="dvd-menu-angle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Angle Menu</property>
         <property name="use_underline">True</property>
       </object>
@@ -46,7 +40,6 @@
       <object class="GtkMenuItem" id="dvd-menu-chapter">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Chapter Menu</property>
         <property name="use_underline">True</property>
       </object>
@@ -88,23 +81,22 @@
     <property name="pixel_size">24</property>
     <property name="icon_name">media-playlist-shuffle</property>
   </object>
-  <object class="GtkVBox" id="playlist-box">
+  <object class="GtkBox" id="playlist-box">
     <property name="width_request">220</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkNotebook" id="playlist_notebook">
+      <object class="GtkNotebook" id="notebook1">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="tab_pos">bottom</property>
         <property name="show_tabs">False</property>
-        <property name="show_border">False</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <property name="window_placement_set">True</property>
             <property name="shadow_type">in</property>
             <child>
@@ -114,10 +106,13 @@
                 <property name="headers_visible">False</property>
                 <property name="rules_hint">True</property>
                 <signal name="drag-data-received" handler="parole_media_list_drag_data_received_cb" swapped="no"/>
-                <signal name="key-press-event" handler="parole_media_list_key_press" swapped="no"/>
                 <signal name="row-activated" handler="parole_media_list_row_activated_cb" swapped="no"/>
                 <signal name="button-release-event" handler="parole_media_list_button_release_event" swapped="no"/>
+                <signal name="key-press-event" handler="parole_media_list_key_press" swapped="no"/>
                 <signal name="query-tooltip" handler="parole_media_list_query_tooltip" swapped="no"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
               </object>
             </child>
           </object>
@@ -133,17 +128,18 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkToggleButton" id="dvd_menu_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
+                    <property name="width_request">220</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">3</property>
@@ -165,7 +161,6 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">DVD Name</property>
-                        <property name="ellipsize">end</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -182,7 +177,6 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -200,8 +194,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="window_placement_set">True</property>
                 <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTreeView" id="disc-list">
@@ -209,7 +201,9 @@
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
                     <property name="rules_hint">True</property>
-                    <signal name="row-activated" handler="parole_media_list_row_activated_cb" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection3"/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -243,7 +237,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="playlist_controls">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
@@ -253,10 +247,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Add…</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_add</property>
-            <property name="focus_on_click">False</property>
             <signal name="clicked" handler="parole_media_list_add_clicked_cb" swapped="no"/>
           </object>
           <packing>
@@ -271,10 +262,7 @@
             <property name="sensitive">False</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Remove</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_remove</property>
-            <property name="focus_on_click">False</property>
             <signal name="clicked" handler="parole_media_list_remove_clicked_cb" swapped="no"/>
           </object>
           <packing>
@@ -289,14 +277,11 @@
             <property name="sensitive">False</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Clear</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_clear</property>
-            <property name="focus_on_click">False</property>
             <signal name="clicked" handler="parole_media_list_clear_clicked_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
@@ -306,14 +291,11 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Repeat</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_repeat</property>
-            <property name="focus_on_click">False</property>
             <signal name="toggled" handler="parole_media_list_repeat_toggled_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
@@ -323,14 +305,11 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Shuffle</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_shuffle</property>
-            <property name="focus_on_click">False</property>
             <signal name="toggled" handler="parole_media_list_shuffle_toggled_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">4</property>
           </packing>
@@ -340,13 +319,10 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Playlist options</property>
-            <property name="use_action_appearance">False</property>
             <property name="image">image_settings</property>
-            <property name="focus_on_click">False</property>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">5</property>
           </packing>
@@ -367,7 +343,6 @@
       <object class="GtkCheckMenuItem" id="menu-repeat">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Repeat</property>
         <property name="use_underline">True</property>
       </object>
@@ -376,7 +351,6 @@
       <object class="GtkCheckMenuItem" id="menu-shuffle">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Shuffle</property>
         <property name="use_underline">True</property>
       </object>
@@ -385,14 +359,12 @@
       <object class="GtkSeparatorMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="menu-replace">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Replace playlist when opening files</property>
         <property name="use_underline">True</property>
       </object>
@@ -401,7 +373,6 @@
       <object class="GtkCheckMenuItem" id="menu-play-opened">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Play opened files</property>
         <property name="use_underline">True</property>
       </object>
@@ -410,7 +381,6 @@
       <object class="GtkCheckMenuItem" id="menu-remember">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Remember playlist</property>
         <property name="use_underline">True</property>
       </object>
@@ -419,14 +389,12 @@
       <object class="GtkSeparatorMenuItem" id="menuitem2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="menu-clear">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Clear</property>
         <property name="use_underline">True</property>
       </object>


More information about the Xfce4-commits mailing list