[gnome-music/wip/mschraal/gtk4: 68/84] playlistdialog: assorted fixes

[Marinus Schraal <mschraal src gnome org>]

commit 2080934f6599ab3fb1c5251d27f8c210bd5b3761
Author: Marinus Schraal <mschraal gnome org>
Date:   Sun May 3 13:03:05 2020 +0200

    playlistdialog: assorted fixes

 data/ui/PlaylistDialog.ui | 204 ++++++++++++++--------------------------------
 1 file changed, 62 insertions(+), 142 deletions(-)
---
diff --git a/data/ui/PlaylistDialog.ui b/data/ui/PlaylistDialog.ui
index 7e43c8b1..7db9a5ee 100644
--- a/data/ui/PlaylistDialog.ui
+++ b/data/ui/PlaylistDialog.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="PlaylistDialog" parent="GtkDialog">
@@ -8,21 +7,13 @@
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox">
+        <property name="visible">False</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkStack" id="_add_playlist_stack">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
@@ -34,57 +25,49 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="valign">fill</property>
                     <property name="vexpand">True</property>
-                    <property name="margin">18</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
                     <child>
                       <object class="GtkImage" id="image">
-                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
                         <property name="pixel_size">100</property>
                         <property name="icon_name">emblem-music-symbolic</property>
-                        <property name="icon_size">0</property>
                         <property name="margin_bottom">16</property>
                         <property name="vexpand">True</property>
                         <style>
                           <class name="grey-image"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label">
-                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Enter a name for your first 
playlist</property>
                         <property name="valign">end</property>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="_first_playlist_entry">
                         <property name="width_request">300</property>
                         <property name="height_request">10</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="halign">center</property>
                         <property name="margin_bottom">16</property>
-                        <property name="margin">18</property>
+                        <property name="margin-start">18</property>
+                        <property name="margin-end">18</property>
+                        <property name="margin-top">18</property>
+                        <property name="margin-bottom">18</property>
                         <signal name="activate" handler="_on_editing_done" swapped="no"/>
                         <signal name="changed" handler="_on_add_playlist_entry_changed" swapped="no"/>
+<!--
                         <signal name="focus-in-event" handler="_on_add_playlist_entry_focused" swapped="no"/>
+-->
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="_first_playlist_button">
@@ -92,183 +75,120 @@
                         <property name="use_underline">True</property>
                         <property name="width_request">120</property>
                         <property name="height_request">25</property>
-                        <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                         <property name="margin_top">10</property>
                         <property name="margin_bottom">20</property>
-                        <property name="margin">18</property>
+                        <property name="margin-start">18</property>
+                        <property name="margin-end">18</property>
+                        <property name="margin-top">18</property>
+                        <property name="margin-bottom">18</property>
                         <signal name="clicked" handler="_on_editing_done" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButtonBox">
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox" id="_normal_box">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
+              <object class="GtkStackPage">
+                <property name="child">
+                  <object class="GtkBox" id="_normal_box">
+                    <property name="visible">False</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkSeparator">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                      <object class="GtkScrolledWindow" id="scrolledwindow">
+                        <property name="vexpand">True</property>
+                        <child>
+                          <object class="GtkListBox" id="_listbox">
+                            <property name="valign">start</property>
+                            <signal name="selected-rows-changed" handler="_on_selected_rows_changed" 
swapped="no"/>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="new-playlist-hbox">
-                        <property name="visible">True</property>
+                      <object class="GtkBox">
                         <property name="can_focus">False</property>
-                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkEntry" id="_new_playlist_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="placeholder_text" translatable="yes">New Playlist…</property>
-                            <signal name="activate" handler="_on_editing_done" swapped="no"/>
-                            <signal name="changed" handler="_on_add_playlist_entry_changed" swapped="no"/>
-                            <signal name="focus-in-event" handler="_on_add_playlist_entry_focused" 
swapped="no"/>
-                            <style>
-                              <class name="linked"/>
-                            </style>
+                          <object class="GtkSeparator">
+                            <property name="can_focus">False</property>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="_new_playlist_button">
-                            <property name="label" translatable="yes">Add</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <signal name="clicked" handler="_on_editing_done" swapped="no"/>
+                          <object class="GtkBox" id="new-playlist-hbox">
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkEntry" id="_new_playlist_entry">
+                                <property name="hexpand">True</property>
+                                <property name="placeholder_text" translatable="yes">New Playlist…</property>
+                                <signal name="activate" handler="_on_editing_done" swapped="no"/>
+                                <signal name="changed" handler="_on_add_playlist_entry_changed" 
swapped="no"/>
+<!--
+                                <signal name="focus-in-event" handler="_on_add_playlist_entry_focused" 
swapped="no"/>
+-->
+                                <style>
+                                  <class name="linked"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="_new_playlist_button">
+                                <property name="label" translatable="yes">Add</property>
+                                <property name="sensitive">False</property>
+                                <signal name="clicked" handler="_on_editing_done" swapped="no"/>
+                                <style>
+                                  <class name="suggested-action"/>
+                                  <class name="linked"/>
+                                </style>
+                              </object>
+                            </child>
                             <style>
-                              <class name="suggested-action"/>
                               <class name="linked"/>
                             </style>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
-                        <style>
-                          <class name="linked"/>
-                        </style>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <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="GtkListBox" id="_listbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="selection_mode">single</property>
-                        <property name="valign">start</property>
-                        <signal name="selected-rows-changed" handler="_on_selected_rows_changed" 
swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButtonBox">
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
   </template>
   <object class="GtkHeaderBar" id="_title_bar">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Add to Playlist</property>
-    <child>
+    <child type="start">
       <object class="GtkButton" id="_cancel_button">
         <property name="label" translatable="yes">_Cancel</property>
         <property name="use_underline">True</property>
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/>
         <style>
           <class name="text-button"/>
         </style>
       </object>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkButton" id="_select_button">
         <property name="label" translatable="yes">_Add</property>
         <property name="sensitive">False</property>
         <property name="use_underline">True</property>
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="receives_default">False</property>
         <signal name="clicked" handler="_on_selection" swapped="no"/>
         <style>
           <class name="suggested-action"/>
           <class name="text-button"/>
         </style>
       </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">1</property>
-      </packing>
     </child>
   </object>
 </interface>