upstream

1 files changed, 142 insertions, 176 deletions

diff --git a/share/gtk-fair-viewer.glade b/share/gtk-fair-viewer.glade
index d8d22d4..2c3fe04 100644
--- a/share/gtk-fair-viewer.glade
+++ b/share/gtk-fair-viewer.glade
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1
+<!-- Generated with glade 3.38.2
 
-Copyright (C) Copyright © 2010-2020 Trizen
+Copyright (C) Copyright © 2010-2021 Trizen
 
-Copyright (C) Copyright © 2020 Jesus E.
+Copyright (C) Copyright © 2020 Jesus E
 
 This file is part of GTK Fair Viewer.
 
@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License
 along with GTK Fair Viewer.  If not, see <http://www.gnu.org/licenses/>.
 
 Author: Trizen https://github.com/trizen
-Author: Jesus E. https://framagit.org/heckyel
 
 -->
 <interface>
@@ -29,7 +28,7 @@ Author: Jesus E. https://framagit.org/heckyel
   <!-- interface-license-type gplv3 -->
   <!-- interface-name GTK Fair Viewer -->
   <!-- interface-description Search and play YouTube videos. -->
-  <!-- interface-copyright Copyright \302\251 2010-2020 Trizen -->
+  <!-- interface-copyright Copyright \302\251 2010-2021 Trizen -->
   <!-- interface-authors Trizen https://github.com/trizen -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -76,6 +75,16 @@ Author: Jesus E. https://framagit.org/heckyel
     <property name="can-focus">False</property>
     <property name="stock">gtk-missing-image</property>
   </object>
+  <object class="GtkImage" id="image10">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="stock">gtk-missing-image</property>
+  </object>
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="stock">gtk-index</property>
+  </object>
   <object class="GtkImage" id="image14">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -94,6 +103,7 @@ Author: Jesus E. https://framagit.org/heckyel
         <property name="label" translatable="yes">Videos</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
+        <property name="tooltip-text" translatable="yes">List latest YouTube videos on this channel</property>
         <property name="image">image17</property>
         <property name="use-stock">False</property>
         <signal name="activate" handler="videos_from_selected_username" swapped="no"/>
@@ -104,20 +114,32 @@ Author: Jesus E. https://framagit.org/heckyel
         <property name="label" translatable="yes">Playlists</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
+        <property name="tooltip-text" translatable="yes">List YouTube playlists created by this channel</property>
         <property name="image">image14</property>
         <property name="use-stock">False</property>
         <signal name="activate" handler="playlists_from_selected_username" swapped="no"/>
       </object>
     </child>
     <child>
+      <object class="GtkImageMenuItem" id="subunsubchannel">
+        <property name="label" translatable="yes">(Un)subscribe</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="tooltip-text" translatable="yes">Subscribe / unsubscribe from this channel</property>
+        <property name="image">icon_from_pixbuf</property>
+        <property name="use-stock">False</property>
+        <signal name="activate" handler="subscribe_toggle_selected_username" swapped="no"/>
+      </object>
+    </child>
+    <child>
       <object class="GtkImageMenuItem" id="menuitem5">
         <property name="label">gtk-remove</property>
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="tooltip-text" translatable="yes">Remove the selected user from list...</property>
+        <property name="tooltip-text" translatable="yes">Remove the selected channel from the list</property>
         <property name="use-underline">True</property>
         <property name="use-stock">True</property>
-        <signal name="activate" handler="remove_selected_user" swapped="no"/>
+        <signal name="activate" handler="remove_selected_username" swapped="no"/>
       </object>
     </child>
   </object>
@@ -158,7 +180,7 @@ Author: Jesus E. https://framagit.org/heckyel
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="stock">gtk-refresh</property>
+    <property name="stock">gtk-index</property>
   </object>
   <object class="GtkImage" id="image76">
     <property name="visible">True</property>
@@ -175,6 +197,11 @@ Author: Jesus E. https://framagit.org/heckyel
     <property name="can-focus">False</property>
     <property name="icon-name">mail-reply-all</property>
   </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="stock">gtk-index</property>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name name -->
@@ -288,6 +315,29 @@ Author: Jesus E. https://framagit.org/heckyel
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="watched_videos">
+                        <property name="label" translatable="yes">Watched videos</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Display the list of watched videos</property>
+                        <property name="image">image9</property>
+                        <property name="use-stock">False</property>
+                        <signal name="activate" handler="display_watched_videos" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="subscription_videos">
+                        <property name="label" translatable="yes">Subscription videos</property>
+                        <property name="use-action-appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Display local subscription videos</property>
+                        <property name="image">image10</property>
+                        <property name="use-stock">False</property>
+                        <signal name="activate" handler="display_subscription_videos" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="cli_version">
                         <property name="label" translatable="yes">CLI Fair Viewer</property>
                         <property name="visible">True</property>
@@ -295,13 +345,12 @@ Author: Jesus E. https://framagit.org/heckyel
                         <property name="tooltip-text" translatable="yes">Search and play videos in command line interface (CTRL+Y)</property>
                         <property name="image">terminal_icon2</property>
                         <property name="use-stock">False</property>
-                        <signal name="activate" handler="run_cli_fair_viewer" swapped="no"/>
+                        <signal name="activate" handler="run_cli_pipe_viewer" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem3">
                         <property name="label" translatable="yes">Login to YouTube</property>
-                        <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes">Login to YouTube using OAuth 2.0 authentication.</property>
                         <property name="image">image6</property>
@@ -310,17 +359,6 @@ Author: Jesus E. https://framagit.org/heckyel
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="warnings_console">
-                        <property name="label" translatable="yes">Warnings log</property>
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="tooltip-text" translatable="yes">Show the warnings window</property>
-                        <property name="image">image76</property>
-                        <property name="use-stock">False</property>
-                        <signal name="activate" handler="show_warnings_window" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="options">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
@@ -432,6 +470,17 @@ Author: Jesus E. https://framagit.org/heckyel
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="warnings_console">
+                        <property name="label" translatable="yes">Warnings</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Show the warnings window</property>
+                        <property name="image">image76</property>
+                        <property name="use-stock">False</property>
+                        <signal name="activate" handler="show_warnings_window" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="about1">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
@@ -453,6 +502,49 @@ Author: Jesus E. https://framagit.org/heckyel
           </packing>
         </child>
         <child>
+          <object class="GtkBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkImage" id="gif_spinner">
+                <property name="can-focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack-type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="search_entry">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="buffer">entrybuffer1</property>
+                <property name="invisible-char">•</property>
+                <property name="activates-default">True</property>
+                <property name="text" translatable="yes">Search for YouTube videos...</property>
+                <property name="caps-lock-warning">False</property>
+                <property name="primary-icon-stock">gtk-find</property>
+                <property name="secondary-icon-activatable">False</property>
+                <signal name="activate" handler="search" swapped="no"/>
+                <signal name="button-press-event" handler="clear_text" swapped="no"/>
+                <signal name="icon-release" handler="search" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkPaned" id="hbox2">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
@@ -534,49 +626,6 @@ Author: Jesus E. https://framagit.org/heckyel
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkEntry" id="search_entry">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="has-focus">True</property>
-                        <property name="is-focus">True</property>
-                        <property name="buffer">entrybuffer1</property>
-                        <property name="invisible-char">•</property>
-                        <property name="activates-default">True</property>
-                        <property name="caps-lock-warning">False</property>
-                        <property name="primary-icon-stock">gtk-find</property>
-                        <property name="secondary-icon-activatable">False</property>
-                        <signal name="activate" handler="search" swapped="no"/>
-                        <signal name="button-press-event" handler="clear_text" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="pack-type">end</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="gif_spinner">
-                        <property name="can-focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
@@ -632,7 +681,7 @@ Author: Jesus E. https://framagit.org/heckyel
                                                 </child>
                                                 <child>
                                                   <object class="GtkButton" id="button22">
-                                                    <property name="label" translatable="yes">Favorited videos</property>
+                                                    <property name="label" translatable="yes">Favorites</property>
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="receives-default">True</property>
@@ -1014,7 +1063,6 @@ Author: Jesus E. https://framagit.org/heckyel
                                                         <property name="visible">True</property>
                                                         <property name="can-focus">False</property>
                                                         <property name="tooltip-text" translatable="yes">short – less than 4 minutes long
-medium – 4 to 20 minutes (inclusive)
 long – longer than 20 minutes</property>
                                                         <property name="active">0</property>
                                                         <items>
@@ -1388,7 +1436,7 @@ Unless the author name is valid, this field is ignored.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
                                                             <property name="receives-default">False</property>
-                                                            <property name="tooltip-text" translatable="yes">Show thumbnails for videos in search results.</property>
+                                                            <property name="tooltip-text" translatable="yes">Show thumbnails for results.</property>
                                                             <property name="draw-indicator">True</property>
                                                             <signal name="toggled" handler="thumbs_checkbutton_toggled" swapped="no"/>
                                                             </object>
@@ -1436,14 +1484,13 @@ Unless the author name is valid, this field is ignored.</property>
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
                                                             <property name="receives-default">False</property>
-                                                            <property name="tooltip-text" translatable="yes">Support for videos in DASH format.
-When disabled, streams in DASH format will be ignored if there exists an alternative.</property>
+                                                            <property name="tooltip-text" translatable="yes">Include or exclude streams in DASH format.</property>
                                                             <property name="draw-indicator">True</property>
                                                             <signal name="toggled" handler="toggled_dash_support" swapped="no"/>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">True</property>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
                                                             <property name="position">3</property>
                                                             </packing>
                                                             </child>
@@ -1453,14 +1500,14 @@ When disabled, streams in DASH format will be ignored if there exists an alterna
                                                             <property name="visible">True</property>
                                                             <property name="can-focus">True</property>
                                                             <property name="receives-default">False</property>
-                                                            <property name="tooltip-text" translatable="yes">Clear previous search results after each new search.</property>
+                                                            <property name="tooltip-text" translatable="yes">Clear the search list after each new search.</property>
                                                             <property name="draw-indicator">True</property>
                                                             <signal name="toggled" handler="toggled_clear_search_list" swapped="no"/>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">5</property>
+                                                            <property name="position">4</property>
                                                             </packing>
                                                             </child>
                                                             </object>
@@ -1554,6 +1601,7 @@ When the specified resolution is not found, the best available resolution is use
                                                           <item translatable="yes">480p</item>
                                                           <item translatable="yes">360p</item>
                                                           <item translatable="yes">240p</item>
+                                                          <item translatable="yes">144p</item>
                                                         </items>
                                                         <signal name="changed" handler="combobox_resolution_changed" swapped="no"/>
                                                       </object>
@@ -1922,6 +1970,7 @@ When the specified resolution is not found, the best available resolution is use
                                 </child>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow7">
+                                    <property name="visible">True</property>
                                     <property name="can-focus">True</property>
                                     <child>
                                       <object class="GtkViewport" id="viewport4">
@@ -1937,7 +1986,7 @@ When the specified resolution is not found, the best available resolution is use
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">True</property>
                                                 <property name="model">liststore6</property>
-                                                <signal name="row-activated" handler="list_tops" swapped="no"/>
+                                                <signal name="row-activated" handler="list_local_playlist" swapped="no"/>
                                                 <child internal-child="selection">
                                                   <object class="GtkTreeSelection"/>
                                                 </child>
@@ -1954,7 +2003,7 @@ When the specified resolution is not found, the best available resolution is use
                                                 </child>
                                                 <child>
                                                   <object class="GtkTreeViewColumn" id="treeviewcolumn5">
-                                                    <property name="title" translatable="yes">Top</property>
+                                                    <property name="title" translatable="yes">Playlist</property>
                                                     <child>
                                                       <object class="GtkCellRendererText" id="cellrenderertext3"/>
                                                       <attributes>
@@ -1972,101 +2021,16 @@ When the specified resolution is not found, the best available resolution is use
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkExpander" id="expander1">
+                                              <object class="GtkCheckButton" id="reverse_playlist">
+                                                <property name="label" translatable="yes">Reverse playlist entries</property>
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">True</property>
-                                                <child>
-                                                  <object class="GtkBox" id="vbox19">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">False</property>
-                                                    <property name="orientation">vertical</property>
-                                                    <child>
-                                                      <object class="GtkFrame" id="frame22">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">False</property>
-                                                        <property name="label-xalign">0</property>
-                                                        <property name="shadow-type">none</property>
-                                                        <child>
-                                                          <object class="GtkAlignment" id="alignment21">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">False</property>
-                                                            <property name="left-padding">12</property>
-                                                            <child>
-                                                            <object class="GtkEntry" id="region_entry">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">True</property>
-                                                            <property name="invisible-char">•</property>
-                                                            <property name="primary-icon-activatable">False</property>
-                                                            <property name="secondary-icon-activatable">False</property>
-                                                            </object>
-                                                            </child>
-                                                          </object>
-                                                        </child>
-                                                        <child type="label">
-                                                          <object class="GtkLabel" id="label28">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">False</property>
-                                                            <property name="label" translatable="yes">&lt;b&gt;Region ID&lt;/b&gt;</property>
-                                                            <property name="use-markup">True</property>
-                                                          </object>
-                                                        </child>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkFrame" id="frame23">
-                                                        <property name="visible">True</property>
-                                                        <property name="can-focus">False</property>
-                                                        <property name="label-xalign">0</property>
-                                                        <property name="shadow-type">none</property>
-                                                        <child>
-                                                          <object class="GtkAlignment" id="alignment22">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">False</property>
-                                                            <property name="left-padding">12</property>
-                                                            <child>
-                                                            <object class="GtkEntry" id="category_entry">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">True</property>
-                                                            <property name="invisible-char">•</property>
-                                                            <property name="primary-icon-activatable">False</property>
-                                                            <property name="secondary-icon-activatable">False</property>
-                                                            </object>
-                                                            </child>
-                                                          </object>
-                                                        </child>
-                                                        <child type="label">
-                                                          <object class="GtkLabel" id="label29">
-                                                            <property name="visible">True</property>
-                                                            <property name="can-focus">False</property>
-                                                            <property name="label" translatable="yes">&lt;b&gt;Category ID:&lt;/b&gt;</property>
-                                                            <property name="use-markup">True</property>
-                                                          </object>
-                                                        </child>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">1</property>
-                                                      </packing>
-                                                    </child>
-                                                  </object>
-                                                </child>
-                                                <child type="label">
-                                                  <object class="GtkLabel" id="label27">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Options</property>
-                                                  </object>
-                                                </child>
+                                                <property name="receives-default">False</property>
+                                                <property name="draw-indicator">True</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">False</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -2083,7 +2047,7 @@ When the specified resolution is not found, the best available resolution is use
                                   <object class="GtkLabel" id="label15">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="label" translatable="yes">Tops</property>
+                                    <property name="label" translatable="yes">Playlists</property>
                                   </object>
                                   <packing>
                                     <property name="position">4</property>
@@ -2130,7 +2094,7 @@ When the specified resolution is not found, the best available resolution is use
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -2144,17 +2108,18 @@ When the specified resolution is not found, the best available resolution is use
     <property name="transient-for">__MAIN__</property>
     <property name="program-name">GTK Fair Viewer</property>
     <property name="copyright" translatable="yes">
-Copyright © 2010-2020 Trizen
-Copyright © 2020 Jesús E.</property>
+Copyright © 2010-2021 Trizen
+Copyright © 2020-2021 Jesús E.
+    </property>
     <property name="comments" translatable="yes">Written in Perl, Gtk3 and Glade.</property>
-    <property name="website">https://framagit.org/heckyel/fair-viewer</property>
-    <property name="website-label" translatable="yes">https://framagit.org/heckyel/fair-viewer</property>
+    <property name="website">https://git.sr.ht/~heckyel/fair-viewer</property>
+    <property name="website-label" translatable="yes">https://git.sr.ht/~heckyel/fair-viewer</property>
     <property name="authors">Trizen https://github.com/trizen
 Ovidiu D. Nițan &lt;nitanovidiu@gmail.com&gt;
 Jookia https://github.com/Jookia
 Andreas Hrubak https://github.com/bAndie91
-Jesús E. https://framagit.org/heckyel
-and others... https://framagit.org/heckyel/fair-viewer/-/graphs/master</property>
+Jesús E. https://git.sr.ht/~heckyel
+and others...</property>
     <property name="artists">PosixRU (main logo) http://zenway.ru/page/gtk-youtube-viewer</property>
     <property name="logo-icon-name">image-missing</property>
     <property name="license-type">artistic</property>
@@ -2184,7 +2149,7 @@ and others... https://framagit.org/heckyel/fair-viewer/-/graphs/master</property
   </object>
   <object class="GtkWindow" id="details_window">
     <property name="can-focus">False</property>
-    <property name="title" translatable="yes">Video details</property>
+    <property name="title" translatable="yes">Extra details</property>
     <property name="modal">True</property>
     <property name="window-position">center-on-parent</property>
     <property name="default-height">400</property>
@@ -3398,9 +3363,10 @@ and others... https://framagit.org/heckyel/fair-viewer/-/graphs/master</property
     <property name="border-width">5</property>
     <property name="title" translatable="yes">Warnings log</property>
     <property name="window-position">center-on-parent</property>
-    <property name="default-width">320</property>
-    <property name="default-height">260</property>
+    <property name="default-width">400</property>
+    <property name="default-height">300</property>
     <property name="type-hint">dialog</property>
+    <property name="transient-for">__MAIN__</property>
     <signal name="delete-event" handler="hide_warnings_window" swapped="no"/>
     <signal name="destroy" handler="hide_warnings_window" swapped="no"/>
     <child internal-child="vbox">