From bb8e4c1117a5fbf274a627762cee7a9f4dcb1067 Mon Sep 17 00:00:00 2001
From: Eric Le Lay <elelay@macports.org>
Date: Tue, 5 Jan 2021 20:03:58 +0100
Subject: [PATCH] WIP: draft of Podcast/Progress notebook without tabs

---
 share/gpodder/ui/gtk/gpodder.ui | 45 ++++++++++++++++++++++++++++++++-
 src/gpodder/gtkui/main.py       | 22 ++++++++--------
 2 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/share/gpodder/ui/gtk/gpodder.ui b/share/gpodder/ui/gtk/gpodder.ui
index dd353604..35c2c7f7 100644
--- a/share/gpodder/ui/gtk/gpodder.ui
+++ b/share/gpodder/ui/gtk/gpodder.ui
@@ -38,6 +38,49 @@
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
             <property name="show_arrow">True</property>
+            <!--<child>
+              <object class="GtkToggleToolButton" id="toolShowPodcasts">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Podcasts</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-list</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">True</property>
+                <property name="active">True</property>
+                <signal handler="on_tool_show_podcasts" name="toggled"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>-->
+            <child>
+              <object class="GtkToggleToolButton" id="toolShowProgress">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Progress</property>
+                <property name="use_underline">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+                <property name="is_important">True</property>
+                <signal handler="on_tool_show_progress" name="toggled"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="visible">True</property>
+                <property name="visible_horizontal">True</property>
+                <property name="visible_vertical">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkToolButton" id="toolDownload">
                 <property name="visible">True</property>
@@ -152,7 +195,7 @@
               <object class="GtkNotebook" id="wNotebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="show_tabs">True</property>
+                <property name="show_tabs">False</property>
                 <property name="show_border">True</property>
                 <property name="tab_pos">GTK_POS_TOP</property>
                 <property name="scrollable">False</property>
diff --git a/src/gpodder/gtkui/main.py b/src/gpodder/gtkui/main.py
index 51d79d04..5b4e16fc 100644
--- a/src/gpodder/gtkui/main.py
+++ b/src/gpodder/gtkui/main.py
@@ -1104,11 +1104,11 @@ class gPodder(BuilderWidget, dbus.service.Object):
         # Update the downloads list one more time
         self.update_downloads_list(can_call_cleanup=False)
 
-    def on_tool_downloads_toggled(self, toolbutton):
-        if toolbutton.get_active():
-            self.wNotebook.set_current_page(1)
-        else:
-            self.wNotebook.set_current_page(0)
+    def on_tool_show_podcasts(self, toolbutton):
+        self.wNotebook.set_current_page(0 if toolbutton.get_active() else 1)
+
+    def on_tool_show_progress(self, toolbutton):
+        self.wNotebook.set_current_page(1 if toolbutton.get_active() else 0)
 
     def add_download_task_monitor(self, monitor):
         self.download_task_monitors.add(monitor)
@@ -1179,15 +1179,15 @@ class gPodder(BuilderWidget, dbus.service.Object):
             if downloading + failed + queued + synchronizing > 0:
                 s = []
                 if downloading > 0:
-                    s.append(N_('%(count)d active', '%(count)d active', downloading) % {'count': downloading})
+                    s.append(N_('%(count)d↓', '%(count)d↓', downloading) % {'count': downloading})
                 if synchronizing > 0:
-                    s.append(N_('%(count)d active', '%(count)d active', synchronizing) % {'count': synchronizing})
+                    s.append(N_('%(count)d⟲', '%(count)d⟲', synchronizing) % {'count': synchronizing})
                 if failed > 0:
-                    s.append(N_('%(count)d failed', '%(count)d failed', failed) % {'count': failed})
+                    s.append(N_('<span foreground="red">%(count)d!</span>', '<span foreground="red">%(count)d!</span>', failed) % {'count': failed})
                 if queued > 0:
-                    s.append(N_('%(count)d queued', '%(count)d queued', queued) % {'count': queued})
+                    s.append(N_('%(count)d..', '%(count)d..', queued) % {'count': queued})
                 text.append(' (' + ', '.join(s) + ')')
-            self.labelDownloads.set_text(''.join(text))
+            self.toolShowProgress.get_children()[0].get_children()[0].set_markup(''.join(text))
 
             title = [self.default_title]
 
@@ -3439,6 +3439,8 @@ class gPodder(BuilderWidget, dbus.service.Object):
             self.toolDownload.set_sensitive(False)
             self.toolPlay.set_sensitive(False)
             self.toolCancel.set_sensitive(False)
+        self.toolShowPodcasts.set_active(page_num == 0)
+        self.toolShowProgress.set_active(page_num == 1)
 
     def on_treeChannels_row_activated(self, widget, path, *args):
         # double-click action of the podcast list or enter