gtk-adwaita: Buttons to seek forward/backwards by 10 seconds Seekbar is not comfortable to use. Why 10 seconds, not 5 seconds? Because Adwaita has icons for 10 seconds but 5 seconds.

Changes

8 changed files (+80/-3)

• gtk-adwaita/data/gresource.xml
  • @@ -36,6 +36,8 @@ <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-backwards-10-symbolic.svg</file> + <file preprocess="xml-stripblanks">icons/scalable/actions/skip-forward-10-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> <file preprocess="xml-stripblanks">icons/scalable/actions/view-more-symbolic.svg</file>
• gtk-adwaita/data/icons/scalable/actions/skip-backwards-10-symbolic.svg (new)
  • @@ -0,0 +1,8 @@
    + <?xml version="1.0" encoding="UTF-8"?> + <!-- + SPDX-FileCopyrightText: Gnome Developers + SPDX-License-Identifier: CC0-1.0 + --> + <svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg"> + <path d="m 8.253906 1 c -0.132812 0.007812 -0.265625 0.046875 -0.375 0.117188 l -3.75 2.25 c -0.210937 0.140624 -0.335937 0.382812 -0.328125 0.632812 c 0 0.25 0.113281 0.5 0.328125 0.636719 l 3.75 2.25 c 0.109375 0.070312 0.242188 0.109375 0.375 0.113281 h 0.75 v -2 c 1.746094 -0.003906 3.292969 1.132812 3.816406 2.800781 c 0.523438 1.664063 -0.089843 3.480469 -1.523437 4.480469 c -0.296875 0.203125 -0.460937 0.546875 -0.429687 0.90625 s 0.25 0.671875 0.574218 0.824219 c 0.328125 0.152343 0.710938 0.113281 1.003906 -0.09375 c 2.140626 -1.503907 3.066407 -4.222657 2.28125 -6.71875 c -0.789062 -2.5 -3.105468 -4.195313 -5.722656 -4.199219 v -2 z m -1.09375 7.898438 c -1.535156 0 -2.566406 1.25 -2.566406 3.121093 c 0 1.839844 1.015625 3.066407 2.523438 3.066407 c 1.523437 0 2.554687 -1.246094 2.554687 -3.128907 c 0 -1.835937 -1.015625 -3.058593 -2.511719 -3.058593 z m -4.875 0.089843 l -2.070312 1.195313 l 0.5625 1.074218 l 0.902344 -0.46875 v 2.929688 h -1.160157 v 1.285156 h 3.726563 v -1.285156 h -1.066406 v -4.730469 z m 4.839844 1.195313 c 0.597656 0 1.003906 0.734375 1.003906 1.84375 c 0 1.066406 -0.398437 1.777344 -0.976562 1.777344 h -0.003906 c -0.613282 -0.003907 -1.011719 -0.738282 -1.011719 -1.835938 c 0 -1.074219 0.398437 -1.785156 0.988281 -1.785156 z m 0 0" fill="#222222"/> + </svg>
• gtk-adwaita/data/icons/scalable/actions/skip-forward-10-symbolic.svg (new)
  • @@ -0,0 +1,8 @@
    + <?xml version="1.0" encoding="UTF-8"?> + <!-- + SPDX-FileCopyrightText: Gnome Developers + SPDX-License-Identifier: CC0-1.0 + --> + <svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg"> + <path d="m 7.003906 1 v 2 c -2.621094 0.003906 -4.933594 1.699219 -5.722656 4.199219 c -0.785156 2.496093 0.136719 5.214843 2.28125 6.71875 c 0.292969 0.207031 0.671875 0.246093 1 0.09375 c 0.324219 -0.152344 0.546875 -0.464844 0.574219 -0.824219 c 0.03125 -0.359375 -0.132813 -0.703125 -0.429688 -0.90625 c -1.429687 -1 -2.046875 -2.816406 -1.519531 -4.480469 c 0.519531 -1.667969 2.066406 -2.804687 3.816406 -2.800781 v 2 h 0.75 c 0.132813 -0.003906 0.261719 -0.046875 0.375 -0.117188 l 3.75 -2.25 c 0.207032 -0.140624 0.332032 -0.378906 0.328125 -0.632812 c 0.003907 -0.253906 -0.121093 -0.492188 -0.328125 -0.632812 l -3.75 -2.25 c -0.113281 -0.070313 -0.242187 -0.113282 -0.375 -0.117188 z m 6.15625 7.898438 c -1.535156 0 -2.566406 1.25 -2.566406 3.121093 c 0 1.835938 1.011719 3.066407 2.519531 3.066407 c 1.527344 0 2.558594 -1.246094 2.558594 -3.128907 c 0 -1.835937 -1.015625 -3.058593 -2.511719 -3.058593 z m -4.875 0.085937 l -2.070312 1.195313 l 0.5625 1.074218 l 0.902344 -0.46875 v 2.933594 h -1.160157 v 1.28125 h 3.726563 v -1.28125 h -1.066406 v -4.734375 z m 4.839844 1.195313 c 0.597656 0 1.003906 0.738281 1.003906 1.847656 c 0 1.066406 -0.398437 1.777344 -0.980468 1.777344 c -0.613282 0 -1.011719 -0.738282 -1.011719 -1.839844 c 0 -1.074219 0.398437 -1.785156 0.988281 -1.785156 z m 0 0" fill="#222222"/> + </svg>
• gtk-adwaita/data/jp.pocka.plac.gtk-adwaita.gschema.xml
  • @@ -33,5 +33,10 @@ <default>true</default>
    <summary>Enable label parsing</summary> <description>Enable parsing of browse items' label. Some browse page contains "[[id|label]]" text and this option turns that into "label".</description> </key> + <key name="show-seek-by-10secs" type="b"> + <default>false</default> + <summary>Show seek by 10secs buttons</summary> + <description>Show buttons that seek forward/backwards by 10 seconds.</description> + </key> </schema> </schemalist>
• gtk-adwaita/data/ui/playback-toolbar.ui
  • @@ -110,6 +110,15 @@ <property name="action-name">prev_current_zone</property>
    </object> </child> <child> + <object class="GtkButton" id="seek_backwards_10"> + <style> + <class name="flat" /> + </style> + <property name="label">Seek 10 seconds backwards</property> + <property name="icon-name">skip-backwards-10-symbolic</property> + </object> + </child> + <child> <object class="GtkButton" id="play"> <style> <class name="flat" />
  • @@ -127,6 +136,15 @@ </style>
    <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="seek_forward_10"> + <style> + <class name="flat" /> + </style> + <property name="label">Seek 10 seconds forward</property> + <property name="icon-name">skip-forward-10-symbolic</property> </object> </child> <child>
• gtk-adwaita/src/Application.vala
  • @@ -63,11 +63,22 @@ });
    label_parsing_enabled.title = "Parse labels"; label_parsing_enabled.subtitle = "Enable parsing of \"[[id|text]]\" labels in browse section."; - var group = new Adw.PreferencesGroup(); - group.add(label_parsing_enabled); + var browse = new Adw.PreferencesGroup(); + browse.add(label_parsing_enabled); + browse.title = "Browse"; + + var show_seek_by_10secs = new Adw.SwitchRow(); + settings.settings.bind(Settings.SHOW_SEEK_BY_10SECS, show_seek_by_10secs, "active", DEFAULT); + show_seek_by_10secs.title = "Show seek by 10secs buttons"; + show_seek_by_10secs.subtitle = "Show buttons that seek forward/backwards by 10 seconds."; + + var playback = new Adw.PreferencesGroup(); + playback.add(show_seek_by_10secs); + playback.title = "Playback"; var page = new Adw.PreferencesPage(); - page.add(group); + page.add(browse); + page.add(playback); var dialog = new Adw.PreferencesDialog(); dialog.add(page);
• gtk-adwaita/src/Settings.vala
  • @@ -20,6 +20,8 @@ private const string CONNECTED_SERVER_TOKEN = "connected-server-token";
    private const string LABEL_PARSING_ENABLED = "label-parsing-enabled"; public class Settings { + public const string SHOW_SEEK_BY_10SECS = "show-seek-by-10secs"; + public GLib.Settings settings; public Settings() {
• gtk-adwaita/src/Widgets/PlaybackToolbar.vala
  • @@ -35,6 +35,12 @@ [GtkChild]
    private unowned Gtk.Button next; [GtkChild] + private unowned Gtk.Button seek_backwards_10; + + [GtkChild] + private unowned Gtk.Button seek_forward_10; + + [GtkChild] private unowned Gtk.Scale seek; [GtkChild]
  • @@ -58,6 +64,8 @@ private bool is_seeking = false;
    private int64? next_seek = null; private string? zone_id = null; + + private Settings settings = new Settings(); private Plac.Transport.Zone? zone { get {
  • @@ -92,6 +100,9 @@ this.render();
    }); seek.set_increments(1, 10); + + settings.settings.bind(Settings.SHOW_SEEK_BY_10SECS, seek_backwards_10, "visible", GET); + settings.settings.bind(Settings.SHOW_SEEK_BY_10SECS, seek_forward_10, "visible", GET); this.render(); }
  • @@ -185,6 +196,18 @@
    seek.change_value.connect((scroll, value) => { schedule_seek((int64) value); return false; + }); + + seek_backwards_10.clicked.connect(() => { + var next_value = seek.get_value() - 10; + seek.set_value(next_value); + schedule_seek((int64) next_value); + }); + + seek_forward_10.clicked.connect(() => { + var next_value = seek.get_value() + 10; + seek.set_value(next_value); + schedule_seek((int64) next_value); }); conn.zones_changed.connect((event) => {