gtk-adwaita: Skip forward and backward buttons

Changes

5 changed files (+54/-0)

• gtk-adwaita/data/gresource.xml
  • @@ -29,6 +29,8 @@ <file preprocess="xml-stripblanks">icons/scalable/actions/item-missing-symbolic.svg</file>
    <file preprocess="xml-stripblanks">icons/scalable/actions/library-music-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/pause-large-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/play-large-symbolic.svg</file> + <file preprocess="xml-stripblanks">icons/scalable/actions/skip-backward-large-symbolic.svg</file> + <file preprocess="xml-stripblanks">icons/scalable/actions/skip-forward-large-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/sound-symbolic.svg</file> </gresource> </gresources>
• gtk-adwaita/data/icons/scalable/actions/skip-backward-large-symbolic.svg (new)
  • @@ -0,0 +1,6 @@
    + <?xml version="1.0" encoding="UTF-8"?> + <!-- + SPDX-FileCopyrightText: Gnome Developers + SPDX-License-Identifier: CC0-1.0 + --> + <svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 13.136719 13 s 0.90625 0.003906 0.90625 -1.070312 v -7.859376 c 0 -1.070312 -0.90625 -1.070312 -0.90625 -1.070312 h -0.09375 c -0.175781 -0.003906 -0.347657 0.035156 -0.5 0.125 l -7 4 c -0.3125 0.171875 -0.46875 0.523438 -0.46875 0.875 s 0.15625 0.703125 0.46875 0.875 l 7 4 c 0.152343 0.085938 0.324219 0.125 0.5 0.125 z m -9.5625 0 c 0.273437 0 0.5 -0.226562 0.5 -0.5 v -9 c 0 -0.277344 -0.226563 -0.5 -0.5 -0.5 h -1 c -0.277344 0 -0.5 0.222656 -0.5 0.5 v 9 c 0 0.273438 0.222656 0.5 0.5 0.5 z m 0 0" fill="#222222"/></svg>
• gtk-adwaita/data/icons/scalable/actions/skip-forward-large-symbolic.svg (new)
  • @@ -0,0 +1,6 @@
    + <?xml version="1.0" encoding="UTF-8"?> + <!-- + SPDX-FileCopyrightText: Gnome Developers + SPDX-License-Identifier: CC0-1.0 + --> + <svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 2.980469 3 s -0.90625 -0.003906 -0.90625 1.070312 v 7.859376 c 0 1.070312 0.90625 1.070312 0.90625 1.070312 h 0.09375 c 0.171875 0 0.347656 -0.039062 0.5 -0.125 l 7 -4 c 0.308593 -0.171875 0.46875 -0.523438 0.46875 -0.875 s -0.160157 -0.703125 -0.46875 -0.875 l -7 -4 c -0.152344 -0.085938 -0.328125 -0.125 -0.5 -0.125 z m 9.5625 0 c -0.277344 0 -0.5 0.222656 -0.5 0.5 v 9 c 0 0.277344 0.222656 0.5 0.5 0.5 h 1 c 0.273437 0 0.5 -0.222656 0.5 -0.5 v -9 c 0 -0.277344 -0.226563 -0.5 -0.5 -0.5 z m 0 0" fill="#222222"/></svg>
• gtk-adwaita/data/ui/playback-toolbar.ui
  • @@ -25,6 +25,13 @@ <style>
    <class name="toolbar" /> </style> <child> + <object class="GtkButton" id="prev"> + <property name="label">Previous</property> + <property name="icon-name">skip-backward-large-symbolic</property> + <property name="action-name">prev_current_zone</property> + </object> + </child> + <child> <object class="GtkButton" id="play"> <property name="label">Play</property> <property name="icon-name">play-large-symbolic</property>
  • @@ -36,6 +43,13 @@ <object class="GtkButton" id="pause">
    <property name="label">Pause</property> <property name="icon-name">pause-large-symbolic</property> <property name="action-name">pause_current_zone</property> + </object> + </child> + <child> + <object class="GtkButton" id="next"> + <property name="label">Skip Next</property> + <property name="icon-name">skip-forward-large-symbolic</property> + <property name="action-name">next_current_zone</property> </object> </child> <child>
• gtk-adwaita/src/Widgets/PlaybackToolbar.vala
  • @@ -24,6 +24,12 @@ [GtkChild]
    private unowned Gtk.Button pause; [GtkChild] + private unowned Gtk.Button prev; + + [GtkChild] + private unowned Gtk.Button next; + + [GtkChild] private unowned Gtk.Popover zone_list_popover; [GtkChild]
  • @@ -64,6 +70,24 @@ return;
    } conn.control(row.zone, Plac.Transport.ACTION_PAUSE); + }); + + prev.clicked.connect(() => { + var row = zone_rows[zone_id]; + if (row == null) { + return; + } + + conn.control(row.zone, Plac.Transport.ACTION_PREV); + }); + + next.clicked.connect(() => { + var row = zone_rows[zone_id]; + if (row == null) { + return; + } + + conn.control(row.zone, Plac.Transport.ACTION_NEXT); }); conn.zones_changed.connect((event) => {
  • @@ -135,6 +159,8 @@ }
    play.sensitive = (row.zone.allowed_action & Plac.Transport.ACTION_PLAY) != 0; pause.sensitive = (row.zone.allowed_action & Plac.Transport.ACTION_PAUSE) != 0; + prev.sensitive = (row.zone.allowed_action & Plac.Transport.ACTION_PREV) != 0; + next.sensitive = (row.zone.allowed_action & Plac.Transport.ACTION_NEXT) != 0; switch (row.zone.playback) { case LOADING: