From 4ce0819c682eb6274e823191969819f388a81483 Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Sat, 25 Jan 2020 02:07:46 +0500
Subject: [PATCH 1/4] player: Use model buttons for rate popover

Also simplify the xml.
---
 podcasts-gtk/resources/gtk/player_rate.ui | 38 ++++++-----------------
 podcasts-gtk/src/widgets/player.rs        | 21 +++++++------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/player_rate.ui b/podcasts-gtk/resources/gtk/player_rate.ui
index 4dbc387..b7cb691 100644
--- a/podcasts-gtk/resources/gtk/player_rate.ui
+++ b/podcasts-gtk/resources/gtk/player_rate.ui
@@ -75,23 +75,14 @@ Tobias Bernard
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_start">6</property>
-        <property name="margin_end">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
+        <property name="margin">6</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
         <child>
-          <object class="GtkRadioButton" id="rate_1_50">
-            <property name="label" translatable="yes">1.50×</property>
+          <object class="GtkModelButton" id="rate_1_50">
+            <property name="text" translatable="yes">1.50×</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">1.5 speed rate</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">normal_rate</property>
+            <property name="role">radio</property>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -100,16 +91,11 @@ Tobias Bernard
           </packing>
         </child>
         <child>
-          <object class="GtkRadioButton" id="rate_1_25">
-            <property name="label" translatable="yes">1.25×</property>
+          <object class="GtkModelButton" id="rate_1_25">
+            <property name="text" translatable="yes">1.25×</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">1.25 speed rate</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">normal_rate</property>
+            <property name="role">radio</property>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -118,16 +104,12 @@ Tobias Bernard
           </packing>
         </child>
         <child>
-          <object class="GtkRadioButton" id="normal_rate">
-            <property name="label" translatable="yes">1.00×</property>
+          <object class="GtkModelButton" id="normal_rate">
+            <property name="text" translatable="yes">1.00×</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Normal speed</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
             <property name="active">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="role">radio</property>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/podcasts-gtk/src/widgets/player.rs b/podcasts-gtk/src/widgets/player.rs
index ddbcf0a..e75255a 100644
--- a/podcasts-gtk/src/widgets/player.rs
+++ b/podcasts-gtk/src/widgets/player.rs
@@ -208,9 +208,9 @@ fn format_duration(seconds: u32) -> String {
 
 #[derive(Debug, Clone)]
 struct PlayerRate {
-    radio150: gtk::RadioButton,
-    radio125: gtk::RadioButton,
-    radio_normal: gtk::RadioButton,
+    radio150: gtk::ModelButton,
+    radio125: gtk::ModelButton,
+    radio_normal: gtk::ModelButton,
     popover: gtk::Popover,
     btn: gtk::MenuButton,
     label: gtk::Label,
@@ -220,9 +220,9 @@ impl PlayerRate {
     fn new() -> Self {
         let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/player_rate.ui");
 
-        let radio150: gtk::RadioButton = builder.get_object("rate_1_50").unwrap();
-        let radio125: gtk::RadioButton = builder.get_object("rate_1_25").unwrap();
-        let radio_normal: gtk::RadioButton = builder.get_object("normal_rate").unwrap();
+        let radio150: gtk::ModelButton = builder.get_object("rate_1_50").unwrap();
+        let radio125: gtk::ModelButton = builder.get_object("rate_1_25").unwrap();
+        let radio_normal: gtk::ModelButton = builder.get_object("normal_rate").unwrap();
         let popover = builder.get_object("rate_popover").unwrap();
         let btn = builder.get_object("rate_button").unwrap();
         let label = builder.get_object("rate_label").unwrap();
@@ -239,19 +239,22 @@ impl PlayerRate {
 
     fn set_rate(&self, rate: f64) {
         self.label.set_text(&format!("{:.2}×", rate));
+        self.radio_normal.set_property_active(rate == 1.0);
+        self.radio125.set_property_active(rate == 1.25);
+        self.radio150.set_property_active(rate == 1.5);
     }
 
     fn connect_signals(&self, widget: &Rc<PlayerWidget>) {
         self.radio_normal
-            .connect_toggled(clone!(@weak widget => move |_| {
+            .connect_clicked(clone!(@weak widget => move |_| {
                 widget.on_rate_changed(1.00);
             }));
         self.radio125
-            .connect_toggled(clone!(@weak widget => move |_| {
+            .connect_clicked(clone!(@weak widget => move |_| {
                 widget.on_rate_changed(1.25);
             }));
         self.radio150
-            .connect_toggled(clone!(@weak widget => move |_| {
+            .connect_clicked(clone!(@weak widget => move |_| {
                 widget.on_rate_changed(1.50);
             }));
     }

From 5e688c104c9ae33dd5d76c051344f6a22491ea20 Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Sat, 25 Jan 2020 02:36:40 +0500
Subject: [PATCH 2/4] player_rate: Use tabular figures for speed rate menu

Since gtk::ModelButton allows to set markup, the menu entries can now use
tabular figures.

Make the labels untranslatable, as they are generic enough already, and
being translatable would make even less sense with markup.
---
 podcasts-gtk/resources/gtk/player_rate.ui | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/player_rate.ui b/podcasts-gtk/resources/gtk/player_rate.ui
index b7cb691..b627fae 100644
--- a/podcasts-gtk/resources/gtk/player_rate.ui
+++ b/podcasts-gtk/resources/gtk/player_rate.ui
@@ -45,6 +45,9 @@ Tobias Bernard
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">1.00×</property>
+            <attributes>
+              <attribute name="font-features" value="tnum=1"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -79,7 +82,8 @@ Tobias Bernard
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkModelButton" id="rate_1_50">
-            <property name="text" translatable="yes">1.50×</property>
+            <property name="text">&lt;span font-features="tnum=1"&gt;1.50×&lt;/span&gt;</property>
+            <property name="use-markup">True</property>
             <property name="visible">True</property>
             <property name="tooltip_text" translatable="yes">1.5 speed rate</property>
             <property name="role">radio</property>
@@ -92,7 +96,8 @@ Tobias Bernard
         </child>
         <child>
           <object class="GtkModelButton" id="rate_1_25">
-            <property name="text" translatable="yes">1.25×</property>
+            <property name="text">&lt;span font-features="tnum=1"&gt;1.25×&lt;/span&gt;</property>
+            <property name="use-markup">True</property>
             <property name="visible">True</property>
             <property name="tooltip_text" translatable="yes">1.25 speed rate</property>
             <property name="role">radio</property>
@@ -105,7 +110,8 @@ Tobias Bernard
         </child>
         <child>
           <object class="GtkModelButton" id="normal_rate">
-            <property name="text" translatable="yes">1.00×</property>
+            <property name="text">&lt;span font-features="tnum=1"&gt;1.00×&lt;/span&gt;</property>
+            <property name="use-markup">True</property>
             <property name="visible">True</property>
             <property name="tooltip_text" translatable="yes">Normal speed</property>
             <property name="active">True</property>

From 4d950ac17ea0e3b5ae72b205e86316cb256524d2 Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Mon, 3 Feb 2020 14:35:45 +0500
Subject: [PATCH 3/4] player: Use tabular figures for duration

---
 podcasts-gtk/resources/gtk/player_dialog.ui  | 6 ++++++
 podcasts-gtk/resources/gtk/player_toolbar.ui | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/podcasts-gtk/resources/gtk/player_dialog.ui b/podcasts-gtk/resources/gtk/player_dialog.ui
index 8934098..eaaeb3a 100644
--- a/podcasts-gtk/resources/gtk/player_dialog.ui
+++ b/podcasts-gtk/resources/gtk/player_dialog.ui
@@ -132,6 +132,9 @@
                     <property name="can_focus">False</property>
                     <property name="width_chars">5</property>
                     <property name="xalign">1</property>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                     <style>
                       <class name="dim-label"/>
                       <class name="small-label"/>
@@ -154,6 +157,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="width_chars">5</property>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                     <style>
                       <class name="dim-label"/>
                       <class name="small-label"/>
diff --git a/podcasts-gtk/resources/gtk/player_toolbar.ui b/podcasts-gtk/resources/gtk/player_toolbar.ui
index 875fd5f..869c484 100644
--- a/podcasts-gtk/resources/gtk/player_toolbar.ui
+++ b/podcasts-gtk/resources/gtk/player_toolbar.ui
@@ -263,6 +263,9 @@ Tobias Bernard
                             <property name="halign">start</property>
                             <property name="valign">center</property>
                             <property name="label">0:00</property>
+                            <attributes>
+                              <attribute name="font-features" value="tnum=1"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -291,6 +294,9 @@ Tobias Bernard
                             <property name="halign">start</property>
                             <property name="valign">center</property>
                             <property name="label">0:00</property>
+                            <attributes>
+                              <attribute name="font-features" value="tnum=1"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">False</property>

From 9c2d4ac6a7a1085d4b02f93779650e479e2db7fa Mon Sep 17 00:00:00 2001
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Sat, 25 Jan 2020 04:33:53 +0500
Subject: [PATCH 4/4] episode: Use tabular figures

Prevents jumping during downloads.
---
 podcasts-gtk/resources/gtk/episode_widget.ui | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/podcasts-gtk/resources/gtk/episode_widget.ui b/podcasts-gtk/resources/gtk/episode_widget.ui
index 7aff031..d1d694f 100644
--- a/podcasts-gtk/resources/gtk/episode_widget.ui
+++ b/podcasts-gtk/resources/gtk/episode_widget.ui
@@ -110,6 +110,9 @@ Tobias Bernard
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -143,6 +146,9 @@ Tobias Bernard
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -177,6 +183,9 @@ Tobias Bernard
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -212,6 +221,9 @@ Tobias Bernard
                     <style>
                       <class name="dim-label"/>
                     </style>
+                    <attributes>
+                      <attribute name="font-features" value="tnum=1"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>