gtk-adwaita: Proper style for playback UI

Changes

3 changed files (+55/-62)

• gtk-adwaita/data/ui/main-window.ui
  • @@ -24,24 +24,10 @@ <property name="title">Plac</property>
    <style> <class name="devel" /> </style> - <child> - <object class="AdwBreakpoint"> - <condition>max-width: 640sp</condition> - <setter object="switcher_bar" property="reveal">true</setter> - <setter object="header_bar" property="title-widget" /> - </object> - </child> <property name="content"> <object class="AdwToolbarView"> <child type="top"> - <object class="AdwHeaderBar" id="header_bar"> - <property name="title-widget"> - <object class="AdwViewSwitcher"> - <property name="stack">stack</property> - <property name="policy">wide</property> - </object> - </property> - </object> + <object class="AdwHeaderBar" /> </child> <property name="content"> <object class="GtkBox">
  • @@ -62,30 +48,7 @@ <child>
    <object class="GtkStackPage"> <property name="name">main</property> <property name="child"> - <object class="AdwViewStack" id="stack"> - <child> - <object class="AdwViewStackPage"> - <property name="name">playback</property> - <property name="title">Playback</property> - <property name="icon-name">sound-symbolic</property> - <property name="child"> - <object class="PlacGtkAdwaitaPlaybackToolbar" id="playback_toolbar" /> - </property> - </object> - </child> - <child> - <object class="AdwViewStackPage"> - <property name="name">library</property> - <property name="title">Library</property> - <property name="icon-name">library-music-symbolic</property> - <property name="child"> - <object class="GtkLabel" id="test_label"> - <property name="label">Empty</property> - </object> - </property> - </object> - </child> - </object> + <object class="GtkLabel" id="test_label" /> </property> </object> </child>
  • @@ -102,8 +65,9 @@ </child>
    </object> </property> <child type="bottom"> - <object class="AdwViewSwitcherBar" id="switcher_bar"> - <property name="stack">stack</property> + <object class="PlacGtkAdwaitaPlaybackToolbar" id="playback_toolbar"> + <property name="halign">fill</property> + <property name="visible">false</property> </object> </child> </object>
• gtk-adwaita/data/ui/playback-toolbar.ui
  • @@ -21,12 +21,14 @@ <template class="PlacGtkAdwaitaPlaybackToolbar" parent="GtkBox">
    <property name="orientation">vertical</property> <property name="halign">center</property> <property name="valign">end</property> - <style> - <class name="toolbar" /> - </style> + <property name="spacing">2</property> + <property name="margin-bottom">4</property> <child> <object class="GtkBox"> <property name="orientation">horizontal</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> + <property name="spacing">8</property> <child> <object class="GtkBox"> <property name="orientation">vertical</property>
  • @@ -51,11 +53,42 @@ </object>
    </child> </object> </child> + <child> + <object class="GtkMenuButton"> + <style> + <class name="flat" /> + </style> + <property name="label">Zone</property> + <property name="popover"> + <object class="GtkPopover" id="zone_list_popover"> + <child> + <object class="GtkListBox" id="zone_list"> + <style> + <class name="navigation-sidebar" /> + </style> + </object> + </child> + </object> + </property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="orientation">horizontal</property> + <property name="margin-start">3</property> + <property name="margin-end">12</property> + <property name="spacing">8</property> <child> <object class="GtkBox"> <property name="orientation">horizontal</property> + <property name="spacing">2</property> <child> <object class="GtkButton" id="prev"> + <style> + <class name="flat" /> + </style> <property name="label">Previous</property> <property name="icon-name">skip-backward-large-symbolic</property> <property name="action-name">prev_current_zone</property>
  • @@ -63,6 +96,9 @@ </object>
    </child> <child> <object class="GtkButton" id="play"> + <style> + <class name="flat" /> + </style> <property name="label">Play</property> <property name="icon-name">play-large-symbolic</property> <property name="action-name">play_current_zone</property>
  • @@ -70,6 +106,9 @@ </object>
    </child> <child> <object class="GtkButton" id="pause"> + <style> + <class name="flat" /> + </style> <property name="label">Pause</property> <property name="icon-name">pause-large-symbolic</property> <property name="action-name">pause_current_zone</property>
  • @@ -77,6 +116,9 @@ </object>
    </child> <child> <object class="GtkButton" id="next"> + <style> + <class name="flat" /> + </style> <property name="label">Skip Next</property> <property name="icon-name">skip-forward-large-symbolic</property> <property name="action-name">next_current_zone</property>
  • @@ -85,26 +127,11 @@ </child>
    </object> </child> <child> - <object class="GtkMenuButton"> - <property name="label">Zone</property> - <property name="popover"> - <object class="GtkPopover" id="zone_list_popover"> - <child> - <object class="GtkListBox" id="zone_list"> - <style> - <class name="navigation-sidebar" /> - </style> - </object> - </child> - </object> - </property> + <object class="GtkScale" id="seek"> + <property name="hexpand">true</property> + <property name="orientation">horizontal</property> </object> </child> - </object> - </child> - <child> - <object class="GtkScale" id="seek"> - <property name="orientation">horizontal</property> </object> </child> </template>
• gtk-adwaita/src/Windows/MainWindow.vala
  • @@ -98,10 +98,12 @@ test_label.label = server.name;
    conn.connection_started.connect(() => { root_stack.visible_child_name = "loading"; + playback_toolbar.visible = false; }); conn.connected.connect((event) => { root_stack.visible_child_name = "main"; + playback_toolbar.visible = true; settings.connected_server_id = server_id; settings.connected_server_token = event.token;