From 8db9707e2e74f5cbac7bbfa0cfd150ccff5c8b44 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Feb 2024 12:13:47 +0530
Subject: [PATCH 01/72] Fix #2052766 [scrolling down books in latest version
 give error](https://bugs.launchpad.net/calibre/+bug/2052766)

---
 src/calibre/utils/img.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py
index bcb7d333d689..a643b037ecbb 100644
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -694,7 +694,7 @@ def convert_PIL_image_to_pixmap(im, device_pixel_ratio=1.0):
     if im.mode == "RGBA":
         fmt = QImage.Format.Format_RGBA8888
         data = im.tobytes("raw", "RGBA")
-    elif im.mode == "RGB":
+    elif im.mode in ("RGB", "CMYK"):
         fmt = QImage.Format.Format_RGBX8888
         data = im.convert("RGBA").tobytes("raw", "RGBA")
     elif im.mode == "1":

From dc1daee516ca89afa7a6188e9fc1656a4aa4d331 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Feb 2024 12:16:52 +0530
Subject: [PATCH 02/72] Handle PIL images in any mode by converting to RGBA

---
 src/calibre/utils/img.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py
index a643b037ecbb..11bfc5b1573d 100644
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -694,9 +694,6 @@ def convert_PIL_image_to_pixmap(im, device_pixel_ratio=1.0):
     if im.mode == "RGBA":
         fmt = QImage.Format.Format_RGBA8888
         data = im.tobytes("raw", "RGBA")
-    elif im.mode in ("RGB", "CMYK"):
-        fmt = QImage.Format.Format_RGBX8888
-        data = im.convert("RGBA").tobytes("raw", "RGBA")
     elif im.mode == "1":
         fmt = QImage.Format.Format_Mono
     elif im.mode == "L":
@@ -710,7 +707,8 @@ def convert_PIL_image_to_pixmap(im, device_pixel_ratio=1.0):
         im = im.point(lambda i: i * 256)
         fmt = QImage.Format.Format_Grayscale16
     else:
-        raise ValueError(f"unsupported image mode {repr(im.mode)}")
+        fmt = QImage.Format.Format_RGBX8888
+        data = im.convert("RGBA").tobytes("raw", "RGBA")
 
     size = im.size
     data = data or align8to32(im.tobytes(), size[0], im.mode)

From 86471d3a030b6aa9d6a421d147bfdd95add523ef Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Feb 2024 12:17:52 +0530
Subject: [PATCH 03/72] update Changelog

---
 Changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index e55e9ac7937d..9e6d49eba1dd 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -52,7 +52,7 @@
 
 - Fix a regression in 7.2 that caused the popup used for editing fields in the book list to be mis-positioned on very wide monitors
 
-- Version 7.5.1 fixes a bug in 7.5.0 where calibre would not start up using dark colors when the system was in dark mode on some windows installs
+- [2052766] Version 7.5.1 fixes a bug in 7.5.0 where calibre would not start up using dark colors when the system was in dark mode on some windows installs and another bug that could cause errors when using cover grid mode with covers stored in CMYK colorspace
 
 :: improved recipes
 - El Diplo

From 14caed3a6f0f57e172d1eb407703f0e4cc179e11 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Feb 2024 14:41:44 +0530
Subject: [PATCH 04/72] fix check for local with non-existent setting name

---
 src/pyj/session.pyj | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index 073cc6a50928..a30bb4fdb2e9 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -287,6 +287,11 @@ def get_translations(newval):
         return get_translations.storage.get('current')
 
 
+def is_setting_local(name):
+    m = all_settings[name]
+    return m.is_local if m else True
+
+
 class UserSessionData(SessionData):
 
     def __init__(self, username, saved_data):
@@ -300,7 +305,7 @@ class UserSessionData(SessionData):
         self.push_timer_id = None
         if saved_data:
             for key in saved_data:
-                if not all_settings[key].is_local:
+                if not is_setting_local(key):
                     self.set(key, saved_data[key])
         self.echo_changes = True
 
@@ -321,7 +326,7 @@ class UserSessionData(SessionData):
         return self.get(lkey, defval)
 
     def set(self, key, value):
-        if self.echo_changes and self.has_user and not all_settings[key].is_local:
+        if self.echo_changes and self.has_user and not is_setting_local(key):
             self.changes[key] = value
             self.has_changes = True
             if self.push_timer_id is not None:

From 94b62da2b1d7af520fe8f133b81968bf941e4ec0 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Sat, 10 Feb 2024 10:01:32 +0530
Subject: [PATCH 05/72] Update moneycontrol.recipe

---
 recipes/moneycontrol.recipe | 138 +++++++++++++++++++++++-------------
 1 file changed, 88 insertions(+), 50 deletions(-)

diff --git a/recipes/moneycontrol.recipe b/recipes/moneycontrol.recipe
index 3c8f0483eab6..320398a975ca 100644
--- a/recipes/moneycontrol.recipe
+++ b/recipes/moneycontrol.recipe
@@ -1,65 +1,103 @@
-from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import Tag
-
-
-def new_tag(soup, name, attrs=()):
-    impl = getattr(soup, 'new_tag', None)
-    if impl is not None:
-        return impl(name, attrs=dict(attrs))
-    return Tag(soup, name, attrs=attrs or None)
+from calibre.web.feeds.news import BasicNewsRecipe, classes
+from urllib.parse import quote
 
 
 class MoneyControlRecipe(BasicNewsRecipe):
-    __license__ = 'GPL v3'
-    __author__ = 'kwetal'
+    title = u'Money Control'
+    __author__ = 'unkn0wn'
+    description = 'Read the latest business news on the Indian economy, global market, upcoming IPOs and more.'
     language = 'en_IN'
-    locale = 'en_IN'
-    encoding = 'iso-8859-1'
-    version = 1
+    masthead_url = 'https://images.moneycontrol.com/images/ftpopup/moneyloginlogo.png'
+    encoding = 'utf-8'
+    no_stylesheets = True
+    remove_javascript = True
+    remove_attributes = ['width', 'height', 'float', 'style']
 
-    title = u'Money Control'
-    publisher = u'moneycontrol.com'
-    category = u'News, Financial, India'
-    description = u'Financial news from India'
+    ignore_duplicate_articles = {'title', 'url'}
+    remove_empty_feeds = True
+    resolve_internal_links = True
 
-    oldest_article = 7
-    max_articles_per_feed = 100
-    use_embedded_content = False
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        .article_image_wrapper { font-size:small; text-align:center; }
+        .articlename_join_follow, .author_wrapper, .FT_block_article { font-size:small; color:#404040; }
+        .article_desc { font-style:italic; color:#202020; }
+    '''
 
-    no_stylesheets = True
-    remove_javascript = True
+    articles_are_obfuscated = True
 
-    feeds = []
-    feeds.append(
-        (u'Latest News', u'http://www.moneycontrol.com/rss/latestnews.xml'))
-    feeds.append(
-        (u'All Stories', u'http://www.moneycontrol.com/rss/allstories.xml'))
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        soup = self.index_to_soup(url)
+        link = soup.a['href']
+        skip_sections =[ # add sections you want to skip
+            '/video/', '/videos/', '/multimedia/',
+        ]
+        if any(x in link for x in skip_sections):
+            self.abort_article('skipping video links ', link)
+        self.log('Found ', link)
+        html = br.open(link).read()
+        return ({ 'data': html, 'url': link })
 
-    def print_version(self, url):
-        return url.replace('/stocksnews.php?', '/news_print.php?') + '&sr_no=0'
+    keep_only_tags = [
+        dict(name='div', attrs={'id':lambda x: x and x.startswith('article-')})
+    ]
 
-    # The articles contain really horrible html. More than one <body> and <head> section, not properly closed tags, lots and lots of
-    # <font> tags and some weird <o:p></o:p> markup that crashes the conversion to ebook. Needs some drastic sanitizing
-    '''def preprocess_html(self, soup):
-        freshSoup = BeautifulSoup('<html><head></head><body></body></html>')
+    remove_tags = [
+        dict(name=['svg', 'style', 'button', 'script']),
+        dict(attrs={'id':['social_icon_impression', 'taboola-mid-article-thumbnails']}),
+        classes(
+            'social_icons_wrapper mid-arti-ad lastPara related_stories_left_block social_icons_mobile_wrapper'
+            'advSlotsWithoutGrayBox tags_wrapper maintextdiv page_right_wrapper stockwidget tech_newsletter'
+        )
+    ]
 
-        headline = soup.find('td', attrs = {'class': 'heading'})
-        if headline:
-            h1 = new_tag(freshSoup, 'h1')
-            # Convert to string before adding it to the document!
-            h1.append(self.tag_to_string(headline))
-            freshSoup.body.append(h1)
+    def preprocess_html(self, soup):
+        desc = soup.find(**classes('article_desc'))
+        if desc:
+            desc.name = 'p'
+        for wrap in soup.findAll(**classes('article_image_wrapper')):
+            for h2 in wrap.findAll('h2'):
+                h2.name = 'span'
+        for img in soup.findAll('img', attrs={'data-src':True}):
+            img['src'] = img['data-src']
+        return soup
 
-        for p in soup.findAll('p', attrs={'class': true}):
-            if ''.join(p['class']) == 'MsoNormal':
-                # We have some weird pagebreak marker here; it will not find all of them however
-                continue
+    feeds = []
 
-            para = new_tag(freshSoup, 'p')
-            # Convert to string; this will loose all formatting but also all illegal markup
-            para.append(self.tag_to_string(p))
+    when = 27 # hours
+    index = 'https://www.moneycontrol.com/'
 
-            freshSoup.body.append(para)
+    business_sections = [
+        'markets', 'stocks', 'ipo', 'budget', 'banks', 'moneycontrol-research', 'economy', 'earnings', 'real-estate', 
+        'personal-finance', 'commodities', 'trade', 'companies'
+    ]
 
-        return freshSoup
-    '''
+    for sec in business_sections:
+        allinurl_a = index + 'news/business'
+        a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
+        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_a, safe=''), '%2F' + sec + '%2F')))
+    feeds.append(('Business' , a.format(str(when), quote(allinurl_a, safe=''), '')))
+
+    news_sections = [
+        'india', 'world', 'opinion', 'politics', 'technology', 'trends', 'lifestyle'
+    ]
+
+    for sec in news_sections:
+        allinurl_b = index + 'news'
+        b = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
+        feeds.append((sec.capitalize(), a.format(str(when), quote(allinurl_b, safe=''), '%2F' + sec + '%2F')))
+    feeds.append(('News', b.format(str(when), quote(allinurl_b, safe=''), '')))
+    feeds.append(
+        ('Others', 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=IN&ceid=IN:en'.format(str(when), quote(index, safe='')))
+    )
+
+    def populate_article_metadata(self, article, soup, first):
+        div = soup.find('div', attrs={'data-io-article-url':True})
+        if div:
+            article.url = div['data-io-article-url']
+        desc = soup.find(**classes('article_desc'))
+        if desc:
+            article.summary = self.tag_to_string(desc)
+            article.text_summary = article.summary
+        article.title = article.title.replace(' - Moneycontrol', '')

From 9288eeea000dc8c8fcbe62597a26a56ccd666783 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Sat, 10 Feb 2024 21:07:40 +0530
Subject: [PATCH 06/72] Update rtnews.recipe

---
 recipes/rtnews.recipe | 86 +++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 36 deletions(-)

diff --git a/recipes/rtnews.recipe b/recipes/rtnews.recipe
index 3ddd7721f7be..f9415552e6c7 100644
--- a/recipes/rtnews.recipe
+++ b/recipes/rtnews.recipe
@@ -1,62 +1,76 @@
-__license__ = 'GPL v3'
-__copyright__ = '2011, Darko Miletic <darko.miletic at gmail.com>'
 '''
 rt.com
 '''
 
-from calibre.web.feeds.news import BasicNewsRecipe
-
+from calibre.web.feeds.news import BasicNewsRecipe, classes
 
 class RT_eng(BasicNewsRecipe):
-    title = 'RT in English'
-    __author__ = 'Darko Miletic'
-    description = 'RT is the first Russian 24/7 English-language news channel which brings the Russian view on global news.'
+    title = 'Russia Today'
+    __author__ = 'unkn0wn'
+    description = '''
+        RT creates news with an edge for viewers who want to Question More. RT covers stories overlooked by the mainstream 
+        media, provides alternative perspectives on current affairs, and acquaints international audiences with a Russian 
+        viewpoint on major global events.
+    '''
     publisher = 'Autonomous Nonprofit Organization "TV-Novosti"'
     category = 'news, politics, economy, finances, Russia, world'
-    oldest_article = 2
+    oldest_article = 1.2
     no_stylesheets = True
-    encoding = 'utf8'
-    masthead_url = 'http://rt.com/s/css/img/printlogo.gif'
+    encoding = 'utf-8'
+    ignore_duplicate_articles = {'url', 'title'}
     use_embedded_content = False
     remove_empty_feeds = True
-    language = 'en_RU'
+    remove_javascript = True
+    language = 'en'
+    remove_attributes = ['height', 'width', 'style']
     publication_type = 'newsportal'
-    extra_css             = """
-                                body{font-family: Arial,Helvetica,sans-serif}
-                                h1{font-family: Georgia,"Times New Roman",Times,serif}
-                                .grey{color: gray}
-                                .fs12{font-size: small}
-                            """
+
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        em { color:#202020; }
+        .date { font-size:small; color:#404040; }
+        .article__summary { font-style:italic; color:#202020; }
+        .media__footer { font-size:small; text-align:center; }
+    '''
 
     conversion_options = {
         'comment': description, 'tags': category, 'publisher': publisher, 'language': language
     }
 
-    keep_only_tags = [dict(name='div', attrs={'class': 'all'})]
+    keep_only_tags = [
+        dict(name='div', attrs={'class':'article'})
+    ]
+
     remove_tags = [
-        dict(name=['object', 'link', 'embed', 'iframe', 'meta', 'link']), dict(
-            attrs={'class': 'crumbs oh'})
+        dict(name=['meta', 'link', 'svg', 'button', 'style', 'iframe', 'noscript']),
+        classes(
+        	'update_date_visible breadcrumbs read-more Read-more-text-only article__share '
+            'article__social-wrapper article__share_bottom'
+        )
     ]
-    remove_attributes = ['clear']
 
     feeds = [
-
-    (u'Politics', u'http://rt.com/politics/rss/'),
-    (u'USA', u'http://rt.com/usa/news/rss/'),
-    (u'Business', u'http://rt.com/business/news/rss/'),
-    (u'Sport', u'http://rt.com/sport/rss/'),
-    (u'Art&Culture', u'http://rt.com/art-and-culture/news/rss/')
+        ('Russia', 'https://www.rt.com/rss/russia/'),
+        ('India', 'https://www.rt.com/rss/india/'),
+        ('Africa', 'https://www.rt.com/rss/africa/'),
+        ('World News', 'https://www.rt.com/rss/news/'),
+        ('Business', 'https://www.rt.com/rss/business/'),
+        ('Opinion', 'https://www.rt.com/rss/op-ed/'),
+        ('Culture', 'https://www.rt.com/rss/pop-culture/'),
+        ('Others', 'https://www.rt.com/rss/')
     ]
 
-    def print_version(self, url):
-        return url + 'print/'
+    def get_article_url(self, article):
+        url = BasicNewsRecipe.get_article_url(self, article)
+        return url.split('?')[0]
 
     def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        for item in soup.findAll('a'):
-            str = item.string
-            if str is None:
-                str = self.tag_to_string(item)
-            item.replaceWith(str)
+        for img in soup.findAll('img'):
+            srcset = img.find_previous_sibling('source', attrs={'data-srcset':True})
+            if srcset:
+                for x in srcset['data-srcset'].split(','):
+                    if '/l/' in x.split()[0].strip():
+                        img['src'] = x.split()[0].strip()
+        for src in soup.findAll('source'):
+            src.decompose()
         return soup

From 87f9dd62fd5785c50afdabc15d8f2563b1b57426 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Feb 2024 19:33:06 +0530
Subject: [PATCH 07/72] update Pro Physik

---
 recipes/pro_physik.recipe | 76 ++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/recipes/pro_physik.recipe b/recipes/pro_physik.recipe
index 10d8a8bce8fb..83b809c4ec26 100644
--- a/recipes/pro_physik.recipe
+++ b/recipes/pro_physik.recipe
@@ -1,40 +1,52 @@
-from calibre.web.feeds.recipes import BasicNewsRecipe
-
+##
+## Written:      November 2012 (new coding)
+## Version:      3.4
+## Last update:  2024-02-11
+##
 
+from calibre.web.feeds.recipes import BasicNewsRecipe
 class AdvancedUserRecipe1303841067(BasicNewsRecipe):
 
-    title = u'Pro Physik'
-    __author__ = 'schuster, Armin Geller'  # AGE Upd. 2012-11-28, # AGe Upd 2019-02-09
-    oldest_article = 4
+    title          = u'Pro Physik'
+    __author__  = 'schuster, Armin Geller' 
+    # AGE Upd. 2012-11-28, 2019-02-09,
+    #     2019-02-18, 2024-02-11
+    # https://www.mobileread.com/forums/showthread.php?t=133184
+    
+    oldest_article        = 7
     max_articles_per_feed = 100
 
-    no_stylesheets = True
-    remove_javascript = True
-    remove_empty_feeds = True
-    language = 'de'
-
-    extra_css = '''
-        h1 {font-size: 1.6em; text-align: left}
-        h2, h3 {font-size: 1.3em;text-align: left}
-        h2.subtitle {font-size: 1.2em;text-align: left;font-style: italic}
-        h4, h5, h6 {font-size: 1em;text-align: left}
-        .flex-caption {font-size: .75em; font-weight: normal;margin-bottom: .75em}
-        .slides {list-style-type: none}
-    '''
-    # .slides: get rid of <ul><li> list dot in front of pictures
-
-    keep_only_tags = [
-        dict(name='div', attrs={'class': ['news-item view-mode-default']})
-    ]
-
+    no_stylesheets        = True
+    remove_javascript     = True
+    remove_empty_feeds    = True
+    language              = 'de_DE'     
+    
+    # In case you want to assign a cover picture to this recipe.
+    # Copy the file Pro_Physik.png to:
+    # c:/Users/YOUR_USERNAME/AppData/Roaming/calibre/resources/images/news_covers/
+    # where YOUR_USERNAME needs to be replaced with your username.
+    # Then remove # in front of cover_url and replace YOUR_USERNAME with your username as well
+    
+    # cover_url = file:///c:/Users/YOUR_USERNAME/AppData/Roaming/calibre/resources/images/news_covers/Pro_Physik.png
+    
+    extra_css      =  '''
+                        h1 {font-size: 1.6em; text-align: left}
+                        h2, h3 {font-size: 1.3em;text-align: left}
+                        h2.subtitle {font-size: 1.2em;text-align: left;font-style: italic}
+                        h4, h5, h6 {font-size: 1em;text-align: left}
+                        div.caption, div.source {font-size: .75em; font-weight: normal;margin-bottom: .75em}
+                      '''
+
+    keep_only_tags    = [
+                          dict(name='article', attrs={'id':['story']}),
+                          dict(name='div', attrs={'class':['event-item view-mode-default']})
+                        ]
+                        
     remove_tags = [
-        #   dict(name='div', attrs={'class':["withMargin socialWrapper addthis_toolbox addthis_default_style"]}),
-        #   dict(name='div', attrs={'class':["insideBox"]}),
-    ]
+                       dict(name='ul', attrs={'class':["wj-share-buttons"]}),  #Block social media
+                  ]
 
     feeds = [
-        (u'Nachrichten',
-         u'https://www.pro-physik.de/rss/news.xml'),  # AGe 2019-02-09
-        (u'Veranstaltungen',
-         u'https://www.pro-physik.de/rss/events.xml'),  # AGe 2019-02-09
-    ]
+              (u'Nachrichten', u'https://pro-physik.de/rss/news/'),
+#              (u'Veranstaltungen', u'https://pro-physik.de/rss/events/'), # AGe 2024-02-11
+            ]
\ No newline at end of file

From 314a17a046daccd256e1d92149cb305da44de37a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 11 Feb 2024 19:33:31 +0530
Subject: [PATCH 08/72] pep8

---
 recipes/rtnews.recipe | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/rtnews.recipe b/recipes/rtnews.recipe
index f9415552e6c7..76137bbfdc00 100644
--- a/recipes/rtnews.recipe
+++ b/recipes/rtnews.recipe
@@ -8,8 +8,8 @@ class RT_eng(BasicNewsRecipe):
     title = 'Russia Today'
     __author__ = 'unkn0wn'
     description = '''
-        RT creates news with an edge for viewers who want to Question More. RT covers stories overlooked by the mainstream 
-        media, provides alternative perspectives on current affairs, and acquaints international audiences with a Russian 
+        RT creates news with an edge for viewers who want to Question More. RT covers stories overlooked by the mainstream
+        media, provides alternative perspectives on current affairs, and acquaints international audiences with a Russian
         viewpoint on major global events.
     '''
     publisher = 'Autonomous Nonprofit Organization "TV-Novosti"'
@@ -44,7 +44,7 @@ class RT_eng(BasicNewsRecipe):
     remove_tags = [
         dict(name=['meta', 'link', 'svg', 'button', 'style', 'iframe', 'noscript']),
         classes(
-        	'update_date_visible breadcrumbs read-more Read-more-text-only article__share '
+            'update_date_visible breadcrumbs read-more Read-more-text-only article__share '
             'article__social-wrapper article__share_bottom'
         )
     ]

From d2ba5d180bc5e8d48100f579709aa48eb14c86db Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:11:16 +0530
Subject: [PATCH 09/72] nautil.us

---
 recipes/icons/nautilus.png | Bin 0 -> 292 bytes
 recipes/nautilus.recipe    |  11 +++++------
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 recipes/icons/nautilus.png

diff --git a/recipes/icons/nautilus.png b/recipes/icons/nautilus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cfc351d79af694c283945ec6f3bda5f73f8813d
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;V>;H2M|IadjNF?N5;DgLX
zW9K;wx`50o3Gxem#qITFLDeP(h1+`m%TFcri=KK|3Y44R>Eak7F*VdbQs}4w$EL`b
zNqTqwZ*l!yH_!MahhS5Zj{G61d3!(boXL@&BQNOS{-IKFlEuYvrnt$*j}(`Fo%i{n
z(X1PHQ)kPlNWJw9yKr2Y^Km{~?D@U!UI9m%UkYWUeUEHm41dTha&d~h&#T<Sx%`EF
zGF`8mmT4~x%Uf>{Y`jY(*ka$)DH|hvzifYd|Cj!qX>5O&-I_ZQ=r#sVS3j3^P6<r_
D!DD*_

literal 0
HcmV?d00001

diff --git a/recipes/nautilus.recipe b/recipes/nautilus.recipe
index 4470af6aa234..40aa812c2839 100644
--- a/recipes/nautilus.recipe
+++ b/recipes/nautilus.recipe
@@ -33,7 +33,7 @@ class Nautilus(BasicNewsRecipe):
     remove_tags = [
         classes(
             'article-action-list article-bottom-newsletter_box main-post-comments-toggle-wrap main-post-comments-wrapper'
-            ' social-share supported-one article-collection_box'
+            ' social-share supported-one article-collection_box browsi-ad'
         )
     ]
 
@@ -63,12 +63,11 @@ class Nautilus(BasicNewsRecipe):
     ]
 
     def get_cover_url(self):
-        soup = self.index_to_soup('https://www.presspassnow.com/nautilus/issues/')
-        div = soup.find('li', **classes('product'))
-        if div:
-            self.cover_url = div.find('img', src=True)['src']
+        soup = self.index_to_soup('https://nautil.us/shop/category/issues/')
+        a = soup.find('a', attrs={'href':lambda x: x and x.startswith('https://nautil.us/shop/issues/issue-')})
+        if a:
+            self.cover_url = a.img['src'].split('?')[0]
         return getattr(self, 'cover_url', self.cover_url)
-
     def preprocess_html(self, soup):
         for img in soup.findAll('img', attrs={'data-src': True}):
             img['src'] = img['data-src'].split('?')[0]

From 1ff9bf9e24bc2d38728032756ccfd07cec497ef4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Feb 2024 14:34:37 +0530
Subject: [PATCH 10/72] Edit book: Allow selecting multiple books to edit at
 once, opening all selected books in separate editor instances

---
 src/calibre/gui2/actions/tweak_epub.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index 03cd65e52304..9ca4c6cafef1 100644
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -17,14 +17,14 @@
 
 class Choose(QDialog):
 
-    def __init__(self, fmts, parent=None):
+    def __init__(self, title, fmts, parent=None):
         QDialog.__init__(self, parent)
         self.l = l = QVBoxLayout(self)
         self.setLayout(l)
         self.setWindowTitle(_('Choose format to edit'))
 
         self.la = la = QLabel(_(
-            'This book has multiple formats that can be edited. Choose the format you want to edit.'))
+            'The book "{}" has multiple formats that can be edited. Choose the format you want to edit.').format(title))
         l.addWidget(la)
 
         self.rem = QCheckBox(_('Always ask when more than one format is available'))
@@ -91,13 +91,16 @@ def genesis(self):
         self.qaction.triggered.connect(self.tweak_book)
 
     def tweak_book(self):
-        row = self.gui.library_view.currentIndex()
-        if not row.isValid():
+        ids = self.gui.library_view.get_selected_ids()
+        if not ids:
             return error_dialog(self.gui, _('Cannot Edit book'),
                     _('No book selected'), show=True)
+        if len(ids) > 10 and not question_dialog(self.gui, _('Are you sure?'), _(
+                'You are trying to edit {} books at once. Are you sure?').format(len(ids))):
+            return
 
-        book_id = self.gui.library_view.model().id(row)
-        self.do_tweak(book_id)
+        for book_id in ids:
+            self.do_tweak(book_id)
 
     def do_tweak(self, book_id):
         if self.gui.current_view() is not self.gui.library_view:
@@ -108,10 +111,11 @@ def do_tweak(self, book_id):
         fmts = db.formats(book_id, index_is_id=True) or ''
         fmts = [x.upper().strip() for x in fmts.split(',') if x]
         tweakable_fmts = set(fmts).intersection(SUPPORTED)
+        title = db.new_api.field_for('title', book_id)
         if not tweakable_fmts:
             if not fmts:
                 if not question_dialog(self.gui, _('No editable formats'),
-                    _('Do you want to create an empty EPUB file to edit?')):
+                    _('Do you want to create an empty EPUB file in the book "{}" to edit?').format(title)):
                     return
                 tweakable_fmts = {'EPUB'}
                 self.gui.iactions['Add Books'].add_empty_format_to_book(book_id, 'EPUB')
@@ -120,14 +124,14 @@ def do_tweak(self, book_id):
                     self.gui.library_view.model().current_changed(current_idx, current_idx)
             else:
                 return error_dialog(self.gui, _('Cannot edit book'), _(
-                    'The book must be in the %s formats to edit.'
+                    'The book "{0}" must be in the {1} formats to edit.'
                     '\n\nFirst convert the book to one of these formats.'
-                ) % (_(' or ').join(SUPPORTED)), show=True)
+                ).format(title,  _(' or ').join(SUPPORTED)), show=True)
         from calibre.gui2.tweak_book import tprefs
         tprefs.refresh()  # In case they were changed in a Tweak Book process
         if len(tweakable_fmts) > 1:
             if tprefs['choose_tweak_fmt']:
-                d = Choose(sorted(tweakable_fmts, key=tprefs.defaults['tweak_fmt_order'].index), self.gui)
+                d = Choose(title, sorted(tweakable_fmts, key=tprefs.defaults['tweak_fmt_order'].index), self.gui)
                 if d.exec() != QDialog.DialogCode.Accepted:
                     return
                 tweakable_fmts = {d.fmt}

From 04adea1b106c988664856266831aeeef6bb919e5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Feb 2024 15:16:01 +0530
Subject: [PATCH 11/72] string changes

---
 manual/template_lang.rst                | 4 ++--
 src/calibre/gui2/fts/search.py          | 4 ++--
 src/calibre/gui2/library/annotations.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manual/template_lang.rst b/manual/template_lang.rst
index 876fc0c1fbca..7650afbf6800 100644
--- a/manual/template_lang.rst
+++ b/manual/template_lang.rst
@@ -415,7 +415,7 @@ Examples:
 
   * ``program: field('series') == 'foo'`` returns ``'1'`` if the book's series is 'foo', otherwise ``''``.
   * ``program: 'f.o' in field('series')`` returns ``'1'`` if the book's series matches the regular expression ``f.o`` (e.g., `foo`, `Off Onyx`, etc.), otherwise ``''``.
-  * ``program: 'science' inlist field('#genre')`` returns ``'1'`` if any of the book's genres match the regular expression ``science``, e.g., `Science`, `History of Science`, `Science Fiction` etc.), otherwise ``''``.
+  * ``program: 'science' inlist field('#genre')`` returns ``'1'`` if any of the book's genres match the regular expression ``science``, e.g., `Science`, `History of Science`, `Science Fiction` etc., otherwise ``''``.
   * ``program: '^science$' inlist field('#genre')`` returns ``'1'`` if any of the book's genres exactly match the regular expression ``^science$``, e.g., `Science`. The genres `History of Science` and `Science Fiction` don't match. If there isn't a match then returns ``''``.
   * ``program: if field('series') != 'foo' then 'bar' else 'mumble' fi`` returns ``'bar'`` if the book's series is not ``foo``. Otherwise it returns ``'mumble'``.
   * ``program: if field('series') == 'foo' || field('series') == '1632' then 'yes' else 'no' fi`` returns ``'yes'`` if series is either ``'foo'`` or ``'1632'``, otherwise ``'no'``.
@@ -875,7 +875,7 @@ To accomplish this, we:
 
 1. Create a composite field (give it lookup name #aa) containing ``{series}/{series_index} - {title}``. If the series is not empty, then this template will produce `series/series_index - title`.
 2. Create a composite field (give it lookup name #bb) containing ``{#genre:ifempty(Unknown)}/{author_sort}/{title}``. This template produces `genre/author_sort/title`, where an empty genre is replaced with `Unknown`.
-3. Set the save template to ``{series:lookup(.,#aa,#bb}``. This template chooses composite field ``#aa`` if series is not empty and composite field ``#bb`` if series is empty. We therefore have two completely different save paths, depending on whether or not `series` is empty.
+3. Set the save template to ``{series:lookup(.,#aa,#bb)}``. This template chooses composite field ``#aa`` if series is not empty and composite field ``#bb`` if series is empty. We therefore have two completely different save paths, depending on whether or not `series` is empty.
 
 Tips
 -----
diff --git a/src/calibre/gui2/fts/search.py b/src/calibre/gui2/fts/search.py
index cedb1bc9d3ef..259f48b93f81 100644
--- a/src/calibre/gui2/fts/search.py
+++ b/src/calibre/gui2/fts/search.py
@@ -456,9 +456,9 @@ def show_context_menu(self, pos):
             m.addAction(QIcon.ic('marked.png'), _('Mark this book in the library'), partial(mark_books, results.book_id))
             if match is not None:
                 match = index.row()
-                m.addAction(QIcon.ic('view.png'), _('Open this book at this search result'), partial(open_book, results, match_index=match))
+                m.addAction(QIcon.ic('view.png'), _('View this book at this search result'), partial(open_book, results, match_index=match))
             else:
-                m.addAction(QIcon.ic('view.png'), _('Open this book'), partial(open_book, results))
+                m.addAction(QIcon.ic('view.png'), _('View this book'), partial(open_book, results))
         m.addSeparator()
         m.addAction(QIcon.ic('plus.png'), _('Expand all'), self.expandAll)
         m.addAction(QIcon.ic('minus.png'), _('Collapse all'), self.collapseAll)
diff --git a/src/calibre/gui2/library/annotations.py b/src/calibre/gui2/library/annotations.py
index 3dfa53174c03..58f504e73559 100644
--- a/src/calibre/gui2/library/annotations.py
+++ b/src/calibre/gui2/library/annotations.py
@@ -906,7 +906,7 @@ def p(text, tag='p'):
             atype=a(atype), text=annot_text, dt=_('Date'), date=a(date), ut=a(_('User')),
             user=a(friendly_username(r['user_type'], r['user'])), highlight_css=highlight_css,
             ov=a(_('Open in viewer')), sic=a(_('Show in calibre')),
-            ovtt=a(_('Open the book at this annotation in the calibre E-book viewer')),
+            ovtt=a(_('View the book at this annotation in the calibre E-book viewer')),
             sictt=(_('Show this book in the main calibre book list')),
         )
         self.text_browser.setHtml(text)

From 1f1c777886e6129b23b34538fac9679a0d565cad Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 12 Feb 2024 17:15:12 +0000
Subject: [PATCH 12/72] Enhancement 2052897: save and restore GUI panel
 layouts.

I added this to the existing Layout Actions. In addition I added the ability to toggle panels on/off in addition to turning them on and off.

I am unable to test the docstrings.
---
 src/calibre/customize/builtins.py          |   2 +-
 src/calibre/gui2/__init__.py               |   1 +
 src/calibre/gui2/actions/layout_actions.py | 223 ++++++++++++++++++++-
 3 files changed, 214 insertions(+), 12 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 37729bd04d26..9f3122750e7e 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1084,7 +1084,7 @@ class ActionSavedSearches(InterfaceActionBase):
 
 
 class ActionLayoutActions(InterfaceActionBase):
-    name = 'Layout actions'
+    name = 'Layout Actions'
     author = 'Charles Haley'
     actual_plugin = 'calibre.gui2.actions.layout_actions:LayoutActions'
     description = _("Show a menu of actions to change calibre's layout")
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 55addc814e18..f6f3cb98a023 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -431,6 +431,7 @@ def create_defs():
     defs['light_palette_name'] = ''
     defs['dark_palettes'] = {}
     defs['light_palettes'] = {}
+    defs['saved_layouts'] = {}
 
     def migrate_tweak(tweak_name, pref_name):
         # If the tweak has been changed then leave the tweak in the file so
diff --git a/src/calibre/gui2/actions/layout_actions.py b/src/calibre/gui2/actions/layout_actions.py
index 2208c5a452ae..65ffe7a44bc0 100644
--- a/src/calibre/gui2/actions/layout_actions.py
+++ b/src/calibre/gui2/actions/layout_actions.py
@@ -3,9 +3,12 @@
 
 from enum import Enum
 from functools import partial
-from qt.core import QToolButton
+from qt.core import (QComboBox, QDialog, QDialogButtonBox, QFormLayout, QIcon,
+                     QLabel, QMenu, QToolButton, QVBoxLayout)
 
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2 import error_dialog, gprefs, question_dialog
+from calibre.gui2.actions import InterfaceAction, show_menu_under_widget
+from calibre.utils.icu import sort_key
 
 
 class Panel(Enum):
@@ -18,32 +21,127 @@ class Panel(Enum):
     QUICKVIEW = 'qv'
 
 
+class SaveLayoutDialog(QDialog):
+
+    def __init__(self, parent, names):
+        QDialog.__init__(self, parent)
+        self.names = names
+        l = QVBoxLayout(self)
+        fl = QFormLayout()
+        l.addLayout(fl)
+        self.cb = cb = QComboBox()
+        cb.setEditable(True)
+        cb.setMinimumWidth(200)
+        cb.addItem('')
+        cb.addItems(sorted(names, key=sort_key))
+        fl.addRow(QLabel(_('Layout name')), cb)
+        bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)
+        l.addWidget(bb)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+
+    def current_name(self):
+        return self.cb.currentText().strip()
+
+    def accept(self):
+        n = self.current_name()
+        if not n:
+            error_dialog(self, _('Invalid name'), _('The settings name cannot be blank'),
+                         show=True, show_copy_button=False)
+            return
+        if self.current_name() in self.names:
+            r = question_dialog(self, _('Replace saved layout'),
+                  _('Do you really want to overwrite the saved layout {0}?').format(self.current_name()))
+            if r == QDialog.DialogCode.Accepted:
+                super().accept()
+            else:
+                return
+        super().accept()
+
+
 class LayoutActions(InterfaceAction):
 
     name = 'Layout Actions'
     action_spec = (_('Layout actions'), 'layout.png',
-                   _('Add/remove layout items: search bar, tag browser, etc.'), None)
+                   _("Save and restore layout item sizes, and add/remove/toggle "
+                     "layout items such as the search bar, tag browser, etc. "
+                     "Item sizes in saved layouts are saved as a percentage of "
+                     "the window size. Restoring a layout doesn't change the "
+                     "window size, instead fitting the items into the current window."), None)
+
     action_type = 'current'
     popup_type = QToolButton.ToolButtonPopupMode.InstantPopup
     action_add_menu = True
     dont_add_to = frozenset({'context-menu-device', 'menubar-device'})
 
+    def genesis(self):
+        self.layout_icon = QIcon.ic('layout.png')
+        self.menu = m = self.qaction.menu()
+        m.aboutToShow.connect(self.about_to_show_menu)
+
+        # Create a "hidden" menu that can have a shortcut.
+        self.hidden_menu = QMenu()
+        self.shortcut_action = self.create_menu_action(
+                        menu=self.hidden_menu,
+                        unique_name='Main window layout',
+                        shortcut=None,
+                        text=_("Save and restore layout item sizes, and add/remove/toggle "
+                               "layout items such as the search bar, tag browser, etc. "),
+                        icon='layout.png',
+                        triggered=self.show_menu)
+
+    # We want to show the menu when a shortcut is used. Apparently the only way
+    # to do that is to scan the toolbar(s) for the action button then exec the
+    # associated menu. The search is done here to take adding and removing the
+    # action from toolbars into account.
+    #
+    # If a shortcut is triggered and there isn't a toolbar button visible then
+    # show the menu in the upper left corner of the library view pane. Yes, this
+    # is a bit weird but it works as well as a popping up a dialog.
+    def show_menu(self):
+        show_menu_under_widget(self.gui, self.menu, self.qaction, self.name)
+
     def toggle_layout(self):
         self.gui.layout_container.toggle_layout()
 
     def gui_layout_complete(self):
         m = self.qaction.menu()
-        m.aboutToShow.connect(self.populate_layout_menu)
+        m.aboutToShow.connect(self.about_to_show_menu)
+
+    def initialization_complete(self):
+        self.populate_menu()
 
-    def populate_layout_menu(self):
+    def about_to_show_menu(self):
+        self.populate_menu()
+
+    def populate_menu(self):
         m = self.qaction.menu()
         m.clear()
+        lm = m.addMenu(self.layout_icon, _('Restore saved layout'))
+        layouts = gprefs['saved_layouts']
+        if layouts:
+            for l in sorted(layouts, key=sort_key):
+                lm.addAction(self.layout_icon, l, partial(self.apply_layout, l))
+        else:
+            lm.setEnabled(False)
+        lm = m.addAction(self.layout_icon, _('Save current layout'))
+        lm.triggered.connect(self.save_current_layout)
+        lm = m.addMenu(self.layout_icon, _('Delete saved layout'))
+        layouts = gprefs['saved_layouts']
+        if layouts:
+            for l in sorted(layouts, key=sort_key):
+                lm.addAction(self.layout_icon, l, partial(self.delete_layout, l))
+        else:
+            lm.setEnabled(False)
+
+        m.addSeparator()
         m.addAction(_('Hide all'), self.hide_all)
         for button, name in zip(self.gui.layout_buttons, self.gui.button_order):
             m.addSeparator()
             ic = button.icon()
             m.addAction(ic, _('Show {}').format(button.label), partial(self.set_visible, Panel(name), True))
             m.addAction(ic, _('Hide {}').format(button.label), partial(self.set_visible, Panel(name), False))
+            m.addAction(ic, _('Toggle {}').format(button.label), partial(self.toggle_item, Panel(name)))
 
     def _change_item(self, button, show=True):
         if button.isChecked() and not show:
@@ -51,26 +149,129 @@ def _change_item(self, button, show=True):
         elif not button.isChecked() and show:
             button.click()
 
+    def _toggle_item(self, button):
+        button.click()
+
     def _button_from_enum(self, name: Panel):
         for q, b in zip(self.gui.button_order, self.gui.layout_buttons):
             if q == name.value:
                 return b
 
-    def set_visible(self, name: Panel, show=True):
+    # Public API
+    def apply_layout(self, name):
+        '''apply_layout()
+        Apply a saved GUI panel layout.
+
+        :param:`name` The name of the saved layout
+
+         Throws KeyError if the name doesn't exist.
+        '''
+        layouts = gprefs['saved_layouts']
+        # This can be called by plugins so let the exception fly
+        settings = layouts[name]
+        # Order is important here. change_layout() must be called before
+        # unserializing the settings or panes like book details won't display
+        # properly.
+        self.gui.layout_container.change_layout(self.gui, settings['layout'] == 'wide')
+        self.gui.layout_container.unserialize_settings(settings)
+        self.gui.layout_container.relayout()
+
+    def save_current_layout(self):
+        '''save_current_layout()
+        Opens a dialog asking for the name to use to save the current layout.
+        Saves the current settings under the provided name.
+        '''
+        layouts = gprefs['saved_layouts']
+        d = SaveLayoutDialog(self.gui, layouts.keys())
+        if d.exec() == QDialog.DialogCode.Accepted:
+            self.save_named_layout(d.current_name(), self.current_settings())
+
+    def current_settings(self):
+        '''current_settings()
+
+        :return: the current gui layout settings.
+        '''
+
+        return self.gui.layout_container.serialized_settings()
+
+    def save_named_layout(self, name, settings):
+        '''save_named_layout()
+        Saves the settings under the provided name.
+
+        :param:`name` The name for the settings.
+        :param:`settings`: The gui layout settings to save.
         '''
-        Show or hide the panel. Does nothing if the panel is already in the
+        layouts = gprefs['saved_layouts']
+        layouts.update({name: settings})
+        gprefs['saved_layouts'] = layouts
+        self.populate_menu()
+
+    def delete_layout(self, name, show_warning=True):
+        '''delete_layout()
+        Delete a saved layout.
+
+        :param:`name` The name of the layout to delete
+        :param:`show_warning`: If True a warning dialog will be shown before deleting the layout.
+        '''
+        if show_warning:
+            if not question_dialog(self.gui, _('Are you sure?'),
+                                   _('Do you really want to delete the saved layout {0}').format(name),
+                                   skip_dialog_name='delete_saved_gui_layout'):
+                return
+        layouts = gprefs['saved_layouts']
+        layouts.pop(name, None)
+        self.populate_menu()
+
+    def saved_layout_names(self):
+        '''saved_layout_names()
+        Get a list of saved layout names
+
+        :return: the sorted list of names. The list is empty if there are no names.
+        '''
+        layouts = gprefs['saved_layouts']
+        return sorted(layouts.keys(), key=sort_key)
+
+    def toggle_item(self, name):
+        '''toggle_item()
+        Toggle the visibility of the panel.
+
+        :param name: specifies which panel to toggle. Valid names are
+            SEARCH_BAR: 'sb'
+            TAG_BROWSER: 'tb'
+            BOOK_DETAILS: 'bd'
+            GRID_VIEW: 'gv'
+            COVER_BROWSER: 'cb'
+            QUICKVIEW: 'qv'
+        '''
+        self._toggle_item(self._button_from_enum(name))
+
+    def set_visible(self, name: Panel, show=True):
+        '''set_visible()
+        Show or hide a panel. Does nothing if the panel is already in the
         desired state.
 
-        :param name: specifies which panel using a Panel enum
+        :param name: specifies which panel to show.  Valid names are
+            SEARCH_BAR: 'sb'
+            TAG_BROWSER: 'tb'
+            BOOK_DETAILS: 'bd'
+            GRID_VIEW: 'gv'
+            COVER_BROWSER: 'cb'
+            QUICKVIEW: 'qv'
         :param show: If True, show the panel, otherwise hide the panel
         '''
         self._change_item(self._button_from_enum(name), show)
 
     def is_visible(self, name: Panel):
-        '''
+        '''is_visible()
         Returns True if the panel is visible.
 
-        :param name: specifies which panel using a Panel enum
+        :param name: specifies which panel. Valid names are
+            SEARCH_BAR: 'sb'
+            TAG_BROWSER: 'tb'
+            BOOK_DETAILS: 'bd'
+            GRID_VIEW: 'gv'
+            COVER_BROWSER: 'cb'
+            QUICKVIEW: 'qv'
         '''
         self._button_from_enum(name).isChecked()
 
@@ -83,7 +284,7 @@ def show_all(self):
             self.set_visible(Panel(name), show=True)
 
     def panel_titles(self):
-        '''
+        '''panel_titles()
         Return a dictionary of Panel Enum items to translated human readable title.
         Simplifies building dialogs, for example combo boxes of all the panel
         names or check boxes for each panel.

From ae6ef2807def4ffef1b553ec0b3567ebe62abcca Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Feb 2024 08:13:21 +0530
Subject: [PATCH 13/72] Fix disabled items in menus having blurry text

Qt is a strange beast. This is because the fusion style draws a copy of
the text offset by 1px in the Light color from the disabled palette. Can
also be fixed by setting the light color to the window color but that
might have other undesirable effects.
---
 src/calibre/gui2/progress_indicator/CalibreStyle.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/calibre/gui2/progress_indicator/CalibreStyle.cpp b/src/calibre/gui2/progress_indicator/CalibreStyle.cpp
index fc769d59b874..29dec84d47f7 100644
--- a/src/calibre/gui2/progress_indicator/CalibreStyle.cpp
+++ b/src/calibre/gui2/progress_indicator/CalibreStyle.cpp
@@ -167,6 +167,10 @@ int CalibreStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
         case SH_UnderlineShortcut:
             return 0;
 #endif
+        case SH_EtchDisabledText:
+            return 0;
+        case SH_DitherDisabledText:
+            return 0;
         default:
             break;
     }

From b9cdc80806b3201ac73fd46e998e522414b6ed0f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Feb 2024 10:18:29 +0530
Subject: [PATCH 14/72] Add a link to the upstream bug report in the workaround
 code

---
 src/calibre/gui2/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index f6f3cb98a023..34ce7206cf80 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1693,6 +1693,7 @@ def local_path_for_resource(qurl: QUrl, base_qurl: 'QUrl | None' = None) -> str:
     def fix_qt_bodging_windows_paths(path: str) -> str:
         # When loading <img src="file:///c:/path/to/img.png"> Qt gives us the
         # URL: //c/path/to/img.png  Le bubbling sigh
+        # https://bugreports.qt.io/browse/QTBUG-122201
         if iswindows and re.match(r'//[a-zA-Z]/', path) is not None and not os.path.exists(path):
             path = os.path.normpath(path[2] + ':' + path[3:])
         return path

From 28e71c11624ccc91c306f36238e8789d05deb786 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 13 Feb 2024 10:36:35 +0530
Subject: [PATCH 15/72] Windows: Fix a regression in calibre 7 that caused
 images in long text columns to not be displayed in the tooltip for the
 tooltip

Yet another Qt regression. Sigh.
https://bugreports.qt.io/browse/QTBUG-122201
---
 src/calibre/gui2/library/models.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 1ebe70b76daa..aafce57bc281 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -22,7 +22,9 @@
 from calibre import (
     fit_image, human_readable, isbytestring, prepare_string_for_xml, strftime,
 )
-from calibre.constants import DEBUG, config_dir, dark_link_color, filesystem_encoding
+from calibre.constants import (
+    DEBUG, config_dir, dark_link_color, filesystem_encoding, iswindows,
+)
 from calibre.db.search import CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH, _match
 from calibre.db.utils import force_to_bool
 from calibre.ebooks.metadata import authors_to_string, fmt_sidx, string_to_authors
@@ -914,8 +916,17 @@ def func(idx):
                             text = fffunc(field_obj, idfunc(idx))
                             return (text) if force_to_bool(text) is None else None
                     else:
-                        def func(idx):
-                            return (fffunc(field_obj, idfunc(idx), default_value=''))
+                        if iswindows and dt == 'comments':
+                            # https://bugreports.qt.io/browse/QTBUG-122201
+                            file_pat = re.compile(r'"file:///([a-zA-Z]):/(.+?)"')
+                            def func(idx):
+                                ans = fffunc(field_obj, idfunc(idx), default_value='')
+                                if ans:
+                                    ans = file_pat.sub(r'"file:///\1%3a/\2"', ans)
+                                return ans
+                        else:
+                            def func(idx):
+                                return fffunc(field_obj, idfunc(idx), default_value='')
             elif dt == 'datetime':
                 def func(idx):
                     val = fffunc(field_obj, idfunc(idx), default_value=UNDEFINED_DATE)

From 43d3ea494114d96ef405404ffe7156757404da4f Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Tue, 13 Feb 2024 12:14:47 +0530
Subject: [PATCH 16/72] Update Swarajya Mag

---
 recipes/politico.recipe |  2 +-
 recipes/swarajya.recipe | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/recipes/politico.recipe b/recipes/politico.recipe
index 9af588d2f2db..a6b376ee2c06 100644
--- a/recipes/politico.recipe
+++ b/recipes/politico.recipe
@@ -37,7 +37,7 @@ class Politico(BasicNewsRecipe):
     ]
 
     remove_tags = [
-        dict(name=['notags', 'embed', 'aside', 'object', 'link', 'img', 'figure']),
+        dict(name=['notags', 'embed', 'aside', 'object', 'link', 'img', 'figure', 'svg', 'button']),
         dict(
             attrs={'class': lambda x: x and 'story-tools' in x.split()}),
         dict(
diff --git a/recipes/swarajya.recipe b/recipes/swarajya.recipe
index fd81f3998528..76fd237026de 100644
--- a/recipes/swarajya.recipe
+++ b/recipes/swarajya.recipe
@@ -9,39 +9,43 @@ class SwarajyaMag(BasicNewsRecipe):
     no_stylesheets = True
     remove_javascript = True
     use_embedded_content = False
-    remove_attributes = ['height', 'width']
+    remove_attributes = ['height', 'width', 'style']
     encoding = 'utf-8'
 
     keep_only_tags = [
-        classes('_2PqtR _1sMRD ntw8h author-bio'),
+        dict(name='article')
     ]
 
     remove_tags = [
-        classes('_JscD _2r17a'),
+        dict(name=['svg', 'button', 'source']),
+        classes('swarajya_patron_block hs-tooltip-content hidden'),
     ]
 
     def preprocess_html(self, soup):
-        for img in soup.findAll('img', attrs={'data-src': True}):
-            img['src'] = img['data-src'].split('?')[0]
+        for span in soup.findAll('span'):
+            if self.tag_to_string(span).strip() == 'Tags':
+                div = span.findParent('div')
+                if div:
+                    div.extract()
         return soup
 
     def parse_index(self):
         soup = self.index_to_soup('https://swarajyamag.com/all-issues')
-        a = soup.find('a', href=lambda x: x and x.startswith('/issue/'))
+        a = soup.find('a', href=lambda x: x and x.startswith('https://swarajyamag.com/issue/'))
         url = a['href']
         self.log('Downloading issue:', url)
-        self.cover_url = a.find('img', attrs={'data-src': True})['data-src']
-        soup = self.index_to_soup('https://swarajyamag.com' + url)
+        self.cover_url = a.img['src']
+        soup = self.index_to_soup(url)
         ans = []
 
-        for a in soup.findAll(**classes('_2eOQr')):
-            url = a['href']
+        for div in soup.findAll('div', attrs={'class':'rounded'}):
+            url = div.findParent('a')['href']
             if url.startswith('/'):
                 url = 'https://swarajyamag.com' + url
-            title = self.tag_to_string(a)
-            d = a.find_previous_sibling('a', **classes('_2nEd_'))
-            if d:
-                desc = 'By ' + self.tag_to_string(d).strip()
+            h4 = div.find('h4')
+            title = self.tag_to_string(h4)
+            d = h4.next_sibling
+            desc = 'By ' + self.tag_to_string(d).strip()
             self.log(title, ' at ', url, '\n', desc)
             ans.append({'title': title, 'url': url, 'description': desc})
         return [('Articles', ans)]

From 558992008a0a763e6ec30f0c5c330c9c28814786 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 14 Feb 2024 10:57:23 +0530
Subject: [PATCH 17/72] String changes

---
 src/calibre/gui2/actions/layout_actions.py | 2 +-
 src/pyj/book_list/edit_metadata.pyj        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/layout_actions.py b/src/calibre/gui2/actions/layout_actions.py
index 65ffe7a44bc0..ccae8f3b89aa 100644
--- a/src/calibre/gui2/actions/layout_actions.py
+++ b/src/calibre/gui2/actions/layout_actions.py
@@ -215,7 +215,7 @@ def delete_layout(self, name, show_warning=True):
         '''
         if show_warning:
             if not question_dialog(self.gui, _('Are you sure?'),
-                                   _('Do you really want to delete the saved layout {0}').format(name),
+                                   _('Do you really want to delete the saved layout {0}?').format(name),
                                    skip_dialog_name='delete_saved_gui_layout'):
                 return
         layouts = gprefs['saved_layouts']
diff --git a/src/pyj/book_list/edit_metadata.pyj b/src/pyj/book_list/edit_metadata.pyj
index 906f637a0dde..9541819045ae 100644
--- a/src/pyj/book_list/edit_metadata.pyj
+++ b/src/pyj/book_list/edit_metadata.pyj
@@ -1120,7 +1120,7 @@ def on_close(container_id):
             )
         else:
             if has_changes:
-                question_dialog(_('Are you sure'), _(
+                question_dialog(_('Are you sure?'), _(
                     'Any changes you have made will be discarded.'
                     ' Do you wish to discard all changes?'), def (yes):
                         if yes:

From 3cbcd0acc98911c7688978780a797b87a4fff98e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Feb 2024 09:35:09 +0530
Subject: [PATCH 18/72] Change how background image works in preparation for
 profiles

Allow multiple background images and allow settings from browser and
desktop readers to work with each other
---
 src/calibre/gui2/viewer/web_view.py         | 47 +++++++++++++--------
 src/calibre/srv/content.py                  | 17 +++++++-
 src/pyj/read_book/prefs/user_stylesheet.pyj | 39 ++++++++++++-----
 src/pyj/read_book/view.pyj                  |  4 +-
 src/pyj/viewer-main.pyj                     |  7 +--
 src/pyj/viewer/constants.pyj                |  1 -
 6 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 346373837021..14fe4a593482 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -77,18 +77,26 @@ def get_data(name):
     return None, None
 
 
-def background_image():
-    ans = getattr(background_image, 'ans', None)
-    if ans is None:
+@lru_cache(maxsize=4)
+def background_image(encoded_fname=''):
+    if not encoded_fname:
         img_path = os.path.join(viewer_config_dir, 'bg-image.data')
-        if os.path.exists(img_path):
+        try:
             with open(img_path, 'rb') as f:
                 data = f.read()
-                mt, data = data.split(b'|', 1)
-        else:
-            ans = b'image/jpeg', b''
-        ans = background_image.ans = mt.decode('utf-8'), data
-    return ans
+            mt, data = data.split(b'|', 1)
+            mt = mt.decode()
+            return mt, data
+        except FileNotFoundError:
+            return 'image/jpeg', b''
+    fname = bytes.fromhex(encoded_fname).decode()
+    img_path = os.path.join(viewer_config_dir, 'background-images', fname)
+    mt = guess_type(fname)[0] or 'image/jpeg'
+    try:
+        with open(img_path, 'rb') as f:
+            return mt, f.read()
+    except FileNotFoundError:
+        return mt, b''
 
 
 @lru_cache(maxsize=2)
@@ -161,10 +169,11 @@ def requestStarted(self, rq):
             send_reply(rq, set_book_path.manifest_mime, data)
         elif name == 'reader-background':
             mt, data = background_image()
-            if data:
-                send_reply(rq, mt, data)
-            else:
-                rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound)
+            send_reply(rq, mt, data) if data else rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound)
+        elif name.startswith('reader-background-'):
+            encoded_fname = name[len('reader-background-'):]
+            mt, data = background_image(encoded_fname)
+            send_reply(rq, mt, data) if data else rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound)
         elif name.startswith('mathjax/'):
             handle_mathjax_request(rq, name)
         elif not name:
@@ -693,14 +702,16 @@ def show_home_page(self):
         self.execute_when_ready('show_home_page')
 
     def change_background_image(self, img_id):
-        files = choose_images(self, 'viewer-background-image', _('Choose background image'), formats=['png', 'gif', 'jpg', 'jpeg'])
+        files = choose_images(self, 'viewer-background-image', _('Choose background image'), formats=['png', 'gif', 'jpg', 'jpeg', 'webp'])
         if files:
             img = files[0]
-            with open(img, 'rb') as src, open(os.path.join(viewer_config_dir, 'bg-image.data'), 'wb') as dest:
-                dest.write(as_bytes(guess_type(img)[0] or 'image/jpeg') + b'|')
-                shutil.copyfileobj(src, dest)
+            d = os.path.join(viewer_config_dir, 'background-images')
+            os.makedirs(d, exist_ok=True)
+            fname = os.path.basename(img)
+            shutil.copyfile(img, os.path.join(d, fname))
             background_image.ans = None
-            self.execute_when_ready('background_image_changed', img_id)
+            encoded = fname.encode().hex()
+            self.execute_when_ready('background_image_changed', img_id, f'{FAKE_PROTOCOL}://{FAKE_HOST}/reader-background-{encoded}')
 
     def goto_frac(self, frac):
         self.execute_when_ready('goto_frac', frac)
diff --git a/src/calibre/srv/content.py b/src/calibre/srv/content.py
index 90c37a4a6915..1f06062b1d1f 100644
--- a/src/calibre/srv/content.py
+++ b/src/calibre/srv/content.py
@@ -30,7 +30,9 @@
 from calibre.srv.utils import get_db, get_use_roman, http_date
 from calibre.utils.config_base import tweaks
 from calibre.utils.date import timestampfromdt
-from calibre.utils.filenames import ascii_filename, atomic_rename
+from calibre.utils.filenames import (
+    ascii_filename, atomic_rename, make_long_path_useable,
+)
 from calibre.utils.img import image_from_data, scale_image
 from calibre.utils.localization import _
 from calibre.utils.resources import get_image_path as I, get_path as P
@@ -303,6 +305,19 @@ def icon(ctx, rd, which):
         return ans
 
 
+@endpoint('/reader-background/{encoded_fname}', android_workaround=True)
+def reader_background(ctx, rd, encoded_fname):
+    base = os.path.abspath(os.path.normapth(os.path.join(config_dir, 'viewer', 'background-images')))
+    fname = bytes.fromhex(encoded_fname)
+    q = os.path.abspath(os.path.normpath(os.path.join(base, fname)))
+    if not q.startswith(base):
+        raise HTTPNotFound(f'Reader background {encoded_fname} not found')
+    try:
+        return share_open(make_long_path_useable(q), 'rb')
+    except FileNotFoundError:
+        raise HTTPNotFound(f'Reader background {encoded_fname} not found')
+
+
 @endpoint('/get/{what}/{book_id}/{library_id=None}', android_workaround=True)
 def get(ctx, rd, what, book_id, library_id):
     book_id, rest = book_id.partition('_')[::2]
diff --git a/src/pyj/read_book/prefs/user_stylesheet.pyj b/src/pyj/read_book/prefs/user_stylesheet.pyj
index 450f7072facf..77e04657c28e 100644
--- a/src/pyj/read_book/prefs/user_stylesheet.pyj
+++ b/src/pyj/read_book/prefs/user_stylesheet.pyj
@@ -3,14 +3,16 @@
 from __python__ import bound_methods, hash_literals
 
 from elementmaker import E
-from gettext import gettext as _
 
+from ajax import absolute_path
 from book_list.globals import get_session_data
 from dom import ensure_id, unique_id
+from encodings import hexlify
+from gettext import gettext as _
 from read_book.globals import runtime, ui_operations
 from read_book.prefs.utils import create_button_box
 from session import session_defaults
-from viewer.constants import READER_BACKGROUND_URL
+from viewer.constants import FAKE_HOST, FAKE_PROTOCOL
 from widgets import create_button
 
 BLANK = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
@@ -21,19 +23,33 @@ def change_background_image(img_id):
 
 
 def clear_image(img_id):
-    document.getElementById(img_id).src = BLANK
+    i = document.getElementById(img_id)
+    i.src = BLANK
+    i.dataset.url = ''
+
+
+def modify_background_image_url_for_fetch(url):
+    if not url:
+        return BLANK
+    if runtime.is_standalone_viewer:
+        if url.startswith(f'{FAKE_PROTOCOL}:'):
+            return url
+        encoded = hexlify(url)
+        return f'{FAKE_PROTOCOL}://{FAKE_HOST}/reader-background-{encoded}'
+    if url.startswith(f'{FAKE_PROTOCOL}:'):
+        x = str.split(url, '/')[-1].partition('?')[0].partition('-')[2]
+        return absolute_path(f'reader-background/{x}')
+    return url
 
 
 def standalone_background_widget(sd):
-    if sd.get('background_image'):
-        src = READER_BACKGROUND_URL
-    else:
-        src = BLANK
+    url = sd.get('background_image')
+    src = modify_background_image_url_for_fetch(url)
     img_id = unique_id('bg-image')
 
     return E.div(
         style='display: flex; align-items: center',
-        E.div(E.img(src=src, id=img_id, class_='bg-image-preview', style='width: 75px; height: 75px; border: solid 1px')),
+        E.div(E.img(src=src, data_url=url, id=img_id, class_='bg-image-preview', style='width: 75px; height: 75px; border: solid 1px')),
         E.div('\xa0', style='margin: 0.5rem'),
         create_button(_('Change image'), action=change_background_image.bind(None, img_id)),
         E.div('\xa0', style='margin: 0.5rem'),
@@ -77,7 +93,8 @@ def restore_defaults():
     container = document.getElementById(create_user_stylesheet_panel.container_id)
     container.querySelector('[name=user-stylesheet]').value = ''
     if runtime.is_standalone_viewer:
-        clear_image(container.querySelector('img').id)
+        i = container.querySelector('img')
+        clear_image(i.id)
     else:
         container.querySelector('[name=background_image]').value = ''
     container.querySelector('select[name=background_image_style]').value = session_defaults().background_image_style
@@ -132,8 +149,8 @@ def commit_user_stylesheet(onchange, container):
         sd.set('user_stylesheet', val)
         changed = True
     if runtime.is_standalone_viewer:
-        bg_image = container.querySelector('img.bg-image-preview').src
-        if bg_image is BLANK:
+        bg_image = container.querySelector('img.bg-image-preview').dataset.url
+        if bg_image is BLANK or not bg_image:
             bg_image = None
     else:
         bg_image = container.querySelector('input[name=background_image]').value
diff --git a/src/pyj/read_book/view.pyj b/src/pyj/read_book/view.pyj
index 3d8d86858bba..4dc0e7a66fbe 100644
--- a/src/pyj/read_book/view.pyj
+++ b/src/pyj/read_book/view.pyj
@@ -33,6 +33,7 @@ from read_book.prefs.head_foot import render_head_foot
 from read_book.prefs.scrolling import (
     MIN_SCROLL_SPEED_AUTO as SCROLL_SPEED_STEP, change_scroll_speed
 )
+from read_book.prefs.user_stylesheet import modify_background_image_url_for_fetch
 from read_book.read_aloud import ReadAloud
 from read_book.read_audio_ebook import ReadAudioEbook
 from read_book.resources import load_resources
@@ -49,7 +50,6 @@ from utils import (
     default_context_menu_should_be_allowed, html_escape, is_ios, parse_url_params,
     safe_set_inner_html, username_key
 )
-from viewer.constants import READER_BACKGROUND_URL
 
 add_extra_css(def():
     sel = '.book-side-margin'
@@ -851,7 +851,7 @@ class View:
         iframe.style.backgroundColor = ans.background or 'white'
         bg_image = sd.get('background_image')
         if bg_image:
-            iframe.style.backgroundImage = f'url({READER_BACKGROUND_URL}?{Date().getTime()})' if runtime.is_standalone_viewer else f'url({bg_image})'
+            iframe.style.backgroundImage = f'url({modify_background_image_url_for_fetch(bg_image)})'
         else:
             iframe.style.backgroundImage = 'none'
         if sd.get('background_image_style') is 'scaled':
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index c1729e912fac..8e61ba346213 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -26,7 +26,7 @@ from read_book.prefs.head_foot import set_time_formatter
 from read_book.view import View
 from session import local_storage, session_defaults, default_interface_data
 from utils import debounce, encode_query_with_path, parse_url_params
-from viewer.constants import FAKE_HOST, FAKE_PROTOCOL, READER_BACKGROUND_URL
+from viewer.constants import FAKE_HOST, FAKE_PROTOCOL
 
 runtime.is_standalone_viewer = True
 runtime.FAKE_HOST = FAKE_HOST
@@ -267,10 +267,11 @@ def goto_frac(frac):
 
 
 @from_python
-def background_image_changed(img_id):
+def background_image_changed(img_id, url):
     img = document.getElementById(img_id)
     if img:
-        img.src = READER_BACKGROUND_URL + '?' + Date().getTime()
+        img.src = f'{url}?{Date().getTime()}'
+        img.dataset.url = url
 
 
 @from_python
diff --git a/src/pyj/viewer/constants.pyj b/src/pyj/viewer/constants.pyj
index 5ee296b98614..aaabf5aefe31 100644
--- a/src/pyj/viewer/constants.pyj
+++ b/src/pyj/viewer/constants.pyj
@@ -5,4 +5,3 @@ from __python__ import bound_methods, hash_literals
 
 FAKE_PROTOCOL = '__FAKE_PROTOCOL__'
 FAKE_HOST = '__FAKE_HOST__'
-READER_BACKGROUND_URL = f'{FAKE_PROTOCOL}://{FAKE_HOST}/reader-background'

From f8b3652880c188d877bae2afb9a63503690f62a1 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Thu, 15 Feb 2024 09:44:52 +0530
Subject: [PATCH 19/72] Andhrajyothy (telugu) recipe

---
 recipes/andhrajyothy_ap.recipe     | 122 +++++++++++++++++++++++++++++
 recipes/andhrajyothy_tel.recipe    | 122 +++++++++++++++++++++++++++++
 recipes/icons/andhrajyothy_ap.png  | Bin 0 -> 889 bytes
 recipes/icons/andhrajyothy_tel.png | Bin 0 -> 889 bytes
 recipes/toiprint.recipe            |   4 +-
 5 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 recipes/andhrajyothy_ap.recipe
 create mode 100644 recipes/andhrajyothy_tel.recipe
 create mode 100644 recipes/icons/andhrajyothy_ap.png
 create mode 100644 recipes/icons/andhrajyothy_tel.png

diff --git a/recipes/andhrajyothy_ap.recipe b/recipes/andhrajyothy_ap.recipe
new file mode 100644
index 000000000000..3e7834098ccc
--- /dev/null
+++ b/recipes/andhrajyothy_ap.recipe
@@ -0,0 +1,122 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+import json
+from datetime import date
+from collections import defaultdict
+
+# figure out your local edition id from the log of this recipe
+edi_id = 182 # NTR VIJAYAWADA - 182
+
+today = date.today().strftime('%d/%m/%Y')
+
+# for older edition
+# today = '15/01/2024'
+
+day, month, year = (int(x) for x in today.split('/'))
+dt = date(year, month, day)
+today = today.replace('/', '%2F')
+
+index = 'https://epaper.andhrajyothy.com'
+
+class andhra(BasicNewsRecipe):
+    title = 'ఆంధ్రజ్యోతి - ఆంధ్రప్రదేశ్'
+    language = 'te'
+    __author__ = 'unkn0wn'
+    masthead_url = 'https://upload.wikimedia.org/wikipedia/commons/0/01/Andhra_Jyothi_newspaper_logo.png'
+    timefmt = ' [' + dt.strftime('%b %d, %Y') + ']'
+    description = 'Articles from the ABN Andhra Jyothy epaper, digital edition'
+    encoding = 'utf-8'
+    remove_empty_feeds = True
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        if self.output_profile.short_name.startswith('kindle'):
+            self.title = 'ఆంధ్రజ్యోతి ' + dt.strftime('%b %d, %Y')
+
+    extra_css = '''
+        .cap { text-align:center; font-size:small; }
+        img { display:block; margin:0 auto; }
+    '''
+
+    def parse_index(self):
+
+        self.log(
+            '\n***\nif this recipe fails, report it on: '
+            'https://www.mobileread.com/forums/forumdisplay.php?f=228\n***\n'
+        )
+
+        get_edition = index + '/Home/GetEditionsHierarchy'
+        edi_data = json.loads(self.index_to_soup(get_edition, raw=True))
+        self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
+        for edi in edi_data:
+            if edi['org_location'] in {'Magazines', 'Navya Daily'}:
+                    continue
+            self.log(edi['org_location'])
+            cities = []
+            for edi_loc in edi['editionlocation']:
+                cities.append(edi_loc['Editionlocation'] + ' - ' + edi_loc['EditionId'])
+            self.log('\t', ',\n\t'.join(cities))
+
+        self.log('\nDownloading: Edition ID - ', edi_id)
+        url = index + '/Home/GetAllpages?editionid=' + str(edi_id) + '&editiondate=' + today
+        main_data = json.loads(self.index_to_soup(url, raw=True))
+
+        feeds_dict = defaultdict(list)
+
+        for page in main_data:
+            sec_name = page['PageNo'] + 'వ పేజీ'
+            if page['PageNumber'] == 'Page 1':
+                self.cover_url = page['HighResolution']
+            art = index + '/Home/getingRectangleObject?pageid=' + str(page['PageId'])
+            raw2 = self.index_to_soup(art, raw=True)
+            art_data = json.loads(raw2)
+            for snaps in art_data:
+                section = sec_name
+                url = str(snaps['OrgId'])
+                if snaps['ObjectType'] == 4:
+                    continue
+                feeds_dict[section].append({"title": '', "url": url})
+        return [(section, articles) for section, articles in feeds_dict.items()]
+
+    def preprocess_raw_html(self, raw, *a):
+        data = json.loads(raw)
+        body = ''
+        for x in data['StoryContent']:
+            if x['Headlines']:
+                if len(x['Headlines']) > 0:
+                    body += '<h1>' + x['Headlines'][0].replace('\n', ' ') + '</h1>'
+                for y in x['Headlines'][1:]:
+                    body += '<h4>' + y.replace('\n', ' ') + '</h4>'
+        if data['LinkPicture']:
+            for pics in data['LinkPicture']:
+                if pics['fullpathlinkpic']:
+                    body += '<div><img src="{}"></div>'.format(pics['fullpathlinkpic'])
+                if pics['caption']:
+                    body += '<div class="cap">' + pics['caption'] + '</div><p>'
+        for x in data['StoryContent']:
+            if x['Body'] and x['Body'] != '':
+                body += '<span class="body">' + x['Body'] + '</span>'
+        # if data['filepathstorypic']: # this gives you a snap image of the article from page
+        #     body += '<div><img src="{}"></div>'.format(data['filepathstorypic'].replace('\\', '/'))
+        if body.strip() == '':
+            self.abort_article('no article')
+        return '<html><body><div>' + body + '</div></body></html>'
+
+    def populate_article_metadata(self, article, soup, first):
+        article.url = '***'
+        h1 = soup.find('h1')
+        h4 = soup.find('h4')
+        body = soup.find(attrs={'class':'body'})
+        if h4:
+            article.summary = self.tag_to_string(h4)
+            article.text_summary = article.summary
+        elif body:
+            article.summary = ' '.join(self.tag_to_string(body).split()[:15]) + '...'
+            article.text_summary = article.summary
+        article.title = 'ఆంధ్రజ్యోతి'
+        if h1:
+            article.title = self.tag_to_string(h1)
+        elif body:
+            article.title = ' '.join(self.tag_to_string(body).split()[:7]) + '...'
+
+    def print_version(self, url):
+        return index + '/User/ShowArticleView?OrgId=' + url
diff --git a/recipes/andhrajyothy_tel.recipe b/recipes/andhrajyothy_tel.recipe
new file mode 100644
index 000000000000..7dc64498541c
--- /dev/null
+++ b/recipes/andhrajyothy_tel.recipe
@@ -0,0 +1,122 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+import json
+from datetime import date
+from collections import defaultdict
+
+# figure out your local edition id from the log of this recipe
+edi_id = 225 # TELANGANA MAIN II - 225
+
+today = date.today().strftime('%d/%m/%Y')
+
+# for older edition
+# today = '15/01/2024'
+
+day, month, year = (int(x) for x in today.split('/'))
+dt = date(year, month, day)
+today = today.replace('/', '%2F')
+
+index = 'https://epaper.andhrajyothy.com'
+
+class andhra(BasicNewsRecipe):
+    title = 'ఆంధ్రజ్యోతి - తెలంగాణ'
+    language = 'te'
+    __author__ = 'unkn0wn'
+    masthead_url = 'https://upload.wikimedia.org/wikipedia/commons/0/01/Andhra_Jyothi_newspaper_logo.png'
+    timefmt = ' [' + dt.strftime('%b %d, %Y') + ']'
+    description = 'Articles from the ABN Andhra Jyothy epaper, digital edition'
+    encoding = 'utf-8'
+    remove_empty_feeds = True
+
+    def __init__(self, *args, **kwargs):
+        BasicNewsRecipe.__init__(self, *args, **kwargs)
+        if self.output_profile.short_name.startswith('kindle'):
+            self.title = 'ఆంధ్రజ్యోతి ' + dt.strftime('%b %d, %Y')
+
+    extra_css = '''
+        .cap { text-align:center; font-size:small; }
+        img { display:block; margin:0 auto; }
+    '''
+
+    def parse_index(self):
+
+        self.log(
+            '\n***\nif this recipe fails, report it on: '
+            'https://www.mobileread.com/forums/forumdisplay.php?f=228\n***\n'
+        )
+
+        get_edition = index + '/Home/GetEditionsHierarchy'
+        edi_data = json.loads(self.index_to_soup(get_edition, raw=True))
+        self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
+        for edi in edi_data:
+            if edi['org_location'] in {'Magazines', 'Navya Daily'}:
+                    continue
+            self.log(edi['org_location'])
+            cities = []
+            for edi_loc in edi['editionlocation']:
+                cities.append(edi_loc['Editionlocation'] + ' - ' + edi_loc['EditionId'])
+            self.log('\t', ',\n\t'.join(cities))
+
+        self.log('\nDownloading: Edition ID - ', edi_id)
+        url = index + '/Home/GetAllpages?editionid=' + str(edi_id) + '&editiondate=' + today
+        main_data = json.loads(self.index_to_soup(url, raw=True))
+
+        feeds_dict = defaultdict(list)
+
+        for page in main_data:
+            sec_name = page['PageNo'] + 'వ పేజీ'
+            if page['PageNumber'] == 'Page 1':
+                self.cover_url = page['HighResolution']
+            art = index + '/Home/getingRectangleObject?pageid=' + str(page['PageId'])
+            raw2 = self.index_to_soup(art, raw=True)
+            art_data = json.loads(raw2)
+            for snaps in art_data:
+                section = sec_name
+                url = str(snaps['OrgId'])
+                if snaps['ObjectType'] == 4:
+                    continue
+                feeds_dict[section].append({"title": '', "url": url})
+        return [(section, articles) for section, articles in feeds_dict.items()]
+
+    def preprocess_raw_html(self, raw, *a):
+        data = json.loads(raw)
+        body = ''
+        for x in data['StoryContent']:
+            if x['Headlines']:
+                if len(x['Headlines']) > 0:
+                    body += '<h1>' + x['Headlines'][0].replace('\n', ' ') + '</h1>'
+                for y in x['Headlines'][1:]:
+                    body += '<h4>' + y.replace('\n', ' ') + '</h4>'
+        if data['LinkPicture']:
+            for pics in data['LinkPicture']:
+                if pics['fullpathlinkpic']:
+                    body += '<div><img src="{}"></div>'.format(pics['fullpathlinkpic'])
+                if pics['caption']:
+                    body += '<div class="cap">' + pics['caption'] + '</div><p>'
+        for x in data['StoryContent']:
+            if x['Body'] and x['Body'] != '':
+                body += '<span class="body">' + x['Body'] + '</span>'
+        # if data['filepathstorypic']: # this gives you a snap image of the article from page
+        #     body += '<div><img src="{}"></div>'.format(data['filepathstorypic'].replace('\\', '/'))
+        if body.strip() == '':
+            self.abort_article('no article')
+        return '<html><body><div>' + body + '</div></body></html>'
+
+    def populate_article_metadata(self, article, soup, first):
+        article.url = '***'
+        h1 = soup.find('h1')
+        h4 = soup.find('h4')
+        body = soup.find(attrs={'class':'body'})
+        if h4:
+            article.summary = self.tag_to_string(h4)
+            article.text_summary = article.summary
+        elif body:
+            article.summary = ' '.join(self.tag_to_string(body).split()[:15]) + '...'
+            article.text_summary = article.summary
+        article.title = 'ఆంధ్రజ్యోతి'
+        if h1:
+            article.title = self.tag_to_string(h1)
+        elif body:
+            article.title = ' '.join(self.tag_to_string(body).split()[:7]) + '...'
+
+    def print_version(self, url):
+        return index + '/User/ShowArticleView?OrgId=' + url
diff --git a/recipes/icons/andhrajyothy_ap.png b/recipes/icons/andhrajyothy_ap.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a09c537a949af5ad8db26723010c894d0c2484
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009(Nkl<ZIE`(R
zOKeni7{!0zy?36@bf&Ly`kbMbwiF^Mf)>yc5^H?|)o5bekgya{!-f?kq`^cJq8nq3
z3#*AnB^3>n1gj?62cS^3EmN(1lj(!D(+(Zxb?^LLlqQXO*5`M=^Cd^vAf=Q5t;v-6
zoQNo=L+=1ChzLrleU_zO$mNvVX45)>4iP~%z}n(U>ch^y=_B9tO(6oUdqNy)3ZJqW
zTI@pi<a_7)rX-!UcxG2Q2b;oYeICbgV;wfF+|kdwMvt_046(492H?i@3i)39sr#I^
z%*ikQkVrHRK+otRPKWWPQtG^}lqw#J#&3>A?;JdHZqPQhnBZ7T4Gp1uz8{(+=yl3!
zGHZO+J4vbEMPqdlL$_8i)26iU4bK>fWcK)_-swt*U8jFCMrDDECmKpIEk*lJ<2Y?P
z$l9kbK2pKU`>RrKeKp`*No2U2GJVGHBa8cImy?X&POz=q$AKMXy!&m0<z$xHQZJ7`
zRGJa6YJy(Zd^|-eV`?6ULBQj{=e3V%N@2S^ILpP~qWIl59<D3mrM)3S`7RFaC`T8u
zJMFsb^`~kXj>c*Ga=_mG*8<NrR^)(Aqc-HfT3?#iaD6<+)zKx|yGGFkVkwjNyGD5D
zVuXfG1=QW|VS9z2kGm(REOe8}S^yqVN`<cs&h@|X(J%gA$7363fyb_+6eQNn05m>O
z$mC*zrp?8)pJ+O5h{%L#<vs}dTqhvLYt5VSIt)sR+-wWygHqi1dx`OxI3<N{EKBie
z&jhzu(@f7NwrBvlCRZM-D+b`Z!C72RgZhx4{5;2OMTvK;c~=?FH*F%|bMj+ko{_m#
z?7C3wcg`C3nq6+(8d$C?@%o2n?r`$l0JXh&gbUq4Lld$&#jT|zk?0CJwFd023*d3v
zt{DI#lFVeSGl%z8y?wf4kh>X+;b@%Ud&~Q`_EZ<rva@Us_<FqoHbXo6N^|w2N~r^%
z{5(PAe_*?=(ehxBSD&smcWx;@EFuZnXi!SoQfaI0+Rgc6*Z*8__Kz*Gnl{k{ssbK%
z*9WMn^hLH-6&w|j9{}V(XV!v(z>`X;?b&S3qv>KAx;6>)0X-sOu6zFhZ2Vic#^^SP
P00000NkvXXu0mjf8vnJK

literal 0
HcmV?d00001

diff --git a/recipes/icons/andhrajyothy_tel.png b/recipes/icons/andhrajyothy_tel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a09c537a949af5ad8db26723010c894d0c2484
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009(Nkl<ZIE`(R
zOKeni7{!0zy?36@bf&Ly`kbMbwiF^Mf)>yc5^H?|)o5bekgya{!-f?kq`^cJq8nq3
z3#*AnB^3>n1gj?62cS^3EmN(1lj(!D(+(Zxb?^LLlqQXO*5`M=^Cd^vAf=Q5t;v-6
zoQNo=L+=1ChzLrleU_zO$mNvVX45)>4iP~%z}n(U>ch^y=_B9tO(6oUdqNy)3ZJqW
zTI@pi<a_7)rX-!UcxG2Q2b;oYeICbgV;wfF+|kdwMvt_046(492H?i@3i)39sr#I^
z%*ikQkVrHRK+otRPKWWPQtG^}lqw#J#&3>A?;JdHZqPQhnBZ7T4Gp1uz8{(+=yl3!
zGHZO+J4vbEMPqdlL$_8i)26iU4bK>fWcK)_-swt*U8jFCMrDDECmKpIEk*lJ<2Y?P
z$l9kbK2pKU`>RrKeKp`*No2U2GJVGHBa8cImy?X&POz=q$AKMXy!&m0<z$xHQZJ7`
zRGJa6YJy(Zd^|-eV`?6ULBQj{=e3V%N@2S^ILpP~qWIl59<D3mrM)3S`7RFaC`T8u
zJMFsb^`~kXj>c*Ga=_mG*8<NrR^)(Aqc-HfT3?#iaD6<+)zKx|yGGFkVkwjNyGD5D
zVuXfG1=QW|VS9z2kGm(REOe8}S^yqVN`<cs&h@|X(J%gA$7363fyb_+6eQNn05m>O
z$mC*zrp?8)pJ+O5h{%L#<vs}dTqhvLYt5VSIt)sR+-wWygHqi1dx`OxI3<N{EKBie
z&jhzu(@f7NwrBvlCRZM-D+b`Z!C72RgZhx4{5;2OMTvK;c~=?FH*F%|bMj+ko{_m#
z?7C3wcg`C3nq6+(8d$C?@%o2n?r`$l0JXh&gbUq4Lld$&#jT|zk?0CJwFd023*d3v
zt{DI#lFVeSGl%z8y?wf4kh>X+;b@%Ud&~Q`_EZ<rva@Us_<FqoHbXo6N^|w2N~r^%
z{5(PAe_*?=(ehxBSD&smcWx;@EFuZnXi!SoQfaI0+Rgc6*Z*8__Kz*Gnl{k{ssbK%
z*9WMn^hLH-6&w|j9{}V(XV!v(z>`X;?b&S3qv>KAx;6>)0X-sOu6zFhZ2Vic#^^SP
P00000NkvXXu0mjf8vnJK

literal 0
HcmV?d00001

diff --git a/recipes/toiprint.recipe b/recipes/toiprint.recipe
index 3f9f50350185..c4399d1bad28 100644
--- a/recipes/toiprint.recipe
+++ b/recipes/toiprint.recipe
@@ -33,8 +33,7 @@ def handle_images(x, soup):
             img_div.insert_after(cap)
         else:
             x.insert_after(img_div)
-    lead = soup.find('div', attrs={'class':'lead'})
-    if lead:
+    for lead in reversed(soup.findAll('div', attrs={'class':'lead'})):
         x.insert_after(lead)
 
 class toiprint(BasicNewsRecipe):
@@ -45,6 +44,7 @@ class toiprint(BasicNewsRecipe):
     timefmt = ' [' + dt.strftime('%b %d, %Y') + ']'
     description = 'Articles from the Times of India epaper, digital edition'
     encoding = 'utf-8'
+    remove_empty_feeds = True
 
     def __init__(self, *args, **kwargs):
         BasicNewsRecipe.__init__(self, *args, **kwargs)

From 773f7676b5141c9f6540bd99f7550213ca9e021c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Feb 2024 13:09:32 +0530
Subject: [PATCH 20/72] Remove <button> from all recipe downloads

---
 src/calibre/web/feeds/news.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index 2e8ef8a7a155..60aaa71b6e1d 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -1032,7 +1032,7 @@ def _postprocess_html(self, soup, first_fetch, job_info):
         for attr in self.remove_attributes:
             for x in soup.findAll(attrs={attr:True}):
                 del x[attr]
-        for bad_tag in list(soup.findAll(['base', 'iframe', 'canvas', 'embed',
+        for bad_tag in list(soup.findAll(['base', 'iframe', 'canvas', 'embed', 'button',
             'command', 'datalist', 'video', 'audio', 'noscript', 'link', 'meta'])):
             # link tags can be used for preloading causing network activity in
             # calibre viewer. meta tags can do all sorts of crazy things,

From aeb19dfedfe14c5ee8d454c831d634e81219bf44 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Feb 2024 14:37:10 +0530
Subject: [PATCH 21/72] More Wayland time wasting

Wayland is designed so an application cant raise it sub windows without
also giving them keyboard focus. So write stupid boilerplate code
to ans request focus on wayland when raising a window. Sigh.
---
 src/calibre/gui2/__init__.py                  | 20 ++++++++++++++++++-
 src/calibre/gui2/actions/browse_notes.py      |  3 +--
 src/calibre/gui2/actions/fts.py               |  2 +-
 src/calibre/gui2/dialogs/template_dialog.py   |  2 +-
 src/calibre/gui2/library/annotations.py       |  2 +-
 src/calibre/gui2/lrf_renderer/main.py         |  3 +--
 src/calibre/gui2/proceed.py                   |  2 +-
 src/calibre/gui2/store/web_store.py           |  2 +-
 src/calibre/gui2/tweak_book/boss.py           | 12 +++++------
 src/calibre/gui2/tweak_book/char_select.py    |  2 +-
 .../gui2/tweak_book/completion/popup.py       |  2 +-
 .../gui2/tweak_book/function_replace.py       |  2 +-
 src/calibre/gui2/tweak_book/job.py            |  2 +-
 src/calibre/gui2/tweak_book/manage_fonts.py   |  2 +-
 src/calibre/gui2/tweak_book/preview.py        |  2 +-
 src/calibre/gui2/ui.py                        |  2 +-
 src/calibre/gui2/viewer/main.py               |  2 +-
 src/calibre/gui2/viewer/ui.py                 |  4 ++--
 src/calibre/gui2/widgets2.py                  |  2 +-
 19 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 34ce7206cf80..3ef8d234f35f 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -16,7 +16,7 @@
     QFontDatabase, QFontInfo, QFontMetrics, QGuiApplication, QIcon, QImageReader,
     QImageWriter, QIODevice, QLocale, QNetworkProxyFactory, QObject, QPalette,
     QResource, QSettings, QSocketNotifier, QStringListModel, Qt, QThread, QTimer,
-    QTranslator, QUrl, pyqtSignal, pyqtSlot,
+    QTranslator, QUrl, QWidget, pyqtSignal, pyqtSlot,
 )
 from threading import Lock, RLock
 
@@ -1706,3 +1706,21 @@ def fix_qt_bodging_windows_paths(path: str) -> str:
     if qurl.isRelative():  # this means has no scheme
         return fix_qt_bodging_windows_paths(qurl.path())
     return ''
+
+
+def raise_and_focus(self: QWidget) -> None:
+    self.raise_()
+    self.activateWindow()
+
+
+def raise_without_focus(self: QWidget) -> None:
+    if QApplication.instance().platformName() == 'wayland':
+        # On fucking Wayland, we cant raise a dialog without also giving it
+        # keyboard focus. What a joke.
+        self.raise_and_focus()
+    else:
+        self.raise_()
+
+
+QWidget.raise_and_focus = raise_and_focus
+QWidget.raise_without_focus = raise_without_focus
diff --git a/src/calibre/gui2/actions/browse_notes.py b/src/calibre/gui2/actions/browse_notes.py
index 8f7677a7f120..c80808b8468e 100644
--- a/src/calibre/gui2/actions/browse_notes.py
+++ b/src/calibre/gui2/actions/browse_notes.py
@@ -19,8 +19,7 @@ def genesis(self):
 
     def show_browser(self):
         if self.d is not None and self.d.isVisible():
-            self.d.raise_()
-            self.d.activateWindow()
+            self.d.raise_and_focus()
         else:
             from calibre.gui2.library.notes import NotesBrowser
             self.d = NotesBrowser(self.gui)
diff --git a/src/calibre/gui2/actions/fts.py b/src/calibre/gui2/actions/fts.py
index 6571b3ce9d13..c4fdf0f16632 100644
--- a/src/calibre/gui2/actions/fts.py
+++ b/src/calibre/gui2/actions/fts.py
@@ -29,7 +29,7 @@ def show_fts(self):
         if text and ':' not in text:
             self.dialog.set_search_text(text)
         self.dialog.show()
-        self.dialog.raise_()
+        self.dialog.raise_and_focus()
 
     def library_changed(self, db):
         if self._dialog is not None:
diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index d88bb664fd09..add80773e202 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -339,7 +339,7 @@ def __init__(self, parent, text, mi=None, fm=None, color_field=None,
             QDialog.__init__(self, parent, flags=Qt.WindowType.Dialog)
         else:
             QDialog.__init__(self, None, flags=Qt.WindowType.Window)
-            self.raise_()  # Not needed on windows but here just in case
+            self.raise_and_focus()  # Not needed on windows but here just in case
         Ui_TemplateDialog.__init__(self)
         self.setupUi(self)
         self.setWindowIcon(self.windowIcon())
diff --git a/src/calibre/gui2/library/annotations.py b/src/calibre/gui2/library/annotations.py
index 58f504e73559..0a53a414c99d 100644
--- a/src/calibre/gui2/library/annotations.py
+++ b/src/calibre/gui2/library/annotations.py
@@ -1061,7 +1061,7 @@ def show_dialog(self, restrict_to_book_ids=None):
         else:
             self.reinitialize(restrict_to_book_ids)
             self.show()
-            self.raise_()
+            self.raise_and_focus()
             QTimer.singleShot(80, self.browse_panel.effective_query_changed)
 
     def selection_changed(self):
diff --git a/src/calibre/gui2/lrf_renderer/main.py b/src/calibre/gui2/lrf_renderer/main.py
index 07dcb2e68f2b..b3fb4405b222 100644
--- a/src/calibre/gui2/lrf_renderer/main.py
+++ b/src/calibre/gui2/lrf_renderer/main.py
@@ -314,8 +314,7 @@ def main(args=sys.argv, logger=None):
         main.set_exception_handler()
         main.show()
         main.render()
-        main.activateWindow()
-        main.raise_()
+        main.raise_and_focus()
         return app.exec()
     return 0
 
diff --git a/src/calibre/gui2/proceed.py b/src/calibre/gui2/proceed.py
index 57412f1669e0..96beb32f3999 100644
--- a/src/calibre/gui2/proceed.py
+++ b/src/calibre/gui2/proceed.py
@@ -268,7 +268,7 @@ def show_question(self):
             button = self.action_button if question.focus_action and question.action_callback is not None else \
                 (self.bb.button(QDialogButtonBox.StandardButton.Ok) if question.show_ok else self.bb.button(QDialogButtonBox.StandardButton.Yes))
             button.setDefault(True)
-            self.raise_()
+            self.raise_without_focus()
             self.start_show_animation()
             if question.auto_hide_after > 0:
                 self.auto_hide_timer = t = QTimer(self)
diff --git a/src/calibre/gui2/store/web_store.py b/src/calibre/gui2/store/web_store.py
index 4647d40b47da..89a1da13095a 100644
--- a/src/calibre/gui2/store/web_store.py
+++ b/src/calibre/gui2/store/web_store.py
@@ -253,7 +253,7 @@ def main(args):
     override = 'calibre-gui' if islinux else None
     app = Application(args, override_program_name=override)
     m = Main(data)
-    m.show(), m.raise_()
+    m.show(), m.raise_and_focus()
     app.exec()
     del m
     del app
diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 340171f5668f..5845643725cf 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -874,11 +874,11 @@ def line_activated(name, lnum, right):
                     editor = editors[name]
                     editor.go_to_line(lnum)
                     editor.setFocus(Qt.FocusReason.OtherFocusReason)
-                    self.gui.raise_()
+                    self.gui.raise_and_focus()
         d = Diff(revert_button_msg=revert_msg, show_open_in_editor=show_open_in_editor)
         [x.break_cycles() for x in _diff_dialogs if not x.isVisible()]
         _diff_dialogs = [x for x in _diff_dialogs if x.isVisible()] + [d]
-        d.show(), d.raise_(), d.setFocus(Qt.FocusReason.OtherFocusReason), d.setWindowModality(Qt.WindowModality.NonModal)
+        d.show(), d.raise_and_focus(), d.setFocus(Qt.FocusReason.OtherFocusReason), d.setWindowModality(Qt.WindowModality.NonModal)
         if show_open_in_editor:
             d.line_activated.connect(line_activated)
         return d
@@ -1484,7 +1484,7 @@ def check_requested(self, *args):
         self.commit_all_editors_to_container()
         c = self.gui.check_book
         c.parent().show()
-        c.parent().raise_()
+        c.parent().raise_and_focus()
         c.run_checks(current_container())
 
     def spell_check_requested(self):
@@ -1499,7 +1499,7 @@ def fix_requested(self, errors):
         self.add_savepoint(_('Before: Auto-fix errors'))
         c = self.gui.check_book
         c.parent().show()
-        c.parent().raise_()
+        c.parent().raise_and_focus()
         changed = c.fix_errors(current_container(), errors)
         if changed:
             self.apply_container_update_to_gui()
@@ -1612,14 +1612,14 @@ def replace_requested(self, name, path, basename, force_mt):
     def browse_images(self):
         self.gui.image_browser.refresh()
         self.gui.image_browser.show()
-        self.gui.image_browser.raise_()
+        self.gui.image_browser.raise_and_focus()
 
     def show_reports(self):
         if not self.ensure_book(_('You must first open a book in order to see the report.')):
             return
         self.gui.reports.refresh()
         self.gui.reports.show()
-        self.gui.reports.raise_()
+        self.gui.reports.raise_and_focus()
 
     def reports_edit_requested(self, name):
         mt = current_container().mime_map.get(name, guess_type(name))
diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py
index d58ef2e8dfc3..034a04ad21e9 100644
--- a/src/calibre/gui2/tweak_book/char_select.py
+++ b/src/calibre/gui2/tweak_book/char_select.py
@@ -810,7 +810,7 @@ def show_char_info(self, char_code):
     def show(self):
         self.initialize()
         Dialog.show(self)
-        self.raise_()
+        self.raise_and_focus()
 
     def char_selected(self, c):
         if QApplication.keyboardModifiers() & Qt.KeyboardModifier.ControlModifier:
diff --git a/src/calibre/gui2/tweak_book/completion/popup.py b/src/calibre/gui2/tweak_book/completion/popup.py
index 424fced604d2..e57eb01c5fa1 100644
--- a/src/calibre/gui2/tweak_book/completion/popup.py
+++ b/src/calibre/gui2/tweak_book/completion/popup.py
@@ -164,7 +164,7 @@ def show(self):
         if self.current_results:
             self.layout()
             QWidget.show(self)
-            self.raise_()
+            self.raise_without_focus()
 
     def hide(self):
         QWidget.hide(self)
diff --git a/src/calibre/gui2/tweak_book/function_replace.py b/src/calibre/gui2/tweak_book/function_replace.py
index f8a89f829af0..9b34f576ff25 100644
--- a/src/calibre/gui2/tweak_book/function_replace.py
+++ b/src/calibre/gui2/tweak_book/function_replace.py
@@ -133,7 +133,7 @@ def show_log(self, name, text):
         self.text.setPlainText(self.windowTitle() + '\n\n' + text)
         self.log_text = text
         self.show()
-        self.raise_()
+        self.raise_and_focus()
 
     def sizeHint(self):
         fm = QFontMetrics(self.text.font())
diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index e97d596234a7..dd39b40c7f2c 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -63,7 +63,7 @@ def start(self):
         self.setVisible(True)
         # Prevent any actions from being triggered by key presses
         self.parent().setEnabled(False)
-        self.raise_()
+        self.raise_and_focus()
         self.setFocus(Qt.FocusReason.OtherFocusReason)
         self.pi.startAnimation()
         QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
diff --git a/src/calibre/gui2/tweak_book/manage_fonts.py b/src/calibre/gui2/tweak_book/manage_fonts.py
index 8e28d8b8e601..68b8930a86ba 100644
--- a/src/calibre/gui2/tweak_book/manage_fonts.py
+++ b/src/calibre/gui2/tweak_book/manage_fonts.py
@@ -320,7 +320,7 @@ def sizeHint(self):
     def display(self):
         if not self.isVisible():
             self.show()
-        self.raise_()
+        self.raise_and_focus()
         QTimer.singleShot(0, self.model.build)
 
     def get_selected_data(self):
diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py
index 805f8e0124eb..e46b09f27931 100644
--- a/src/calibre/gui2/tweak_book/preview.py
+++ b/src/calibre/gui2/tweak_book/preview.py
@@ -459,7 +459,7 @@ def clear(self):
 
     def inspect(self):
         self.inspector.parent().show()
-        self.inspector.parent().raise_()
+        self.inspector.parent().raise_and_focus()
         self.pageAction(QWebEnginePage.WebAction.InspectElement).trigger()
 
     def contextMenuEvent(self, ev):
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 78af71cc341b..12e1291f16f4 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -857,7 +857,7 @@ def message_from_another_instance(self, msg):
                 self.handle_cli_args(argv[1:])
             self.setWindowState(self.windowState() & ~Qt.WindowState.WindowMinimized|Qt.WindowState.WindowActive)
             self.show_windows()
-            self.raise_()
+            self.raise_and_focus()
             self.activateWindow()
         elif msg.startswith('shutdown:'):
             self.quit(confirm_quit=False)
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 4df005c5df59..491e67e54500 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -162,7 +162,7 @@ def run_gui(app, opts, args, internal_book_data, listener=None):
         listener.message_received.connect(main.message_from_other_instance, type=Qt.ConnectionType.QueuedConnection)
     QTimer.singleShot(0, acc.flush)
     if opts.raise_window:
-        main.raise_()
+        main.raise_and_focus()
     if opts.full_screen:
         main.set_full_screen(True)
 
diff --git a/src/calibre/gui2/viewer/ui.py b/src/calibre/gui2/viewer/ui.py
index 312d21bdcf5c..a493df797779 100644
--- a/src/calibre/gui2/viewer/ui.py
+++ b/src/calibre/gui2/viewer/ui.py
@@ -272,7 +272,7 @@ def message_from_other_instance(self, msg):
             print(err, file=sys.stderr)
             return
         self.load_ebook(path, open_at=open_at)
-        self.raise_()
+        self.raise_and_focus()
         self.activateWindow()
     # }}}
 
@@ -321,7 +321,7 @@ def show_search_result(self, sr):
     def show_search(self, text, trigger=False, search_type=None, case_sensitive=None):
         self.search_dock.setVisible(True)
         self.search_dock.activateWindow()
-        self.search_dock.raise_()
+        self.search_dock.raise_and_focus()
         self.search_widget.focus_input(text, search_type, case_sensitive)
         if trigger:
             self.search_widget.trigger()
diff --git a/src/calibre/gui2/widgets2.py b/src/calibre/gui2/widgets2.py
index e1d7da92533f..5e1e589fc724 100644
--- a/src/calibre/gui2/widgets2.py
+++ b/src/calibre/gui2/widgets2.py
@@ -822,7 +822,7 @@ def __call__(self, text='Testing message popup', show_undo=True, timeout=5000, h
         self.resize(self.sizeHint())
         self.position_in_parent()
         self.show()
-        self.raise_()
+        self.raise_without_focus()
         self.close_timer.start(timeout)
 
     def position_in_parent(self):

From 0590429d49f2b493870bfc49b5e84a079f18640e Mon Sep 17 00:00:00 2001
From: Joseph Chiocchi <input.output@gmail.com>
Date: Thu, 15 Feb 2024 17:20:07 -0600
Subject: [PATCH 22/72] Update .gitattributes - mark *.recipe as
 linguist-language=python

Sometimes syntax highlighting is picked up correctly on GitHub which uses linguist[^1], when the `*.recipe` includes a shebang for python it will syntax highlight. Other times it does not.

This change adds an attribute to `*.recipe` to mark it as a python language to linguist, following the documentation on overrides[^2].

Example without highlighting: [recipes/ad.recipe]

Example with highlighting (python syntax picked up via shebang):
[recipes/ambito_financiero.recipe]


[^1]: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-repository-languages
[^2]: https://github.com/github-linguist/linguist/blob/559a6426942abcae16b6d6b328147476432bf6cb/docs/overrides.md


[recipes/ad.recipe]: https://github.com/kovidgoyal/calibre/blob/aeb19dfedfe14c5ee8d454c831d634e81219bf44/recipes/ad.recipe
[recipes/ambito_financiero.recipe]: https://github.com/kovidgoyal/calibre/blob/aeb19dfedfe14c5ee8d454c831d634e81219bf44/recipes/ambito_financiero.recipe
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index f518dcced2b5..b848ea562b46 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 # Tell git what files are txt
 *.py  text diff=python
 *.pyj  text diff=python
-*.recipe  text diff=python
+*.recipe  text diff=python linguist-language=python
 *.coffee  text
 *.js      text
 *.pot     text

From e15ab161530429a38aebf1bc29a0040403f08927 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Feb 2024 09:33:00 +0530
Subject: [PATCH 23/72] Remove workaround for Qt file:// URL based images not
 rendering on Windows

The proper fix from Qt has been patched into the calibre windows build.
---
 src/calibre/gui2/__init__.py       | 14 ++------------
 src/calibre/gui2/library/models.py | 15 +++------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 3ef8d234f35f..4ef2954cec56 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1688,23 +1688,13 @@ def timed_print(*a, **kw):
 
 
 def local_path_for_resource(qurl: QUrl, base_qurl: 'QUrl | None' = None) -> str:
-    import re
-
-    def fix_qt_bodging_windows_paths(path: str) -> str:
-        # When loading <img src="file:///c:/path/to/img.png"> Qt gives us the
-        # URL: //c/path/to/img.png  Le bubbling sigh
-        # https://bugreports.qt.io/browse/QTBUG-122201
-        if iswindows and re.match(r'//[a-zA-Z]/', path) is not None and not os.path.exists(path):
-            path = os.path.normpath(path[2] + ':' + path[3:])
-        return path
-
     if base_qurl and qurl.isRelative():
         qurl = base_qurl.resolved(qurl)
 
     if qurl.isLocalFile():
-        return fix_qt_bodging_windows_paths(qurl.toLocalFile())
+        return qurl.toLocalFile()
     if qurl.isRelative():  # this means has no scheme
-        return fix_qt_bodging_windows_paths(qurl.path())
+        return qurl.path()
     return ''
 
 
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index aafce57bc281..77b99d2e6d6f 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -23,7 +23,7 @@
     fit_image, human_readable, isbytestring, prepare_string_for_xml, strftime,
 )
 from calibre.constants import (
-    DEBUG, config_dir, dark_link_color, filesystem_encoding, iswindows,
+    DEBUG, config_dir, dark_link_color, filesystem_encoding
 )
 from calibre.db.search import CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH, _match
 from calibre.db.utils import force_to_bool
@@ -916,17 +916,8 @@ def func(idx):
                             text = fffunc(field_obj, idfunc(idx))
                             return (text) if force_to_bool(text) is None else None
                     else:
-                        if iswindows and dt == 'comments':
-                            # https://bugreports.qt.io/browse/QTBUG-122201
-                            file_pat = re.compile(r'"file:///([a-zA-Z]):/(.+?)"')
-                            def func(idx):
-                                ans = fffunc(field_obj, idfunc(idx), default_value='')
-                                if ans:
-                                    ans = file_pat.sub(r'"file:///\1%3a/\2"', ans)
-                                return ans
-                        else:
-                            def func(idx):
-                                return fffunc(field_obj, idfunc(idx), default_value='')
+                        def func(idx):
+                            return fffunc(field_obj, idfunc(idx), default_value='')
             elif dt == 'datetime':
                 def func(idx):
                     val = fffunc(field_obj, idfunc(idx), default_value=UNDEFINED_DATE)

From be8082790a62ef2f8e740d0093281c53200f363d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 16 Feb 2024 11:34:06 +0530
Subject: [PATCH 24/72] Download remote background images and cache

---
 src/calibre/gui2/viewer/web_view.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 14fe4a593482..38e8a712952b 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -22,11 +22,14 @@
 from calibre.ebooks.metadata.book.base import field_metadata
 from calibre.ebooks.oeb.polish.utils import guess_type
 from calibre.gui2 import choose_images, config, error_dialog, safe_open_url
-from calibre.gui2.viewer import link_prefix_for_location_links, performance_monitor, url_for_book_in_library
+from calibre.gui2.viewer import (
+    link_prefix_for_location_links, performance_monitor, url_for_book_in_library,
+)
 from calibre.gui2.viewer.config import viewer_config_dir, vprefs
 from calibre.gui2.viewer.tts import TTS
 from calibre.gui2.webengine import RestartingWebEngineView
 from calibre.srv.code import get_translations_data
+from calibre.utils.filenames import make_long_path_useable
 from calibre.utils.localization import _, localize_user_manual_link
 from calibre.utils.resources import get_path as P
 from calibre.utils.serialize import json_loads
@@ -93,9 +96,20 @@ def background_image(encoded_fname=''):
     img_path = os.path.join(viewer_config_dir, 'background-images', fname)
     mt = guess_type(fname)[0] or 'image/jpeg'
     try:
-        with open(img_path, 'rb') as f:
+        with open(make_long_path_useable(img_path), 'rb') as f:
             return mt, f.read()
     except FileNotFoundError:
+        if fname.startswith('https://') or fname.startswith('http://'):
+            from calibre import browser
+            br = browser()
+            try:
+                with br.open(fname) as src:
+                    data = src.read()
+            except Exception:
+                return mt, b''
+            with open(make_long_path_useable(img_path), 'wb') as dest:
+                dest.write(data)
+            return mt, data
         return mt, b''
 
 

From 34743e4807c153f0821852d196b976567412154d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 17 Feb 2024 10:10:48 +0530
Subject: [PATCH 25/72] Fix #2054125 [ValueError: Failed to export image as
 JPEG with error: Image is
 empty](https://bugs.launchpad.net/calibre/+bug/2054125)

---
 src/calibre/utils/img.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py
index 11bfc5b1573d..a420700f9487 100644
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
@@ -272,7 +272,12 @@ def save_cover_data_to(
         changed = True
         img = img.scaled(int(resize_to[0]), int(resize_to[1]), Qt.AspectRatioMode.IgnoreAspectRatio, Qt.TransformationMode.SmoothTransformation)
     owidth, oheight = img.width(), img.height()
-    nwidth, nheight = tweaks['maximum_cover_size'] if minify_to is None else minify_to
+    if minify_to is None:
+        nwidth, nheight = tweaks['maximum_cover_size']
+        nwidth, nheight = max(1, nwidth), max(1, nheight)
+    else:
+        nwidth, nheight = minify_to
+
     if letterbox:
         img = blend_on_canvas(img, nwidth, nheight, bgcolor=letterbox_color)
         # Check if we were minified

From c48220468a3dd95d773e0a063b6ce2de9a2361ec Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 18 Feb 2024 13:48:01 +0000
Subject: [PATCH 26/72] Clean up code as the problems with placement and arrows
 have gone away with new Qt versions.

---
 src/calibre/gui2/actions/sort.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index ff9a68cf18d8..864bc29ed0d7 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -40,13 +40,15 @@ class SortByAction(InterfaceAction):
     name = 'Sort By'
     action_spec = (_('Sort by'), 'sort.png', _('Sort the list of books'), None)
     action_type = 'current'
-    popup_type = QToolButton.ToolButtonPopupMode.MenuButtonPopup
+    popup_type = QToolButton.ToolButtonPopupMode.InstantPopup
     action_add_menu = True
     dont_add_to = frozenset(('context-menu-cover-browser', ))
 
     def genesis(self):
         self.sorted_icon = QIcon.ic('ok.png')
-        self.qaction.triggered.connect(self.show_menu)
+        self.menu = m = self.qaction.menu()
+        m.aboutToShow.connect(self.about_to_show_menu)
+        # self.qaction.triggered.connect(self.show_menu)
 
         # Create a "hidden" menu that can have a shortcut. This also lets us
         # manually show the menu instead of letting Qt do it to work around a
@@ -69,10 +71,10 @@ def c(attr, title, tooltip, callback, keys=()):
         c('reverse_sort_action', _('Reverse current sort'), _('Reverse the current sort order'), self.reverse_sort, 'shift+f5')
         c('reapply_sort_action', _('Re-apply current sort'), _('Re-apply the current sort'), self.reapply_sort, 'f5')
 
-    def show_menu(self):
-        # We manually show the menu instead of letting Qt do it to work around a
-        # problem where the menu can show on the wrong screen.
+    def about_to_show_menu(self):
         self.update_menu()
+
+    def show_menu(self):
         show_menu_under_widget(self.gui, self.qaction.menu(), self.qaction, self.name)
 
     def reverse_sort(self):
@@ -91,12 +93,6 @@ def library_changed(self, db):
 
     def initialization_complete(self):
         self.update_menu()
-        # Remove the down arrow from the buttons as they serve no purpose. They
-        # show exactly what clicking the button shows
-        for w in toolbar_widgets_for_action(self.gui, self.qaction):
-            # Not sure why both styles are necessary, but they are
-            w.setStyleSheet('QToolButton::menu-button {image: none; }'
-                            'QToolButton::menu-arrow {image: none; }')
 
     def update_menu(self, menu=None):
         menu = menu or self.qaction.menu()

From c442fbfbb69ed4b141f22e446b3b91b005948361 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 18 Feb 2024 13:50:47 +0000
Subject: [PATCH 27/72] Add an action to show a menu all available GUI and
 plugin actions.

Use case:
- Action discovery. Eventually this action could be added to the default toolbar built by the welcome wizard.
- Ease of access to infrequently used actions.
- Shows shortcuts in most cases.
---
 src/calibre/customize/builtins.py       |   8 +-
 src/calibre/gui2/actions/all_actions.py | 193 ++++++++++++++++++++++++
 2 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 src/calibre/gui2/actions/all_actions.py

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 9f3122750e7e..297169a7e53a 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1097,6 +1097,12 @@ class ActionBooklistContextMenu(InterfaceActionBase):
     description = _('Open the context menu for the column')
 
 
+class ActionAllActions(InterfaceActionBase):
+    name = 'All GUI actions'
+    author = 'Charles Haley'
+    actual_plugin = 'calibre.gui2.actions.all_actions:AllGUIActions'
+    description = _('Open a menu showing all installed GUI actions')
+
 class ActionVirtualLibrary(InterfaceActionBase):
     name = 'Virtual Library'
     actual_plugin = 'calibre.gui2.actions.virtual_library:VirtualLibraryAction'
@@ -1128,7 +1134,7 @@ class ActionPluginUpdater(InterfaceActionBase):
     actual_plugin = 'calibre.gui2.actions.plugin_updates:PluginUpdaterAction'
 
 
-plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
+plugins += [ActionAdd, ActionAllActions, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionConvert, ActionDelete, ActionEditMetadata, ActionView,
         ActionFetchNews, ActionSaveToDisk, ActionQuickview, ActionPolish,
         ActionShowBookDetails,ActionRestart, ActionOpenFolder, ActionConnectShare,
diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
new file mode 100644
index 000000000000..2c436cc48a3a
--- /dev/null
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -0,0 +1,193 @@
+#!/usr/bin/env python
+# License: GPLv3 Copyright: 2022, Charles Haley
+
+from functools import partial
+from math import ceil
+
+from qt.core import QIcon, QMenu, QToolButton, Qt
+
+from calibre.gui2.actions import InterfaceAction, show_menu_under_widget
+from calibre.gui2.preferences.toolbar import AllModel, CurrentModel
+from calibre.utils.icu import sort_key
+
+
+class AllGUIActions(InterfaceAction):
+
+    name = 'All GUI actions'
+    action_spec = (_('All GUI actions'), 'wizard.png',
+                   _("Show a menu of all available GUI and plugin actions.\nThis menu "
+                     "is not available when looking at books on a device"), None)
+
+    action_type = 'current'
+    popup_type = QToolButton.ToolButtonPopupMode.InstantPopup
+    action_add_menu = True
+    dont_add_to = frozenset()
+
+    def genesis(self):
+        self.layout_icon = QIcon.ic('wizard.png')
+        self.menu = m = self.qaction.menu()
+        m.aboutToShow.connect(self.about_to_show_menu)
+
+        # Create a "hidden" menu that can have a shortcut.
+        self.hidden_menu = QMenu()
+        self.shortcut_action = self.create_menu_action(
+                        menu=self.hidden_menu,
+                        unique_name='Main window layout',
+                        shortcut=None,
+                        text=_("Save and restore layout item sizes, and add/remove/toggle "
+                               "layout items such as the search bar, tag browser, etc. "),
+                        icon='layout.png',
+                        triggered=self.show_menu)
+
+    # We want to show the menu when a shortcut is used. Apparently the only way
+    # to do that is to scan the toolbar(s) for the action button then exec the
+    # associated menu. The search is done here to take adding and removing the
+    # action from toolbars into account.
+    #
+    # If a shortcut is triggered and there isn't a toolbar button visible then
+    # show the menu in the upper left corner of the library view pane. Yes, this
+    # is a bit weird but it works as well as a popping up a dialog.
+    def show_menu(self):
+        show_menu_under_widget(self.gui, self.menu, self.qaction, self.name)
+
+    def gui_layout_complete(self):
+        self.qaction.menu().aboutToShow.connect(self.about_to_show_menu)
+
+    def initialization_complete(self):
+        self.populate_menu()
+
+    def about_to_show_menu(self):
+        self.populate_menu()
+
+    def location_selected(self, loc):
+        self.qaction.setEnabled(loc == 'library')
+
+    def populate_menu(self):
+        # Need to do this on every invocation because shortcuts can change
+        m = self.qaction.menu()
+        m.clear()
+
+        name_data = {} # A dict of display names to actions data
+
+        # Use model data from Preferences / Toolbars, with location 'toolbar' or
+        # 'toolbar-device' depending on whether a device is connected.
+        location = 'toolbar' + ('-device' if self.gui.location_manager.has_device else '')
+        for model in (AllModel(location, self.gui), CurrentModel(location, self.gui)):
+            for i in range(0, model.rowCount(None)):
+                dex = model.index(i)
+                name = model.names((dex,))[0] # this is the action name
+                if name is not None and not name.startswith('---'):
+                    name_data[model.data(dex, Qt.ItemDataRole.DisplayRole)] = {
+                                    'action': model.name_to_action(name, self.gui),
+                                    'action_name':name,
+                                    'icon': model.data(dex, Qt.ItemDataRole.DecorationRole)}
+        # The loop leaves the variable 'model' set to a valid value
+
+        # Get display names of builtin and user plugins. We tell the difference
+        # using the class full module name. Plugins start with 'calibre_plugins'
+        builtin_actions = list()
+        user_plugins = list()
+        for display_name, act_data in name_data.items():
+            act = model.name_to_action(act_data['action_name'], self.gui)
+            if act is not None:
+                module = f'{act.__module__}.{act.__class__ .__name__}'
+                if module.startswith('calibre_plugins'):
+                    user_plugins.append(display_name)
+                else:
+                    builtin_actions.append(display_name)
+
+        builtin_actions = sorted(builtin_actions, key=sort_key)
+        user_plugins = sorted(user_plugins, key=sort_key)
+
+        # Build the map of action shortcuts so we can display the shortcuts for
+        # the actions. For shortcuts sometimes the action name and sometimes the
+        # display name is used. Test both. Unfortunately, there are case
+        # differences to deal with so we use lower case keys.
+        lower_names = ({n['action_name'].lower() for n in name_data.values()} |
+                       {n.lower() for n in name_data.keys()})
+        kbd = self.gui.keyboard
+        shortcut_map = {}
+        for n,v in kbd.keys_map.items():
+            act_name = kbd.shortcuts[n]['name'].lower()
+            if act_name in lower_names:
+                shortcuts = list((sc.toString() for sc in v))
+                shortcut_map[act_name] = f'\t{", ".join(shortcuts)}'
+
+        # This function constructs a menu action, dealing with the action being
+        # either a popup menu or a dialog. It adds the shortcuts to the menu
+        # line. Happily, a tab causes the shortcuts to be right-aligned. The tab
+        # is added when the shortcut map is built.
+        def add_action(menu, display_name):
+            shortcuts = shortcut_map.get(display_name.lower(), '')
+            act = name_data[display_name]['action']
+            if not hasattr(act, 'popup_type'): # FakeAction
+                return
+            menu_text = f'{display_name}{shortcuts}'
+            icon = name_data[display_name]['icon']
+            if act.popup_type == QToolButton.ToolButtonPopupMode.MenuButtonPopup:
+                if act.action_add_menu:
+                    # The action offers both a 'click' and a menu. Use the menu.
+                    menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act))
+                else:
+                    # The action is a dialog.
+                    menu.addAction(act.qaction.icon(), menu_text, partial(self._do_action, act))
+            else:
+                # The action is a menu.
+                menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act))
+
+        # Finally the real work, building the action menu. Partition long lists
+        # of actions into sublists of some arbitrary length.
+        def partition(names):
+            count_in_partition = 10 # arbitrary
+            if len(names) >= count_in_partition:
+                partition_count = len(names) // (count_in_partition - 1)
+                step = int(ceil(len(names) / partition_count))
+                for first in range(0, len(names), step):
+                    last = min(first + step - 1, len(names) - 1)
+                    dnf = names[first]
+                    dnl = names[last]
+                    if dnf != dnl:
+                        sm = m.addMenu(QIcon.ic('wizard.png'), f'{dnf} - {dnl}')
+                    else:
+                        sm = m.addMenu(QIcon.ic('wizard.png'), f'{dnf}')
+                    for name in names[first:last+1]:
+                        add_action(sm, name)
+            else:
+                for name in names:
+                    act = self.gui.iactions[name]
+                    add_action(m, name)
+
+        # Add a named section for builtin actions if user plugins are installed.
+        if user_plugins:
+            m.addSection(_('Built-in calibre actions') + ' ')
+            partition(builtin_actions)
+            m.addSection(_('Plugins') + ' ')
+            partition(user_plugins)
+        else:
+            partition(builtin_actions)
+        # Add access to the toolbars and keyboard shortcuts preferences dialogs
+        m.addSection(_('Preferences') + ' ')
+        m.addAction(_('Toolbars'), self._do_pref_toolbar)
+        m.addAction(_('Keyboard shortcuts'), self._do_pref_shortcuts)
+
+    def _do_pref_toolbar(self):
+        self.gui.iactions['Preferences'].do_config(initial_plugin=('Interface', 'Toolbar'), close_after_initial=True)
+
+    def _do_pref_shortcuts(self):
+        self.gui.iactions['Preferences'].do_config(initial_plugin=('Advanced', 'Keyboard'), close_after_initial=True)
+
+    def _do_action(self, action):
+        action.qaction.trigger()
+
+    def _do_menu(self, name, action):
+        # This method clones and shows the action's menu. If the action is in a
+        # context menu, the action menu is displayed there without using this
+        # method. If not it is displayed underneath a toolbar or menu button. If
+        # neither is true then the menu is displayed in the upper left corner.
+        menu = QMenu()
+        menu.addSection(name)
+        action.qaction.menu().aboutToShow.emit()
+        for m in action.qaction.menu().actions():
+            menu.addAction(m)
+        show_menu_under_widget(self.gui, menu, self.qaction, self.name)
+

From d10cdf8a86ce14f37d8acc5374aacd03e7267b3d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Feb 2024 20:25:13 +0530
Subject: [PATCH 28/72] Add <developer> tag to appstream metadata

https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer
---
 src/calibre/linux.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 2b764dbbf219..d3f4d3de1646 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -1274,6 +1274,7 @@ def write_appdata(key, entry, base, translators):
         E.name(entry['name']),
         E.metadata_license('CC0-1.0'),
         E.project_license('GPL-3.0'),
+        E.developer(E.name('Kovid Goyal'), id='kovidgoyal.net'),
         E.summary(entry['summary']),
         E.content_rating(
             # Information Sharing: Using any online API, e.g. a user-counter

From 49e7bf5c9704d62d71e738755f75d9de39cfb5e4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Feb 2024 21:20:56 +0530
Subject: [PATCH 29/72] pep8

---
 src/calibre/gui2/actions/all_actions.py | 2 --
 src/calibre/gui2/actions/sort.py        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
index 2c436cc48a3a..22d6a04dda8a 100644
--- a/src/calibre/gui2/actions/all_actions.py
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -154,7 +154,6 @@ def partition(names):
                         add_action(sm, name)
             else:
                 for name in names:
-                    act = self.gui.iactions[name]
                     add_action(m, name)
 
         # Add a named section for builtin actions if user plugins are installed.
@@ -190,4 +189,3 @@ def _do_menu(self, name, action):
         for m in action.qaction.menu().actions():
             menu.addAction(m)
         show_menu_under_widget(self.gui, menu, self.qaction, self.name)
-
diff --git a/src/calibre/gui2/actions/sort.py b/src/calibre/gui2/actions/sort.py
index 864bc29ed0d7..43db92aebc70 100644
--- a/src/calibre/gui2/actions/sort.py
+++ b/src/calibre/gui2/actions/sort.py
@@ -11,7 +11,7 @@
     QListWidgetItem, QMenu, QSize, Qt, QToolButton, QVBoxLayout, pyqtSignal,
 )
 
-from calibre.gui2.actions import InterfaceAction, show_menu_under_widget, toolbar_widgets_for_action
+from calibre.gui2.actions import InterfaceAction, show_menu_under_widget
 from calibre.library.field_metadata import category_icon_map
 from calibre.utils.icu import primary_sort_key
 from polyglot.builtins import iteritems

From 37d4946e972b342976214605fc5d12ac6f84e56a Mon Sep 17 00:00:00 2001
From: un-pogaz <46523284+un-pogaz@users.noreply.github.com>
Date: Sun, 18 Feb 2024 20:43:07 +0100
Subject: [PATCH 30/72] Create subclass InterfaceActionWithLibraryDrop (DRY)

All actual implementation of `accepts_drops` for built-in InterfaceAction
are a "from_library" drag-and-drop. Create a subclass that implement the
relatives methods.
---
 src/calibre/gui2/actions/__init__.py      | 37 +++++++++++++++++--
 src/calibre/gui2/actions/convert.py       | 26 ++------------
 src/calibre/gui2/actions/delete.py        | 24 ++-----------
 src/calibre/gui2/actions/edit_metadata.py | 24 ++-----------
 src/calibre/gui2/actions/embed.py         | 24 ++-----------
 src/calibre/gui2/actions/mark_books.py    | 26 ++------------
 src/calibre/gui2/actions/polish.py        | 23 ++----------
 src/calibre/gui2/actions/toc_edit.py      | 23 ++----------
 src/calibre/gui2/actions/tweak_epub.py    | 26 ++------------
 src/calibre/gui2/actions/unpack_book.py   | 44 +++++++----------------
 10 files changed, 67 insertions(+), 210 deletions(-)

diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index bc38118a140e..1c216c48b595 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -8,8 +8,9 @@
 from functools import partial
 from zipfile import ZipFile
 
-from qt.core import (QToolButton, QAction, QIcon, QObject, QMenu, QPoint,
-        QKeySequence)
+from qt.core import (
+    QAction, QIcon, QKeySequence, QMenu, QObject, QPoint, QTimer, QToolButton,
+)
 
 from calibre import prints
 from calibre.constants import ismacos
@@ -438,3 +439,35 @@ def shutting_down(self):
         long periods of time.
         '''
         pass
+
+class InterfaceActionWithLibraryDrop(InterfaceAction):
+    '''
+    Subclass of InterfaceAction that implemente methods to execute the default action
+    by drop some books from the library.
+    
+    Inside the do_drop() method, the ids of the droped books are provided
+    by the attribute self.dropped_ids
+    '''
+
+    accepts_drops = True
+    mime = 'application/calibre+from_library'
+
+    def accept_enter_event(self, event, mime_data):
+        if mime_data.hasFormat(self.mime):
+            return True
+        return False
+
+    def accept_drag_move_event(self, event, mime_data):
+        if mime_data.hasFormat(self.mime):
+            return True
+        return False
+
+    def drop_event(self, event, mime_data):
+        if mime_data.hasFormat(self.mime):
+            self.dropped_ids = tuple(map(int, mime_data.data(self.mime).data().split()))
+            QTimer.singleShot(1, self.do_drop)
+            return True
+        return False
+
+    def do_drop(self):
+        raise NotImplementedError()
diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py
index bedd359ea573..6278b38c491d 100644
--- a/src/calibre/gui2/actions/convert.py
+++ b/src/calibre/gui2/actions/convert.py
@@ -7,17 +7,17 @@
 
 import os
 from functools import partial
-from qt.core import QModelIndex, QTimer
+from qt.core import QModelIndex
 
 from calibre.customize.ui import plugin_for_input_format, run_plugins_on_postconvert
 from calibre.gui2 import Dispatcher, error_dialog, gprefs
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.gui2.tools import convert_bulk_ebook, convert_single_ebook
 from calibre.utils.config import prefs, tweaks
 from calibre.utils.localization import ngettext
 
 
-class ConvertAction(InterfaceAction):
+class ConvertAction(InterfaceActionWithLibraryDrop):
 
     name = 'Convert Books'
     action_spec = (_('Convert books'), 'convert.png', _('Convert books between different e-book formats'), _('C'))
@@ -25,26 +25,6 @@ class ConvertAction(InterfaceAction):
     action_type = 'current'
     action_add_menu = True
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py
index 52af7717a5aa..f761453e4346 100644
--- a/src/calibre/gui2/actions/delete.py
+++ b/src/calibre/gui2/actions/delete.py
@@ -11,7 +11,7 @@
 
 from calibre.constants import ismacos
 from calibre.gui2 import Aborted, error_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.confirm_delete_location import confirm_location
 from calibre.gui2.dialogs.delete_matching_from_device import (
@@ -77,7 +77,7 @@ def cleanup(self):
 # }}}
 
 
-class DeleteAction(InterfaceAction):
+class DeleteAction(InterfaceActionWithLibraryDrop):
 
     name = 'Remove Books'
     action_spec = (_('Remove books'), 'remove_books.png', _('Delete books'), 'Backspace' if ismacos else 'Del')
@@ -85,26 +85,6 @@ class DeleteAction(InterfaceAction):
     action_add_menu = True
     action_menu_clone_qaction = _('Remove selected books')
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 388b71d90211..c42de10e91e9 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -21,7 +21,7 @@
 from calibre.ebooks.metadata.opf2 import OPF, metadata_to_opf
 from calibre.ebooks.metadata.sources.prefs import msprefs
 from calibre.gui2 import Dispatcher, error_dialog, gprefs, question_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.gui2.actions.show_quickview import get_quickview_action_plugin
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.device_category_editor import DeviceCategoryEditor
@@ -35,33 +35,13 @@
 DATA_FILES_ICON_NAME = 'unpack-book.png'
 
 
-class EditMetadataAction(InterfaceAction):
+class EditMetadataAction(InterfaceActionWithLibraryDrop):
 
     name = 'Edit Metadata'
     action_spec = (_('Edit metadata'), 'edit_input.png', _('Change the title/author/cover etc. of books'), _('E'))
     action_type = 'current'
     action_add_menu = True
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/embed.py b/src/calibre/gui2/actions/embed.py
index 1f5b01f46753..cd7f574ae028 100644
--- a/src/calibre/gui2/actions/embed.py
+++ b/src/calibre/gui2/actions/embed.py
@@ -9,11 +9,11 @@
 
 from calibre import force_unicode
 from calibre.gui2 import gprefs
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.utils.localization import ngettext
 
 
-class EmbedAction(InterfaceAction):
+class EmbedAction(InterfaceActionWithLibraryDrop):
 
     name = 'Embed Metadata'
     action_spec = (_('Embed metadata'), 'modified.png', _('Embed metadata into book files'), None)
@@ -21,26 +21,6 @@ class EmbedAction(InterfaceAction):
     action_add_menu = True
     action_menu_clone_qaction = _('Embed metadata into book files')
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py
index 619fffcf9d16..173325370704 100644
--- a/src/calibre/gui2/actions/mark_books.py
+++ b/src/calibre/gui2/actions/mark_books.py
@@ -7,11 +7,11 @@
 from functools import partial
 from qt.core import (
     QApplication, QDialog, QDialogButtonBox, QEvent, QGridLayout, QIcon, QLabel, QMenu,
-    QPushButton, Qt, QTimer,
+    QPushButton, Qt,
 )
 
 from calibre.gui2 import error_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.gui2.widgets2 import HistoryComboBox
 from calibre.startup import connect_lambda
 from calibre.utils.icu import sort_key
@@ -81,7 +81,7 @@ def accept(self):
 mark_books_with_text = None
 
 
-class MarkBooksAction(InterfaceAction):
+class MarkBooksAction(InterfaceActionWithLibraryDrop):
 
     name = 'Mark Books'
     action_spec = (_('Mark books'), 'marked.png', _('Temporarily mark books for easy access'), 'Ctrl+M')
@@ -91,26 +91,6 @@ class MarkBooksAction(InterfaceAction):
         'context-menu-device', 'menubar-device', 'context-menu-cover-browser'])
     action_menu_clone_qaction = _('Toggle mark for selected books')
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/polish.py b/src/calibre/gui2/actions/polish.py
index 883702986d34..71a9e28bf102 100644
--- a/src/calibre/gui2/actions/polish.py
+++ b/src/calibre/gui2/actions/polish.py
@@ -18,7 +18,7 @@
 )
 
 from calibre.gui2 import Dispatcher, error_dialog, gprefs, question_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.gui2.convert.metadata import create_opf_file
 from calibre.gui2.dialogs.progress import ProgressDialog
 from calibre.ptempfile import PersistentTemporaryDirectory
@@ -409,32 +409,13 @@ def reject(self):
 # }}}
 
 
-class PolishAction(InterfaceAction):
+class PolishAction(InterfaceActionWithLibraryDrop):
 
     name = 'Polish Books'
     action_spec = (_('Polish books'), 'polish.png',
                    _('Apply the shine of perfection to your books'), _('P'))
     dont_add_to = frozenset(['context-menu-device'])
     action_type = 'current'
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
 
     def do_drop(self):
         book_id_map = self.get_supported_books(self.dropped_ids)
diff --git a/src/calibre/gui2/actions/toc_edit.py b/src/calibre/gui2/actions/toc_edit.py
index 3ff9503c1504..1f235b22af03 100644
--- a/src/calibre/gui2/actions/toc_edit.py
+++ b/src/calibre/gui2/actions/toc_edit.py
@@ -13,7 +13,7 @@
 )
 
 from calibre.gui2 import error_dialog, gprefs, question_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.startup import connect_lambda
 from calibre.utils.monotonic import monotonic
 from polyglot.builtins import iteritems
@@ -68,32 +68,13 @@ def formats(self, formats):
 # }}}
 
 
-class ToCEditAction(InterfaceAction):
+class ToCEditAction(InterfaceActionWithLibraryDrop):
 
     name = 'Edit ToC'
     action_spec = (_('Edit ToC'), 'toc.png',
                    _('Edit the Table of Contents in your books'), _('K'))
     dont_add_to = frozenset(['context-menu-device'])
     action_type = 'current'
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
 
     def do_drop(self):
         book_id_map = self.get_supported_books(self.dropped_ids)
diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py
index 9ca4c6cafef1..ac2087429e09 100644
--- a/src/calibre/gui2/actions/tweak_epub.py
+++ b/src/calibre/gui2/actions/tweak_epub.py
@@ -7,11 +7,11 @@
 
 import time
 from qt.core import (
-    QCheckBox, QDialog, QDialogButtonBox, QLabel, Qt, QTimer, QVBoxLayout,
+    QCheckBox, QDialog, QDialogButtonBox, QLabel, Qt, QVBoxLayout,
 )
 
 from calibre.gui2 import error_dialog, question_dialog
-from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
 from calibre.startup import connect_lambda
 
 
@@ -54,33 +54,13 @@ def accept(self):
         QDialog.accept(self)
 
 
-class TweakEpubAction(InterfaceAction):
+class TweakEpubAction(InterfaceActionWithLibraryDrop):
 
     name = 'Tweak ePub'
     action_spec = (_('Edit book'), 'edit_book.png', _('Edit books in the EPUB or AZW formats'), _('T'))
     dont_add_to = frozenset(('context-menu-device',))
     action_type = 'current'
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
diff --git a/src/calibre/gui2/actions/unpack_book.py b/src/calibre/gui2/actions/unpack_book.py
index d729542d6ec7..908736729a8a 100644
--- a/src/calibre/gui2/actions/unpack_book.py
+++ b/src/calibre/gui2/actions/unpack_book.py
@@ -5,17 +5,19 @@
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os, weakref, shutil
-
-from qt.core import (QDialog, QVBoxLayout, QHBoxLayout, QRadioButton, QFrame,
-        QPushButton, QLabel, QGroupBox, QGridLayout, QIcon, QSize, QTimer)
+import os
+import shutil
+import weakref
+from qt.core import (
+    QDialog, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QIcon, QLabel, QPushButton,
+    QRadioButton, QSize, QTimer, QVBoxLayout,
+)
 
 from calibre import as_unicode
 from calibre.constants import ismacos
-from calibre.gui2 import error_dialog, question_dialog, open_local_file, gprefs
-from calibre.gui2.actions import InterfaceAction
-from calibre.ptempfile import (PersistentTemporaryDirectory,
-        PersistentTemporaryFile)
+from calibre.gui2 import error_dialog, gprefs, open_local_file, question_dialog
+from calibre.gui2.actions import InterfaceActionWithLibraryDrop
+from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
 from calibre.utils.config import prefs, tweaks
 
 
@@ -163,7 +165,7 @@ def ask_question(self, msg):
         return question_dialog(self, _('Are you sure?'), msg)
 
     def do_explode(self):
-        from calibre.ebooks.tweak import get_tools, Error, WorkerError
+        from calibre.ebooks.tweak import Error, WorkerError, get_tools
         tdir = PersistentTemporaryDirectory('_tweak_explode')
         self._cleanup_dirs.append(tdir)
         det_msg = None
@@ -201,7 +203,7 @@ def do_explode(self):
         open_local_file(tdir)
 
     def rebuild_it(self):
-        from calibre.ebooks.tweak import get_tools, WorkerError
+        from calibre.ebooks.tweak import WorkerError, get_tools
         src_dir = self._exploded
         det_msg = None
         of = PersistentTemporaryFile('_tweak_rebuild.'+self.current_format.lower())
@@ -284,7 +286,7 @@ def current_format(self):
                 return str(b.text())
 
 
-class UnpackBookAction(InterfaceAction):
+class UnpackBookAction(InterfaceActionWithLibraryDrop):
 
     name = 'Unpack Book'
     action_spec = (_('Unpack book'), 'unpack-book.png',
@@ -292,26 +294,6 @@ class UnpackBookAction(InterfaceAction):
     dont_add_to = frozenset(['context-menu-device'])
     action_type = 'current'
 
-    accepts_drops = True
-
-    def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat("application/calibre+from_library"):
-            return True
-        return False
-
-    def drop_event(self, event, mime_data):
-        mime = 'application/calibre+from_library'
-        if mime_data.hasFormat(mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split()))
-            QTimer.singleShot(1, self.do_drop)
-            return True
-        return False
-
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids

From 32a4423efbeb940a9613ab75e2e807e27f0aeb1a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Feb 2024 07:54:49 +0530
Subject: [PATCH 31/72] Remove xml:lang from <description> for <release> as
 well

---
 src/calibre/linux.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index d3f4d3de1646..2a2b9e2e83ce 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -1223,7 +1223,7 @@ def make_appdata_releases():
         # Formatting of release description tries to resemble that of
         # https://calibre-ebook.com/whats-new while taking into account the limits imposed by
         # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-description
-        description = E.description(**{'{http://www.w3.org/XML/1998/namespace}lang': 'en'})
+        description = E.description()
         if 'new features' in revision:
             description.append(E.p('New features:'))
             description.append(E.ol(

From 6be32931661d0280d9149562f3318157748f36b2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Feb 2024 10:33:10 +0530
Subject: [PATCH 32/72] More work on reader profiles

---
 src/calibre/gui2/viewer/config.py   | 50 +++++++++++++++++++++++++++++
 src/calibre/gui2/viewer/web_view.py | 12 ++++++-
 src/pyj/session.pyj                 | 25 +++++++++++----
 src/pyj/viewer-main.pyj             | 29 +++++++++++++++++
 4 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index 2efd96e05329..ef62fbd72e15 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -7,6 +7,7 @@
 
 from calibre.constants import cache_dir, config_dir
 from calibre.utils.config import JSONConfig
+from calibre.utils.date import isoformat, utcnow
 from calibre.utils.filenames import atomic_rename
 
 vprefs = JSONConfig('viewer-webengine')
@@ -73,3 +74,52 @@ def save_reading_rates(key, rates):
 def load_reading_rates(key):
     existing = get_existing_reading_rates()
     return existing.get(key)
+
+
+def expand_profile_user_names(user_names):
+    user_names = set(user_names)
+    sau = get_session_pref('sync_annots_user', default='')
+    if sau:
+        if sau == '*':
+            sau = 'user:'
+        if 'viewer:' in user_names:
+            user_names.add(sau)
+        elif sau in user_names:
+            user_names.add('viewer:')
+    return user_names
+
+
+def load_viewer_profiles(*user_names: str, as_json_string=False):
+    user_names = expand_profile_user_names(user_names)
+    ans = {}
+    try:
+        with open(os.path.join(viewer_config_dir, 'profiles.json'), 'rb') as f:
+            raw = json.loads(f.read())
+    except FileNotFoundError:
+        if as_json_string:
+            return '{}'
+        return ans
+    for uname, profiles in raw.items():
+        if uname in user_names:
+            for profile_name, profile in profiles.items():
+                if profile_name not in ans or ans[profile_name]['__timestamp__'] <= profile['__timestamp__']:
+                    ans[profile_name] = profile
+    if as_json_string:
+        return json.dumps(ans)
+    return ans
+
+
+def save_viewer_profile(profile_name, profile, *user_names: str):
+    user_names = expand_profile_user_names(user_names)
+    if isinstance(profile, (str, bytes)):
+        profile = json.loads(profile)
+    profile['__timestamp__'] = isoformat(utcnow())
+    try:
+        with open(os.path.join(viewer_config_dir, 'profiles.json'), 'rb') as f:
+            raw = json.loads(f.read())
+    except FileNotFoundError:
+        raw = {}
+    for name in user_names:
+        raw.setdefault(name, {})[profile_name] = profile
+    with open(os.path.join(viewer_config_dir, 'profiles.json'), 'wb') as f:
+        f.write(json.dumps(raw, indent=2, sort_keys=True).encode())
diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 38e8a712952b..c563f896966d 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -25,7 +25,9 @@
 from calibre.gui2.viewer import (
     link_prefix_for_location_links, performance_monitor, url_for_book_in_library,
 )
-from calibre.gui2.viewer.config import viewer_config_dir, vprefs
+from calibre.gui2.viewer.config import (
+    load_viewer_profiles, save_viewer_profile, viewer_config_dir, vprefs,
+)
 from calibre.gui2.viewer.tts import TTS
 from calibre.gui2.webengine import RestartingWebEngineView
 from calibre.srv.code import get_translations_data
@@ -188,6 +190,9 @@ def requestStarted(self, rq):
             encoded_fname = name[len('reader-background-'):]
             mt, data = background_image(encoded_fname)
             send_reply(rq, mt, data) if data else rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound)
+        elif name == 'all-profiles':
+            vp = load_viewer_profiles('viewer:', as_json_string=True)
+            send_reply(rq, 'application/json', vp.encode())
         elif name.startswith('mathjax/'):
             handle_mathjax_request(rq, name)
         elif not name:
@@ -282,6 +287,7 @@ class ViewerBridge(Bridge):
     show_book_folder = from_js()
     show_help = from_js(object)
     update_reading_rates = from_js(object)
+    save_profile = from_js(object, object)
 
     create_view = to_js()
     start_book_load = to_js()
@@ -546,6 +552,7 @@ def __init__(self, parent=None):
         self.bridge.close_prep_finished.connect(self.close_prep_finished)
         self.bridge.highlights_changed.connect(self.highlights_changed)
         self.bridge.update_reading_rates.connect(self.update_reading_rates)
+        self.bridge.save_profile.connect(self.save_profile)
         self.bridge.edit_book.connect(self.edit_book)
         self.bridge.show_book_folder.connect(self.show_book_folder)
         self.bridge.show_help.connect(self.show_help)
@@ -565,6 +572,9 @@ def __init__(self, parent=None):
             self.inspector = Inspector(parent.inspector_dock.toggleViewAction(), self)
             parent.inspector_dock.setWidget(self.inspector)
 
+    def save_profile(self, name, settings):
+        save_viewer_profile(name, settings, 'viewer:')
+
     def link_hovered(self, url):
         if url == 'javascript:void(0)':
             url = ''
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index a30bb4fdb2e9..5362b38258ce 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -29,8 +29,8 @@ all_settings = {
     'base_font_size': {'default': 16, 'category': 'read_book', 'is_local': True},
     'book_scrollbar': {'default': False, 'category': 'read_book'},
     'columns_per_screen': {'default': {'portrait':0, 'landscape':0}, 'category': 'read_book', 'is_local': True},
-    'controls_help_shown_count': {'default': 0, 'category': 'read_book', 'is_local': True},
-    'controls_help_shown_count_rtl_page_progression': {'default': 0, 'category': 'read_book', 'is_local': True},
+    'controls_help_shown_count': {'default': 0, 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
+    'controls_help_shown_count_rtl_page_progression': {'default': 0, 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
     'cover_preserve_aspect_ratio': {'default': True, 'category': 'read_book'},
     'current_color_scheme': {'default': 'system', 'category': 'read_book'},
     'footer': {'default': {'right': 'progress'}, 'category': 'read_book'},
@@ -58,7 +58,7 @@ all_settings = {
     'scroll_stop_boundaries': {'default': False, 'category': 'read_book', 'is_local': True},
     'standalone_font_settings': {'default': {}, 'category': 'read_book', 'is_local': True},
     'standalone_misc_settings': {'default': {}, 'category': 'read_book', 'is_local': True},
-    'standalone_recently_opened': {'default': v'[]', 'category': 'read_book', 'is_local': True},
+    'standalone_recently_opened': {'default': v'[]', 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
     'user_color_schemes': {'default': {}, 'category': 'read_book'},
     'user_stylesheet': {'default': '', 'category': 'read_book', 'is_local': True},
     'word_actions': {'default': v'[]', 'category': 'read_book'},
@@ -69,14 +69,15 @@ all_settings = {
     'net_search_url': {'default': 'https://google.com/search?q={q}', 'category': 'read_book'},
     'selection_bar_actions': {'default': v"['copy', 'lookup', 'highlight', 'remove_highlight', 'search_net', 'clear']", 'category': 'read_book'},
     'selection_bar_quick_highlights': {'default': v"[]", 'category': 'read_book'},
-    'skipped_dialogs': {'default': v'{}', 'category': 'read_book', 'is_local': True},
-    'tts': {'default': v'{}', 'category': 'read_book', 'is_local': True},
-    'tts_backend': {'default': v'{}', 'category': 'read_book', 'is_local': True},
+    'skipped_dialogs': {'default': v'{}', 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
+    'tts': {'default': v'{}', 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
+    'tts_backend': {'default': v'{}', 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
     'fullscreen_when_opening': {'default': 'auto', 'category': 'read_book', 'is_local': True},
     'book_search_mode': {'default': 'contains', 'category': 'read_book', 'is_local': True},
     'book_search_case_sensitive': {'default': False, 'category': 'read_book', 'is_local': True},
     'reverse_page_turn_zones': {'default': False, 'category': 'read_book', 'is_local': True},
     'gesture_overrides': {'default': {}, 'category': 'read_book'},
+    'current_profile': {'default': None, 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
 }
 
 defaults = {}
@@ -230,10 +231,20 @@ def get_subset_of_settings(sd, filter_func):
         metadata = all_settings[setting_name]
         is_set = curval is not ans
         if filter_func(setting_name, metadata, is_set):
-            ans[setting_name] = curval if is_set else metadata.default
+            ans[setting_name] = window.structuredClone(curval if is_set else metadata.default)
     return ans
 
 
+def settings_for_reader_profile(sd):
+
+    def filter_func(setting_name, metadata, is_set):
+        if not is_set or metadata.category is not 'read_book' or metadata.disallowed_in_profile:
+            return False
+        return True
+
+    return get_subset_of_settings(sd, filter_func)
+
+
 default_interface_data = {
     'username': None,
     'output_format': 'EPUB',
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index 8e61ba346213..fab5a693a7d1 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -72,6 +72,32 @@ def get_file(book, name, proceed):
     xhr.send()
 
 
+def profiles_recevied(proceed, end_type, xhr, ev):
+    end_type = workaround_qt_bug(xhr, end_type)
+    if end_type is 'abort':
+        return
+    if end_type is not 'load':
+        show_error(_('Failed to load profiles'), _(
+            'Could not load viewer profiles with error: {}').format(xhr.error_html))
+        return
+    if not xhr.responseType or xhr.responseType is 'text':
+        result = xhr.responseText
+    else if xhr.responseType is 'blob':
+        result = xhr.response
+    else:
+        show_error(_('Failed to load profiles'), _(
+            'Could not load viewer profiles: unknown response type: {}').format(xhr.responseType))
+        return
+
+    proceed(result)
+
+
+def get_all_profiles(proceed):
+    xhr = ajax('all-profiles/', profiles_recevied.bind(None, proceed), ok_code=0)
+    xhr.responseType = 'text'
+    xhr.send()
+
+
 def get_mathjax_files(proceed):
     proceed({})
 
@@ -326,6 +352,9 @@ if window is window.top:
     TRANSLATIONS_DATA = v'__TRANSLATIONS_DATA__'
     if TRANSLATIONS_DATA:
         install(TRANSLATIONS_DATA)
+    ui_operations.get_all_profiles = get_all_profiles
+    ui_operations.save_profile = def(name, settings):
+        to_python.save_profile(name, settings)
     ui_operations.get_file = get_file
     ui_operations.get_url_for_book_file_name = get_url_for_book_file_name
     ui_operations.get_mathjax_files = get_mathjax_files

From 101423c3df77a27f767377b844edd7125bfdc451 Mon Sep 17 00:00:00 2001
From: un-pogaz <46523284+un-pogaz@users.noreply.github.com>
Date: Mon, 19 Feb 2024 08:27:56 +0100
Subject: [PATCH 33/72] show menu if the plugin self implement a menu without
 `action_add_menu`

---
 src/calibre/gui2/actions/all_actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
index 22d6a04dda8a..a31e63577341 100644
--- a/src/calibre/gui2/actions/all_actions.py
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -125,7 +125,7 @@ def add_action(menu, display_name):
             menu_text = f'{display_name}{shortcuts}'
             icon = name_data[display_name]['icon']
             if act.popup_type == QToolButton.ToolButtonPopupMode.MenuButtonPopup:
-                if act.action_add_menu:
+                if act.action_add_menu or act.qaction.menu() and act.qaction.menu().children():
                     # The action offers both a 'click' and a menu. Use the menu.
                     menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act))
                 else:

From c530817e9602ad84ac377e8cefe778379bce0a62 Mon Sep 17 00:00:00 2001
From: YOKOTA Hiroshi <yokota.hgml@gmail.com>
Date: Sun, 18 Feb 2024 23:14:31 +0900
Subject: [PATCH 34/72] Fix book store chooser error

Book store chooser dialog can't open.
This dialog was opened by "Get Books" -> "Choose Stores" from tool button bar.

----
Traceback (most recent call last):
  File ".../calibre/gui2/actions/store.py", line 116, in choose
    d = StoreChooserDialog(self.gui)
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File ".../calibre/gui2/store/config/chooser/chooser_dialog.py", line 21, in __init__
    self.config_widget = StoreChooserWidget()
                         ^^^^^^^^^^^^^^^^^^^^
  File ".../calibre/gui2/store/config/chooser/chooser_widget.py", line 15, in __init__
    self.setupUi(self)
  File ".../calibre/gui2/store/config/chooser/chooser_widget_ui.py", line 35, in setupUi
    self.results_view = ResultsView(parent=Form)
                        ^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: ResultsView.__init__() got an unexpected keyword argument 'parent'
----
---
 src/calibre/gui2/store/config/chooser/results_view.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/config/chooser/results_view.py b/src/calibre/gui2/store/config/chooser/results_view.py
index c098a3d73607..3eafc6cdd215 100644
--- a/src/calibre/gui2/store/config/chooser/results_view.py
+++ b/src/calibre/gui2/store/config/chooser/results_view.py
@@ -13,8 +13,8 @@
 
 class ResultsView(QTreeView):
 
-    def __init__(self, *args):
-        QTreeView.__init__(self,*args)
+    def __init__(self, parent=None):
+        QTreeView.__init__(self,parent)
 
         self._model = Matches([p for p in store_plugins()])
         self.setModel(self._model)

From 181b9a3bac0484ff4e5c94f7db85fc3f9a201268 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 19 Feb 2024 12:46:27 +0000
Subject: [PATCH 35/72] Add the individual preference dialogs to the
 preferences menu. Reasons: - They are more accessible via the keyboard. - The
 menu actions can be accessed by plugins - Each individual dialog can be given
 a shortcut

---
 src/calibre/gui2/actions/preferences.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index e237df4de64c..5ca1225eb87e 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -9,6 +9,7 @@
 
 from qt.core import QIcon, Qt
 
+from calibre.customize.ui import preferences_plugins
 from calibre.gui2.actions import InterfaceAction
 from calibre.gui2.preferences.main import Preferences
 from calibre.gui2 import error_dialog, show_restart_warning
@@ -42,6 +43,29 @@ def genesis(self):
         for x in (self.gui.preferences_action, self.qaction):
             x.triggered.connect(self.do_config)
 
+    def initialization_complete(self):
+        # Add the individual preferences to the menu.
+        # First, sort them into the same order as shown in the preferences dialog
+        plugins = sorted([p for p in preferences_plugins()],
+                         key=lambda p: p.category_order * 100 + p.name_order)
+
+        pm = self.preferences_menu
+        # The space pushes the separator a bit away from the text
+        pm.addSection(_('Preferences dialogs') + ' ')
+
+        config_icon = QIcon.ic('config.png')
+        current_cat = 0
+        for p in plugins:
+            if p.category_order != current_cat:
+                current_cat = p.category_order
+                cm = pm.addMenu(p.gui_category)
+                cm.setIcon(config_icon)
+            self.create_menu_action(cm, p.name, p.gui_name, icon=QIcon.ic(p.icon),
+                                    triggered=partial(self.do_config,
+                                                      initial_plugin=(p.category, p.name),
+                                                      close_after_initial=True),
+                                    shortcut=None)
+
     def get_plugins(self):
         from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog,
                 FILTER_NOT_INSTALLED)

From 1add1a057f0c40a108794798e2374632a2026eba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Feb 2024 18:27:54 +0530
Subject: [PATCH 36/72] Rename Preferences dialogs to sections

---
 src/calibre/gui2/actions/preferences.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index 5ca1225eb87e..40ba3f15935e 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -51,7 +51,7 @@ def initialization_complete(self):
 
         pm = self.preferences_menu
         # The space pushes the separator a bit away from the text
-        pm.addSection(_('Preferences dialogs') + ' ')
+        pm.addSection(_('Sections') + ' ')
 
         config_icon = QIcon.ic('config.png')
         current_cat = 0

From 12e2b392ea58fb98f95fa8ff1232cc470e8f374c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Feb 2024 18:33:11 +0530
Subject: [PATCH 37/72] ...

---
 src/calibre/gui2/actions/all_actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
index a31e63577341..e9390ab8585f 100644
--- a/src/calibre/gui2/actions/all_actions.py
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -125,7 +125,7 @@ def add_action(menu, display_name):
             menu_text = f'{display_name}{shortcuts}'
             icon = name_data[display_name]['icon']
             if act.popup_type == QToolButton.ToolButtonPopupMode.MenuButtonPopup:
-                if act.action_add_menu or act.qaction.menu() and act.qaction.menu().children():
+                if getattr(act, 'action_add_menu', None) or (getattr(act, 'qaction', None) and act.qaction.menu() and act.qaction.menu().children()):
                     # The action offers both a 'click' and a menu. Use the menu.
                     menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act))
                 else:

From d6a13440beb085b0827ee4c4358408b0d0d97ca0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Feb 2024 18:55:11 +0530
Subject: [PATCH 38/72] ...

---
 src/calibre/gui2/actions/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index 1c216c48b595..4e61ebb76556 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -444,27 +444,27 @@ class InterfaceActionWithLibraryDrop(InterfaceAction):
     '''
     Subclass of InterfaceAction that implemente methods to execute the default action
     by drop some books from the library.
-    
+
     Inside the do_drop() method, the ids of the droped books are provided
     by the attribute self.dropped_ids
     '''
 
     accepts_drops = True
-    mime = 'application/calibre+from_library'
+    mimetype_for_drop = 'application/calibre+from_library'
 
     def accept_enter_event(self, event, mime_data):
-        if mime_data.hasFormat(self.mime):
+        if mime_data.hasFormat(self.mimetype_for_drop):
             return True
         return False
 
     def accept_drag_move_event(self, event, mime_data):
-        if mime_data.hasFormat(self.mime):
+        if mime_data.hasFormat(self.mimetype_for_drop):
             return True
         return False
 
     def drop_event(self, event, mime_data):
-        if mime_data.hasFormat(self.mime):
-            self.dropped_ids = tuple(map(int, mime_data.data(self.mime).data().split()))
+        if mime_data.hasFormat(self.mimetype_for_drop):
+            self.dropped_ids = tuple(map(int, mime_data.data(self.mimetype_for_drop).data().split()))
             QTimer.singleShot(1, self.do_drop)
             return True
         return False

From e95d0157896bbc856769973abadc32e7211c1ece Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 19 Feb 2024 15:07:29 +0000
Subject: [PATCH 39/72] Escape ampersands in the preference sections menu.

---
 src/calibre/gui2/actions/preferences.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index 40ba3f15935e..4e669b8c0e84 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -58,9 +58,9 @@ def initialization_complete(self):
         for p in plugins:
             if p.category_order != current_cat:
                 current_cat = p.category_order
-                cm = pm.addMenu(p.gui_category)
+                cm = pm.addMenu(p.gui_category.replace('&', '&&'))
                 cm.setIcon(config_icon)
-            self.create_menu_action(cm, p.name, p.gui_name, icon=QIcon.ic(p.icon),
+            self.create_menu_action(cm, p.name, p.gui_name.replace('&', '&&'), icon=QIcon.ic(p.icon),
                                     triggered=partial(self.do_config,
                                                       initial_plugin=(p.category, p.name),
                                                       close_after_initial=True),

From 750635615f5e17fc722feeaf669123516074232f Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 19 Feb 2024 16:26:12 +0000
Subject: [PATCH 40/72] Don't escape the ampersand in the shortcut name.

Dealing with ampersand escapes is really a bother!
---
 src/calibre/gui2/actions/preferences.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/actions/preferences.py b/src/calibre/gui2/actions/preferences.py
index 4e669b8c0e84..36eee6d8f870 100644
--- a/src/calibre/gui2/actions/preferences.py
+++ b/src/calibre/gui2/actions/preferences.py
@@ -60,11 +60,11 @@ def initialization_complete(self):
                 current_cat = p.category_order
                 cm = pm.addMenu(p.gui_category.replace('&', '&&'))
                 cm.setIcon(config_icon)
-            self.create_menu_action(cm, p.name, p.gui_name.replace('&', '&&'), icon=QIcon.ic(p.icon),
-                                    triggered=partial(self.do_config,
-                                                      initial_plugin=(p.category, p.name),
-                                                      close_after_initial=True),
-                                    shortcut=None)
+            self.create_menu_action(cm, p.name, p.gui_name.replace('&', '&&'),
+                                    icon=QIcon.ic(p.icon), shortcut=None, shortcut_name=p.gui_name,
+                                    triggered=partial(self.do_config, initial_plugin=(p.category, p.name),
+                                                      close_after_initial=True))
+
 
     def get_plugins(self):
         from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog,

From 3159f46b62cb355b381efb53694d58817698e6dc Mon Sep 17 00:00:00 2001
From: un-pogaz <46523284+un-pogaz@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:24:32 +0100
Subject: [PATCH 41/72] Add icons to actions in last section

---
 src/calibre/gui2/actions/all_actions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/actions/all_actions.py b/src/calibre/gui2/actions/all_actions.py
index e9390ab8585f..ba06a9452dd5 100644
--- a/src/calibre/gui2/actions/all_actions.py
+++ b/src/calibre/gui2/actions/all_actions.py
@@ -166,8 +166,8 @@ def partition(names):
             partition(builtin_actions)
         # Add access to the toolbars and keyboard shortcuts preferences dialogs
         m.addSection(_('Preferences') + ' ')
-        m.addAction(_('Toolbars'), self._do_pref_toolbar)
-        m.addAction(_('Keyboard shortcuts'), self._do_pref_shortcuts)
+        m.addAction(QIcon.ic('wizard.png'), _('Toolbars'), self._do_pref_toolbar)
+        m.addAction(QIcon.ic('keyboard-prefs.png'), _('Keyboard shortcuts'), self._do_pref_shortcuts)
 
     def _do_pref_toolbar(self):
         self.gui.iactions['Preferences'].do_config(initial_plugin=('Interface', 'Toolbar'), close_after_initial=True)

From db3401b02bd7acbdcc28b9f62fb1db8632dad494 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Feb 2024 21:05:52 +0530
Subject: [PATCH 42/72] More work on profiles

---
 src/pyj/read_book/overlay.pyj    | 11 +++++-
 src/pyj/read_book/prefs/misc.pyj | 16 +-------
 src/pyj/read_book/profiles.pyj   | 68 ++++++++++++++++++++++++++++++++
 src/pyj/session.pyj              | 31 +++++++++++++--
 src/pyj/viewer-main.pyj          |  9 ++---
 5 files changed, 112 insertions(+), 23 deletions(-)
 create mode 100644 src/pyj/read_book/profiles.pyj

diff --git a/src/pyj/read_book/overlay.pyj b/src/pyj/read_book/overlay.pyj
index 9a3d51337358..66460e49e80c 100644
--- a/src/pyj/read_book/overlay.pyj
+++ b/src/pyj/read_book/overlay.pyj
@@ -22,6 +22,7 @@ from read_book.bookmarks import create_bookmarks_panel
 from read_book.globals import runtime, ui_operations
 from read_book.goto import create_goto_panel, create_location_overlay
 from read_book.highlights import create_highlights_panel
+from read_book.profiles import create_profiles_panel
 from read_book.open_book import create_open_book
 from read_book.prefs.font_size import create_font_size_panel
 from read_book.prefs.head_foot import time_formatter
@@ -347,7 +348,10 @@ class MainOverlay:  # {{{
             ac(_('Read aloud'), _('Read the book aloud'), def():
                self.overlay.hide()
                self.overlay.view.start_read_aloud()
-            , 'bullhorn')
+            , 'bullhorn'),
+            ac(_('Profiles'), _('Quickly switch between different settings'), def():
+                self.overlay.show_profiles()
+            , 'convert')
         ))
 
         if full_screen_actions.length:
@@ -743,6 +747,11 @@ class Overlay:
         self.panels.push(TOCOverlay(self, create_highlights_panel.bind(None, self.view.annotations_manager, self.hide_current_panel), _('Highlights')))
         self.show_current_panel()
 
+    def show_profiles(self):
+        self.hide_current_panel()
+        self.panels.push(TOCOverlay(self, create_profiles_panel.bind(None, self.hide_current_panel), _('Profiles')))
+        self.show_current_panel()
+
     def show_goto(self):
         self.hide_current_panel()
         self.panels.push(TOCOverlay(self, create_goto_panel.bind(None, self.view.current_position_data), _('Go to…')))
diff --git a/src/pyj/read_book/prefs/misc.pyj b/src/pyj/read_book/prefs/misc.pyj
index 840320f99955..7949f36cb6a5 100644
--- a/src/pyj/read_book/prefs/misc.pyj
+++ b/src/pyj/read_book/prefs/misc.pyj
@@ -3,28 +3,16 @@
 from __python__ import bound_methods, hash_literals
 
 from elementmaker import E
-from gettext import gettext as _
 
 from book_list.globals import get_session_data
 from dom import unique_id
+from gettext import gettext as _
 from read_book.globals import ui_operations
 from read_book.prefs.utils import create_button_box
-from session import session_defaults
+from session import session_defaults, standalone_reader_defaults as DEFAULTS
 from widgets import create_button
 
 CONTAINER = unique_id('standalone-misc-settings')
-DEFAULTS = {
-    'remember_window_geometry': False,
-    'remember_last_read': True,
-    'show_actions_toolbar': False,
-    'show_actions_toolbar_in_fullscreen': False,
-    'save_annotations_in_ebook': True,
-    'sync_annots_user': '',
-    'singleinstance': False,
-    'auto_hide_mouse': True,
-    'restore_docks': True,
-}
-
 
 def restore_defaults():
     container = get_container()
diff --git a/src/pyj/read_book/profiles.pyj b/src/pyj/read_book/profiles.pyj
new file mode 100644
index 000000000000..02825a3b9a1d
--- /dev/null
+++ b/src/pyj/read_book/profiles.pyj
@@ -0,0 +1,68 @@
+# vim:fileencoding=utf-8
+# License: GPL v3 Copyright: 2024, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import bound_methods, hash_literals
+
+from elementmaker import E
+
+from book_list.globals import get_session_data
+from dom import clear, unique_id
+from gettext import gettext as _
+from read_book.globals import ui_operations
+from session import settings_for_reader_profile
+from widgets import create_button
+
+
+def save_profile(container_id, hide_panel):
+    container = document.getElementById(container_id)
+    if not container:
+        return
+    name = container.querySelector('[name=profile_name]').value
+    sd = get_session_data()
+    settings = settings_for_reader_profile(sd)
+    ui_operations.save_profile(name, settings, def(err_msg):
+        if err_msg:
+            ui_operations.show_error(_('Unhandled error'), _('Could not save profile with error: ') + err_msg)
+        else:
+            container = document.getElementById(container_id)
+            if container:
+                r = container.querySelector('.saved_msg')
+                if r:
+                    clear(r)
+                    r.appendChild(E.div(E.i(_('Saved: ') + name), style='margin-top: 1rem; margin-bottom: 1rem'))
+    )
+
+
+
+def got_all_profiles(hide_panel, container_id, all_profiles):
+    container = document.getElementById(container_id)
+    if not container:
+        return
+    print(all_profiles)
+
+
+def create_profiles_panel(hide_panel, book, container, onclick):
+    c = E.div(style='margin: 1rem', id=unique_id('placeholder-prefs'))
+    container_id = c.id
+    a = E.div(
+        style='display:flex',
+        E.div(
+            E.label(_('Save current settings as profile:') + ' '), E.input(
+                name='profile_name', placeholder=_('Name of profile'), onkeydown=def(e):
+                    if e.key is 'Enter':
+                        save_profile(container_id, hide_panel)
+        ),
+        ),
+        E.div('\xa0'),
+        E.div(
+            create_button(_('Save'), 'bookmark', save_profile.bind(None, container_id, hide_panel))
+        )
+    )
+    container.appendChild(c)
+    c.appendChild(a)
+    c.appendChild(E.div(class_='saved_msg'))
+    c.appendChild(E.hr())
+    c.appendChild(E.div(
+        style='padding-bottom: 1rem', class_='loading_msg',
+        _('Loading saved profiles, please wait…')
+    ))
+    ui_operations.get_all_profiles(got_all_profiles.bind(None, hide_panel, container.id)
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index 5362b38258ce..502ac85c47d7 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -230,15 +230,40 @@ def get_subset_of_settings(sd, filter_func):
         curval = sd.get(setting_name, ans)
         metadata = all_settings[setting_name]
         is_set = curval is not ans
-        if filter_func(setting_name, metadata, is_set):
+        if filter_func(setting_name, metadata, is_set, curval):
             ans[setting_name] = window.structuredClone(curval if is_set else metadata.default)
     return ans
 
+standalone_reader_defaults = {
+    'remember_window_geometry': False,
+    'remember_last_read': True,
+    'show_actions_toolbar': False,
+    'show_actions_toolbar_in_fullscreen': False,
+    'save_annotations_in_ebook': True,
+    'sync_annots_user': '',
+    'singleinstance': False,
+    'auto_hide_mouse': True,
+    'restore_docks': True,
+}
+
 
 def settings_for_reader_profile(sd):
 
-    def filter_func(setting_name, metadata, is_set):
-        if not is_set or metadata.category is not 'read_book' or metadata.disallowed_in_profile:
+    margin_text_settings = {'footer': True, 'header': True, 'controls_footer': True, 'left-margin': True, 'right-margin': True}
+
+    def filter_func(setting_name, metadata, is_set, curval):
+        if margin_text_settings[setting_name]:
+            curval = window.structuredClone(curval)
+            for x in v"['left', 'right', 'middle']":
+                if curval[x] is 'empty':
+                    v'delete curval[x]'
+        elif setting_name is 'standalone_misc_settings':
+            curval = window.structuredClone(curval)
+            for key in Object.keys(curval):
+                if curval[key] is standalone_reader_defaults[key]:
+                    v'delete curval[key]'
+
+        if not is_set or metadata.category is not 'read_book' or metadata.disallowed_in_profile or deep_eq(curval, metadata.default):
             return False
         return True
 
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index fab5a693a7d1..27e576cfa824 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -81,9 +81,7 @@ def profiles_recevied(proceed, end_type, xhr, ev):
             'Could not load viewer profiles with error: {}').format(xhr.error_html))
         return
     if not xhr.responseType or xhr.responseType is 'text':
-        result = xhr.responseText
-    else if xhr.responseType is 'blob':
-        result = xhr.response
+        result = JSON.parse(xhr.responseText)
     else:
         show_error(_('Failed to load profiles'), _(
             'Could not load viewer profiles: unknown response type: {}').format(xhr.responseType))
@@ -93,7 +91,7 @@ def profiles_recevied(proceed, end_type, xhr, ev):
 
 
 def get_all_profiles(proceed):
-    xhr = ajax('all-profiles/', profiles_recevied.bind(None, proceed), ok_code=0)
+    xhr = ajax('all-profiles', profiles_recevied.bind(None, proceed), ok_code=0)
     xhr.responseType = 'text'
     xhr.send()
 
@@ -353,8 +351,9 @@ if window is window.top:
     if TRANSLATIONS_DATA:
         install(TRANSLATIONS_DATA)
     ui_operations.get_all_profiles = get_all_profiles
-    ui_operations.save_profile = def(name, settings):
+    ui_operations.save_profile = def(name, settings, proceed):
         to_python.save_profile(name, settings)
+        proceed()
     ui_operations.get_file = get_file
     ui_operations.get_url_for_book_file_name = get_url_for_book_file_name
     ui_operations.get_mathjax_files = get_mathjax_files

From 592dad1194a3ba50d46e29360c4e9c5709a73610 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 20 Feb 2024 21:48:28 +0530
Subject: [PATCH 43/72] Keyboard shortcut to show profiles

---
 manual/viewer.rst               | 2 ++
 src/pyj/read_book/shortcuts.pyj | 6 ++++++
 src/pyj/read_book/view.pyj      | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/manual/viewer.rst b/manual/viewer.rst
index c9a57fc17793..901117dd801a 100644
--- a/manual/viewer.rst
+++ b/manual/viewer.rst
@@ -301,6 +301,8 @@ be customised in the viewer :guilabel:`Preferences`. The default shortcuts are l
       - Toggle Table of Contents
     * - :kbd:`Ctrl+S`
       - Read aloud
+    * - :kbd:`Alt+P`
+      - Change settings quickly by creating and switching to :guilabel:`profiles`
     * - :kbd:`Alt+f`
       - Follow links with the keyboard
     * - :kbd:`Ctrl+C`
diff --git a/src/pyj/read_book/shortcuts.pyj b/src/pyj/read_book/shortcuts.pyj
index 24fcf1ce344a..4e426b1ff63c 100644
--- a/src/pyj/read_book/shortcuts.pyj
+++ b/src/pyj/read_book/shortcuts.pyj
@@ -314,6 +314,12 @@ def common_shortcuts():  # {{{
         _('Show the book metadata')
     ),
 
+    'show_profiles': desc(
+        v"['Alt+p']",
+        'ui',
+        _('Change settings quickly by creating and switching to "profiles"')
+    ),
+
     'reload_book': desc(
         v"['Ctrl+Alt+F5', 'Ctrl+Alt+r']",
         'ui',
diff --git a/src/pyj/read_book/view.pyj b/src/pyj/read_book/view.pyj
index 4dc0e7a66fbe..5874651cd1c6 100644
--- a/src/pyj/read_book/view.pyj
+++ b/src/pyj/read_book/view.pyj
@@ -493,6 +493,8 @@ class View:
                 ui_operations.toggle_bookmarks()
             else:
                 self.overlay.show_bookmarks()
+        elif data.name is 'show_profiles':
+            self.overlay.show_profiles()
         elif data.name is 'toggle_highlights':
             ui_operations.toggle_highlights()
         elif data.name is 'new_bookmark':

From 43338d61232c51ed024bd96d2be6be151dab7363 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Feb 2024 17:21:24 +0530
Subject: [PATCH 44/72] More work on profiles

---
 src/calibre/gui2/viewer/config.py   |  9 +++-
 src/calibre/gui2/viewer/web_view.py | 17 ++++---
 src/pyj/read_book/profiles.pyj      | 76 ++++++++++++++++++++++-------
 src/pyj/viewer-main.pyj             | 38 +++++++--------
 4 files changed, 93 insertions(+), 47 deletions(-)

diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index ef62fbd72e15..afb41d9618a4 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -113,13 +113,18 @@ def save_viewer_profile(profile_name, profile, *user_names: str):
     user_names = expand_profile_user_names(user_names)
     if isinstance(profile, (str, bytes)):
         profile = json.loads(profile)
-    profile['__timestamp__'] = isoformat(utcnow())
+    if isinstance(profile, dict):
+        profile['__timestamp__'] = isoformat(utcnow())
     try:
         with open(os.path.join(viewer_config_dir, 'profiles.json'), 'rb') as f:
             raw = json.loads(f.read())
     except FileNotFoundError:
         raw = {}
     for name in user_names:
-        raw.setdefault(name, {})[profile_name] = profile
+        if isinstance(profile, dict):
+            raw.setdefault(name, {})[profile_name] = profile
+        else:
+            if name in raw:
+                raw[name].pop(profile_name, None)
     with open(os.path.join(viewer_config_dir, 'profiles.json'), 'wb') as f:
         f.write(json.dumps(raw, indent=2, sort_keys=True).encode())
diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index c563f896966d..8acc486e1289 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -190,9 +190,6 @@ def requestStarted(self, rq):
             encoded_fname = name[len('reader-background-'):]
             mt, data = background_image(encoded_fname)
             send_reply(rq, mt, data) if data else rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound)
-        elif name == 'all-profiles':
-            vp = load_viewer_profiles('viewer:', as_json_string=True)
-            send_reply(rq, 'application/json', vp.encode())
         elif name.startswith('mathjax/'):
             handle_mathjax_request(rq, name)
         elif not name:
@@ -287,7 +284,7 @@ class ViewerBridge(Bridge):
     show_book_folder = from_js()
     show_help = from_js(object)
     update_reading_rates = from_js(object)
-    save_profile = from_js(object, object)
+    profile_op = from_js(object, object, object)
 
     create_view = to_js()
     start_book_load = to_js()
@@ -307,6 +304,7 @@ class ViewerBridge(Bridge):
     repair_after_fullscreen_switch = to_js()
     viewer_font_size_changed = to_js()
     tts_event = to_js()
+    profile_response = to_js()
 
 
 def apply_font_settings(page_or_view):
@@ -552,7 +550,7 @@ def __init__(self, parent=None):
         self.bridge.close_prep_finished.connect(self.close_prep_finished)
         self.bridge.highlights_changed.connect(self.highlights_changed)
         self.bridge.update_reading_rates.connect(self.update_reading_rates)
-        self.bridge.save_profile.connect(self.save_profile)
+        self.bridge.profile_op.connect(self.profile_op)
         self.bridge.edit_book.connect(self.edit_book)
         self.bridge.show_book_folder.connect(self.show_book_folder)
         self.bridge.show_help.connect(self.show_help)
@@ -572,8 +570,13 @@ def __init__(self, parent=None):
             self.inspector = Inspector(parent.inspector_dock.toggleViewAction(), self)
             parent.inspector_dock.setWidget(self.inspector)
 
-    def save_profile(self, name, settings):
-        save_viewer_profile(name, settings, 'viewer:')
+    def profile_op(self, which, profile_name, settings):
+        if which == 'all-profiles':
+            vp = load_viewer_profiles('viewer:')
+            self.execute_when_ready('profile_response', 'all-profiles', vp)
+        elif which == 'save-profile':
+            save_viewer_profile(profile_name, settings, 'viewer:')
+            self.execute_when_ready('profile_response', 'save-profile', profile_name)
 
     def link_hovered(self, url):
         if url == 'javascript:void(0)':
diff --git a/src/pyj/read_book/profiles.pyj b/src/pyj/read_book/profiles.pyj
index 02825a3b9a1d..a2139f47b154 100644
--- a/src/pyj/read_book/profiles.pyj
+++ b/src/pyj/read_book/profiles.pyj
@@ -5,8 +5,10 @@ from __python__ import bound_methods, hash_literals
 from elementmaker import E
 
 from book_list.globals import get_session_data
+from book_list.item_list import create_item, create_item_list, create_side_action
 from dom import clear, unique_id
 from gettext import gettext as _
+from modals import question_dialog
 from read_book.globals import ui_operations
 from session import settings_for_reader_profile
 from widgets import create_button
@@ -19,29 +21,72 @@ def save_profile(container_id, hide_panel):
     name = container.querySelector('[name=profile_name]').value
     sd = get_session_data()
     settings = settings_for_reader_profile(sd)
-    ui_operations.save_profile(name, settings, def(err_msg):
-        if err_msg:
-            ui_operations.show_error(_('Unhandled error'), _('Could not save profile with error: ') + err_msg)
-        else:
-            container = document.getElementById(container_id)
-            if container:
-                r = container.querySelector('.saved_msg')
-                if r:
-                    clear(r)
-                    r.appendChild(E.div(E.i(_('Saved: ') + name), style='margin-top: 1rem; margin-bottom: 1rem'))
+    ui_operations.save_profile(name, settings, def():
+        container = document.getElementById(container_id)
+        if container:
+            r = container.querySelector('.saved_msg')
+            if r:
+                clear(r)
+                r.appendChild(E.div(E.i(_('Saved: ') + name), style='margin-top: 1rem; margin-bottom: 1rem'))
+                load_profiles(container_id)
+    )
+
+
+def use_profile(container_id, profile_name, profile_data):
+    container = document.getElementById(container_id)
+    if not container:
+        return
+    container.dispatchEvent(new Event('close_panel'))
+
+
+def delete_profile(container_id, profile_name):
+    question_dialog(_('Are you sure?'), _('Are you sure you want to delete the saved profile named: {}?').format(profile_name),
+        def (ok):
+            if ok:
+                ui_operations.save_profile(profile_name, None, def():
+                    load_profiles(container_id)
+                )
     )
 
 
+def got_all_profiles(container_id, all_profiles):
+    container = document.getElementById(container_id)
+    if not container:
+        return
+    all_profiles['__default__'] = {}
+    names = list_wrap(Object.keys(all_profiles))
+    names.pysort(def(x): return '' if x is '__default__' else x.toLowerCase();)
+    pl = container.querySelector('.profiles_list_container')
+    clear(pl)
+    pl.appendChild(E.div(
+        _('Load settings from one of the previously saved profiles below…')
+    ))
+    pl.appendChild(E.div())
+    items = []
+    for name in names:
+        display_name = name
+        if name is '__default__':
+            display_name = _('Restore settings to default values')
+            side_actions = []
+        else:
+            side_actions = [create_side_action('trash', delete_profile.bind(None, container_id, name), _('Delete this profile'))]
+        items.push(create_item(display_name, action=use_profile.bind(None, container_id, name, all_profiles[name]), side_actions=side_actions))
+    create_item_list(pl.lastChild, items)
+
 
-def got_all_profiles(hide_panel, container_id, all_profiles):
+def load_profiles(container_id):
     container = document.getElementById(container_id)
     if not container:
         return
-    print(all_profiles)
+    pl = container.querySelector('.profiles_list_container')
+    clear(pl)
+    pl.appendChild(E.div(_('Loading saved profiles, please wait…'), style='padding-bottom: 1rem'))
+    ui_operations.get_all_profiles(got_all_profiles.bind(None, container_id))
 
 
 def create_profiles_panel(hide_panel, book, container, onclick):
     c = E.div(style='margin: 1rem', id=unique_id('placeholder-prefs'))
+    c.addEventListener('close_panel', def(): hide_panel();, False)
     container_id = c.id
     a = E.div(
         style='display:flex',
@@ -61,8 +106,5 @@ def create_profiles_panel(hide_panel, book, container, onclick):
     c.appendChild(a)
     c.appendChild(E.div(class_='saved_msg'))
     c.appendChild(E.hr())
-    c.appendChild(E.div(
-        style='padding-bottom: 1rem', class_='loading_msg',
-        _('Loading saved profiles, please wait…')
-    ))
-    ui_operations.get_all_profiles(got_all_profiles.bind(None, hide_panel, container.id)
+    c.appendChild(E.div(class_='profiles_list_container'))
+    load_profiles(container_id)
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index 27e576cfa824..9c69d92f5f4c 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -72,28 +72,26 @@ def get_file(book, name, proceed):
     xhr.send()
 
 
-def profiles_recevied(proceed, end_type, xhr, ev):
-    end_type = workaround_qt_bug(xhr, end_type)
-    if end_type is 'abort':
-        return
-    if end_type is not 'load':
-        show_error(_('Failed to load profiles'), _(
-            'Could not load viewer profiles with error: {}').format(xhr.error_html))
-        return
-    if not xhr.responseType or xhr.responseType is 'text':
-        result = JSON.parse(xhr.responseText)
-    else:
-        show_error(_('Failed to load profiles'), _(
-            'Could not load viewer profiles: unknown response type: {}').format(xhr.responseType))
-        return
+profiles_callbacks = {'all': None, 'saved': None}
 
-    proceed(result)
+@from_python
+def profile_response(which, x):
+    if which is 'all-profiles':
+        profiles_callbacks.all(x)
+        profiles_callbacks.all = None
+    elif which is 'save-profile':
+        profiles_callbacks.saved()
+        profiles_callbacks.saved = None
 
 
 def get_all_profiles(proceed):
-    xhr = ajax('all-profiles', profiles_recevied.bind(None, proceed), ok_code=0)
-    xhr.responseType = 'text'
-    xhr.send()
+    profiles_callbacks.all = proceed
+    to_python.profile_op('all-profiles', '', None)
+
+
+def save_profile(name, settings, proceed):
+    profiles_callbacks.saved = proceed
+    to_python.profile_op('save-profile', name, settings)
 
 
 def get_mathjax_files(proceed):
@@ -351,9 +349,7 @@ if window is window.top:
     if TRANSLATIONS_DATA:
         install(TRANSLATIONS_DATA)
     ui_operations.get_all_profiles = get_all_profiles
-    ui_operations.save_profile = def(name, settings, proceed):
-        to_python.save_profile(name, settings)
-        proceed()
+    ui_operations.save_profile = save_profile
     ui_operations.get_file = get_file
     ui_operations.get_url_for_book_file_name = get_url_for_book_file_name
     ui_operations.get_mathjax_files = get_mathjax_files

From d0161868608dd6a64daf0daafbb464c49db0844f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Feb 2024 20:36:46 +0530
Subject: [PATCH 45/72] Profiles basically work in standalone viewer

---
 src/calibre/gui2/viewer/web_view.py | 18 ++++++++++--------
 src/pyj/read_book/overlay.pyj       | 12 ++++++++++--
 src/pyj/read_book/profiles.pyj      |  8 ++++++--
 src/pyj/session.pyj                 | 21 +++++++++++++++++++++
 src/pyj/viewer-main.pyj             |  2 +-
 5 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 8acc486e1289..bf3154031f2b 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -695,14 +695,16 @@ def set_session_data(self, key, val):
             self.standalone_misc_settings_changed.emit()
         elif key != '*':
             sd = vprefs['session_data']
-            sd[key] = val
-            vprefs['session_data'] = sd
-            if key in ('standalone_font_settings', 'base_font_size'):
-                apply_font_settings(self)
-            elif key == 'read_mode':
-                self.paged_mode_changed.emit()
-            elif key == 'standalone_misc_settings':
-                self.standalone_misc_settings_changed.emit(val)
+            changed = sd.get(key) == val
+            if changed:
+                sd[key] = val
+                vprefs['session_data'] = sd
+                if key in ('standalone_font_settings', 'base_font_size'):
+                    apply_font_settings(self)
+                elif key == 'read_mode':
+                    self.paged_mode_changed.emit()
+                elif key == 'standalone_misc_settings':
+                    self.standalone_misc_settings_changed.emit(val)
 
     def set_local_storage(self, key, val):
         if key == '*' and val is None:
diff --git a/src/pyj/read_book/overlay.pyj b/src/pyj/read_book/overlay.pyj
index 66460e49e80c..98c48e5db4bf 100644
--- a/src/pyj/read_book/overlay.pyj
+++ b/src/pyj/read_book/overlay.pyj
@@ -540,10 +540,13 @@ class PrefsOverlay: # {{{
     def on_container_click(self, evt):
         pass  # Dont allow panel to be closed by a click
 
+    def create_panel_impl(self, container):
+        return create_prefs_panel(container, self.overlay.hide_current_panel, self.on_change)
+
     def show(self, container):
         self.changes_occurred = False
         container.style.backgroundColor = get_color('window-background')
-        self.prefs = create_prefs_panel(container, self.overlay.hide_current_panel, self.on_change)
+        self.prefs = self.create_panel_impl(container)
 
     def on_change(self):
         self.changes_occurred = True
@@ -556,6 +559,11 @@ class PrefsOverlay: # {{{
             self.changes_occurred = False
             self.overlay.view.preferences_changed()
 
+
+class ProfilesOverlay(PrefsOverlay):
+    def create_panel_impl(self, container):
+        return create_profiles_panel(container, self.overlay.hide_current_panel, self.on_change)
+
 # }}}
 
 class FontSizeOverlay:  # {{{
@@ -749,7 +757,7 @@ class Overlay:
 
     def show_profiles(self):
         self.hide_current_panel()
-        self.panels.push(TOCOverlay(self, create_profiles_panel.bind(None, self.hide_current_panel), _('Profiles')))
+        self.panels.push(ProfilesOverlay(self))
         self.show_current_panel()
 
     def show_goto(self):
diff --git a/src/pyj/read_book/profiles.pyj b/src/pyj/read_book/profiles.pyj
index a2139f47b154..83d3cafd7c96 100644
--- a/src/pyj/read_book/profiles.pyj
+++ b/src/pyj/read_book/profiles.pyj
@@ -10,7 +10,7 @@ from dom import clear, unique_id
 from gettext import gettext as _
 from modals import question_dialog
 from read_book.globals import ui_operations
-from session import settings_for_reader_profile
+from session import apply_reader_profile, settings_for_reader_profile
 from widgets import create_button
 
 
@@ -36,9 +36,12 @@ def use_profile(container_id, profile_name, profile_data):
     container = document.getElementById(container_id)
     if not container:
         return
+    apply_reader_profile(get_session_data(), profile_data)
+    container.dispatchEvent(new Event('settings_changed'))
     container.dispatchEvent(new Event('close_panel'))
 
 
+
 def delete_profile(container_id, profile_name):
     question_dialog(_('Are you sure?'), _('Are you sure you want to delete the saved profile named: {}?').format(profile_name),
         def (ok):
@@ -84,9 +87,10 @@ def load_profiles(container_id):
     ui_operations.get_all_profiles(got_all_profiles.bind(None, container_id))
 
 
-def create_profiles_panel(hide_panel, book, container, onclick):
+def create_profiles_panel(container, hide_panel, on_change):
     c = E.div(style='margin: 1rem', id=unique_id('placeholder-prefs'))
     c.addEventListener('close_panel', def(): hide_panel();, False)
+    c.addEventListener('settings_changed', def(): on_change();, False)
     container_id = c.id
     a = E.div(
         style='display:flex',
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index 502ac85c47d7..beaa26b49e49 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -234,6 +234,21 @@ def get_subset_of_settings(sd, filter_func):
             ans[setting_name] = window.structuredClone(curval if is_set else metadata.default)
     return ans
 
+def apply_profile(sd, profile, filter_func):
+    sentinel = {}
+    for setting_name in Object.keys(all_settings):
+        metadata = all_settings[setting_name]
+        curval = sd.get(setting_name, sentinel)
+        is_set = curval is not sentinel
+        if filter_func(setting_name, metadata, is_set, curval):
+            newval = None
+            if Object.prototype.hasOwnProperty.call(profile, setting_name):
+                newval = profile[setting_name]
+                if deep_eq(newval, metadata.default):
+                    newval = None
+            sd.set(setting_name, window.structuredClone(newval))
+
+
 standalone_reader_defaults = {
     'remember_window_geometry': False,
     'remember_last_read': True,
@@ -270,6 +285,12 @@ def settings_for_reader_profile(sd):
     return get_subset_of_settings(sd, filter_func)
 
 
+def apply_reader_profile(sd, profile):
+    def filter_func(setting_name, metadata, is_set, curval):
+        return metadata.category is 'read_book'
+    apply_profile(sd, profile, filter_func)
+
+
 default_interface_data = {
     'username': None,
     'output_format': 'EPUB',
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index 9c69d92f5f4c..49e3c8186fbe 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -161,7 +161,7 @@ class SessionData:
 
     def set(self, key, val):
         if val is None:
-            self.data[key] = session_defaults()[key]
+            self.data[key] = val = session_defaults()[key]
         else:
             self.data[key] = val
         to_python.set_session_data(key, val)

From 3808bf47ca5c219dae130b6d623c3a054754655d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Feb 2024 20:39:15 +0530
Subject: [PATCH 46/72] Remove unused current_profile

---
 src/pyj/read_book/profiles.pyj | 3 ++-
 src/pyj/session.pyj            | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pyj/read_book/profiles.pyj b/src/pyj/read_book/profiles.pyj
index 83d3cafd7c96..e7800b7b1159 100644
--- a/src/pyj/read_book/profiles.pyj
+++ b/src/pyj/read_book/profiles.pyj
@@ -36,7 +36,8 @@ def use_profile(container_id, profile_name, profile_data):
     container = document.getElementById(container_id)
     if not container:
         return
-    apply_reader_profile(get_session_data(), profile_data)
+    sd = get_session_data()
+    apply_reader_profile(sd, profile_data)
     container.dispatchEvent(new Event('settings_changed'))
     container.dispatchEvent(new Event('close_panel'))
 
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index beaa26b49e49..f6fec1192b94 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -77,7 +77,6 @@ all_settings = {
     'book_search_case_sensitive': {'default': False, 'category': 'read_book', 'is_local': True},
     'reverse_page_turn_zones': {'default': False, 'category': 'read_book', 'is_local': True},
     'gesture_overrides': {'default': {}, 'category': 'read_book'},
-    'current_profile': {'default': None, 'category': 'read_book', 'is_local': True, 'disallowed_in_profile': True},
 }
 
 defaults = {}

From 7a1a26f2e3ad2191a88f41afe6af6e02e7262dd4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Feb 2024 21:12:22 +0530
Subject: [PATCH 47/72] Make applying a profile in the standalone viewer more
 efficient

---
 src/calibre/gui2/viewer/web_view.py | 44 ++++++++++++++++++++---------
 src/pyj/session.pyj                 | 16 +++++++----
 src/pyj/viewer-main.pyj             | 12 +++++++-
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index bf3154031f2b..78ace21757d0 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -688,23 +688,41 @@ def notify_full_screen_state_change(self, in_fullscreen_mode):
         self.execute_when_ready('full_screen_state_changed', in_fullscreen_mode)
 
     def set_session_data(self, key, val):
-        if key == '*' and val is None:
-            vprefs['session_data'] = {}
-            apply_font_settings(self)
-            self.paged_mode_changed.emit()
-            self.standalone_misc_settings_changed.emit()
-        elif key != '*':
-            sd = vprefs['session_data']
-            changed = sd.get(key) == val
+        fonts_changed = paged_mode_changed = standalone_misc_settings_changed = update_vprefs = False
+        sd = vprefs['session_data']
+
+        def change(key, val):
+            nonlocal fonts_changed, paged_mode_changed, standalone_misc_settings_changed, update_vprefs
+            changed = sd.get(key) != val
             if changed:
-                sd[key] = val
-                vprefs['session_data'] = sd
+                update_vprefs = True
+                if val is None:
+                    sd.pop(key, None)
+                else:
+                    sd[key] = val
                 if key in ('standalone_font_settings', 'base_font_size'):
-                    apply_font_settings(self)
+                    fonts_changed = True
                 elif key == 'read_mode':
-                    self.paged_mode_changed.emit()
+                    paged_mode_changed = True
                 elif key == 'standalone_misc_settings':
-                    self.standalone_misc_settings_changed.emit(val)
+                    standalone_misc_settings_changed = True
+
+        if isinstance(key, dict):
+            for k, val in key.items():
+                change(k, val)
+        elif key == '*' and val is None:
+            vprefs['session_data'] = {}
+            fonts_changed = paged_mode_changed = standalone_misc_settings_changed = update_vprefs = True
+        elif key != '*':
+            change(key, val)
+        if update_vprefs:
+            vprefs['session_data'] = sd
+        if fonts_changed:
+            apply_font_settings(self)
+        if paged_mode_changed:
+            self.paged_mode_changed.emit()
+        if standalone_misc_settings_changed:
+            self.standalone_misc_settings_changed.emit(val)
 
     def set_local_storage(self, key, val):
         if key == '*' and val is None:
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index f6fec1192b94..31fef9a8315e 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -172,6 +172,10 @@ class SessionData:
             console.error('session storage has overflowed, using a temp cache instead')
         return False
 
+    def set_bulk(self, changes):
+        for key in Object.keys(changes):
+            self.set(key, changes[key])
+
     def clear(self):
         self.storage.clear()
         self.overflow_storage = {}
@@ -234,18 +238,20 @@ def get_subset_of_settings(sd, filter_func):
     return ans
 
 def apply_profile(sd, profile, filter_func):
-    sentinel = {}
+    changes = {}
     for setting_name in Object.keys(all_settings):
         metadata = all_settings[setting_name]
-        curval = sd.get(setting_name, sentinel)
-        is_set = curval is not sentinel
+        curval = sd.get(setting_name, changes)
+        is_set = curval is not changes
         if filter_func(setting_name, metadata, is_set, curval):
             newval = None
             if Object.prototype.hasOwnProperty.call(profile, setting_name):
                 newval = profile[setting_name]
                 if deep_eq(newval, metadata.default):
                     newval = None
-            sd.set(setting_name, window.structuredClone(newval))
+            changes[setting_name] = window.structuredClone(newval)
+    sd.set_bulk(changes)
+    return changes
 
 
 standalone_reader_defaults = {
@@ -286,7 +292,7 @@ def settings_for_reader_profile(sd):
 
 def apply_reader_profile(sd, profile):
     def filter_func(setting_name, metadata, is_set, curval):
-        return metadata.category is 'read_book'
+        return metadata.category is 'read_book' and not metadata.disallowed_in_profile
     apply_profile(sd, profile, filter_func)
 
 
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index 49e3c8186fbe..d203304e0db9 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -161,11 +161,21 @@ class SessionData:
 
     def set(self, key, val):
         if val is None:
-            self.data[key] = val = session_defaults()[key]
+            self.data[key] = session_defaults()[key]
         else:
             self.data[key] = val
         to_python.set_session_data(key, val)
 
+    def set_bulk(self, changes):
+        defaults = session_defaults()
+        for key in Object.keys(changes):
+            val = changes[key]
+            if val is None:
+                self.data[key] = defaults[key]
+            else:
+                self.data[key] = val
+        to_python.set_session_data(changes, None)
+
     def clear(self):
         defaults = session_defaults()
         self.data = {k: defaults[k] for k in defaults}

From 9bc695c84373405d84e2029e1f0d4c328da2ae41 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 21 Feb 2024 22:57:08 +0530
Subject: [PATCH 48/72] Implement profiles for the Content server viewer

Fixes #1979022 [[Feature Request] Import/Export setting file for Content Server Viewer](https://bugs.launchpad.net/calibre/+bug/1979022)
---
 src/calibre/gui2/viewer/config.py |  6 +-----
 src/calibre/srv/content.py        | 26 ++++++++++++++++++++++++++
 src/pyj/read_book/overlay.pyj     |  3 +++
 src/pyj/read_book/ui.pyj          | 22 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index afb41d9618a4..5439cddad44e 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -89,23 +89,19 @@ def expand_profile_user_names(user_names):
     return user_names
 
 
-def load_viewer_profiles(*user_names: str, as_json_string=False):
+def load_viewer_profiles(*user_names: str):
     user_names = expand_profile_user_names(user_names)
     ans = {}
     try:
         with open(os.path.join(viewer_config_dir, 'profiles.json'), 'rb') as f:
             raw = json.loads(f.read())
     except FileNotFoundError:
-        if as_json_string:
-            return '{}'
         return ans
     for uname, profiles in raw.items():
         if uname in user_names:
             for profile_name, profile in profiles.items():
                 if profile_name not in ans or ans[profile_name]['__timestamp__'] <= profile['__timestamp__']:
                     ans[profile_name] = profile
-    if as_json_string:
-        return json.dumps(ans)
     return ans
 
 
diff --git a/src/calibre/srv/content.py b/src/calibre/srv/content.py
index 1f06062b1d1f..8730f8b1ca9e 100644
--- a/src/calibre/srv/content.py
+++ b/src/calibre/srv/content.py
@@ -318,6 +318,32 @@ def reader_background(ctx, rd, encoded_fname):
         raise HTTPNotFound(f'Reader background {encoded_fname} not found')
 
 
+@endpoint('/reader-profiles/get-all', postprocess=json)
+def get_all_reader_profiles(ctx, rd):
+    from calibre.gui2.viewer.config import load_viewer_profiles
+    which = 'user:'
+    if rd.username:
+        which += rd.username
+    return load_viewer_profiles(which)
+
+
+@endpoint('/reader-profiles/save', methods={'POST'}, postprocess=json)
+def save_reader_profile(ctx, rd):
+    try:
+        data = load_json_file(rd.request_body_file)
+        name, profile = data['name'], data['profile']
+        if not isinstance(profile, dict):
+            raise TypeError('profile must be a dict')
+    except Exception as err:
+        raise HTTPBadRequest(f'Invalid query: {err}')
+    from calibre.gui2.viewer.config import save_viewer_profile
+    which = 'user:'
+    if rd.username:
+        which += rd.username
+    save_viewer_profile(name, profile, which)
+    return True
+
+
 @endpoint('/get/{what}/{book_id}/{library_id=None}', android_workaround=True)
 def get(ctx, rd, what, book_id, library_id):
     book_id, rest = book_id.partition('_')[::2]
diff --git a/src/pyj/read_book/overlay.pyj b/src/pyj/read_book/overlay.pyj
index 98c48e5db4bf..d881eb1fb547 100644
--- a/src/pyj/read_book/overlay.pyj
+++ b/src/pyj/read_book/overlay.pyj
@@ -564,6 +564,9 @@ class ProfilesOverlay(PrefsOverlay):
     def create_panel_impl(self, container):
         return create_profiles_panel(container, self.overlay.hide_current_panel, self.on_change)
 
+    def handle_escape(self):
+        self.overlay.hide_current_panel()
+
 # }}}
 
 class FontSizeOverlay:  # {{{
diff --git a/src/pyj/read_book/ui.pyj b/src/pyj/read_book/ui.pyj
index 7f9c5165489a..82f80b390cf6 100644
--- a/src/pyj/read_book/ui.pyj
+++ b/src/pyj/read_book/ui.pyj
@@ -136,6 +136,28 @@ class ReadUI:
                 error_dialog(_('Could not copy to clipboard'), _('No permission to write to clipboard'))
             )
 
+        ui_operations.get_all_profiles = def(proceed):
+            ajax('reader-profiles/get-all', def(end_type, xhr, ev):
+                if end_type is not 'load':
+                    if end_type is 'abort': return
+                    return self.show_error(_('Failed to load profiles'), _(
+                        'Could not load profiles: with error: {}').format(xhr.error_html))
+                try:
+                    result = JSON.parse(xhr.responseText)
+                except Exception:
+                    return self.show_error(_('Failed to parse profiles'), _('Unparseable data received for profiles'))
+                proceed(result)
+            ).send()
+
+        ui_operations.save_profile = def(profile_name, profile, proceed):
+            ajax_send('reader-profiles/save', {'name': profile_name, 'profile': profile}, def(end_type, xhr, ev):
+                if end_type is not 'load':
+                    if end_type is 'abort': return
+                    return self.show_error(_('Failed to load profiles'), _(
+                        'Could not load profiles: with error: {}').format(xhr.error_html))
+                proceed()
+            )
+
     def on_resize(self):
         self.view.on_resize()
 

From a65259b1c8392959d9b06c9fc297a4d14d57f6d0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Feb 2024 09:18:43 +0530
Subject: [PATCH 49/72] Add a toolbar button to quick switch profiles

---
 src/calibre/gui2/viewer/toolbars.py | 45 +++++++++++++++++++++++++----
 src/calibre/gui2/viewer/web_view.py |  4 +++
 src/pyj/viewer-main.pyj             | 13 ++++++++-
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index b61f6d35e4be..3fe1c1493fd5 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -6,8 +6,8 @@
 from functools import partial
 from qt.core import (
     QAbstractItemView, QAction, QDialog, QDialogButtonBox, QGroupBox, QHBoxLayout,
-    QIcon, QKeySequence, QLabel, QListWidget, QListWidgetItem, QMenu, Qt, QToolBar,
-    QToolButton, QVBoxLayout, pyqtSignal,
+    QIcon, QInputDialog, QKeySequence, QLabel, QListWidget, QListWidgetItem, QMenu, Qt,
+    QToolBar, QToolButton, QVBoxLayout, pyqtSignal,
 )
 from qt.webengine import QWebEnginePage
 
@@ -41,6 +41,7 @@ def all_actions():
     if not hasattr(all_actions, 'ans'):
         amap = {
             'color_scheme': Action('format-fill-color.png', _('Switch color scheme')),
+            'profiles': Action('auto-reload.png', _('Apply settings from a saved profile')),
             'back': Action('back.png', _('Back'), 'back'),
             'forward': Action('forward.png', _('Forward'), 'forward'),
             'open': Action('document_open.png', _('Open e-book')),
@@ -215,6 +216,10 @@ def initialize(self, web_view, toggle_search_action):
         self.color_scheme_menu = m = QMenu(self)
         a.setMenu(m)
         m.aboutToShow.connect(self.populate_color_scheme_menu)
+        self.profiles_action = a = QAction(aa.profiles.icon, aa.profiles.text, self)
+        self.profiles_menu = m = QMenu(self)
+        a.setMenu(m)
+        m.aboutToShow.connect(self.populate_profiles_menu)
 
         self.add_actions()
 
@@ -237,9 +242,10 @@ def add_actions(self):
                     self.addAction(getattr(self, f'{x}_action'))
                 except AttributeError:
                     pass
-        w = self.widgetForAction(self.color_scheme_action)
-        if w:
-            w.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+        for x in (self.color_scheme_action, self.profiles_action):
+            w = self.widgetForAction(x)
+            if w:
+                w.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
     def update_mode_action(self):
         mode = get_session_pref('read_mode', default='paged', group=None)
@@ -338,6 +344,35 @@ def clear_recently_opened(self):
     def on_view_created(self, data):
         self.default_color_schemes = data['default_color_schemes']
 
+    def populate_profiles_menu(self):
+        from calibre.gui2.viewer.config import load_viewer_profiles
+        m = self.profiles_menu
+        m.clear()
+        self.profiles = load_viewer_profiles('viewer:')
+        self.profiles['__default__'] = {}
+        def a(name, display_name=''):
+            a = m.addAction(display_name or name)
+            a.setObjectName(f'profile-switch-action:{name}')
+            a.triggered.connect(self.profile_switch_triggered)
+        a('__default__', _('Restore settings to defaults'))
+        m.addSeparator()
+        for profile_name in sorted(self.profiles, key=lambda x: x.lower()):
+            if profile_name == '__default__':
+                continue
+            a(profile_name)
+        m.addSeparator()
+        m.addAction(_('Save current settings as a profile')).triggered.connect(self.save_profile)
+
+    def profile_switch_triggered(self):
+        key = self.sender().objectName().partition(':')[-1]
+        profile = self.profiles[key]
+        self.web_view.profile_op('apply-profile', key, profile)
+
+    def save_profile(self):
+        name, ok = QInputDialog.getText(self, _('Enter name of profile to create'), _('&Name of profile'))
+        if ok:
+            self.web_view.profile_op('request-save', name, {})
+
     def populate_color_scheme_menu(self):
         m = self.color_scheme_menu
         m.clear()
diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 78ace21757d0..86160761e0ee 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -577,6 +577,10 @@ def profile_op(self, which, profile_name, settings):
         elif which == 'save-profile':
             save_viewer_profile(profile_name, settings, 'viewer:')
             self.execute_when_ready('profile_response', 'save-profile', profile_name)
+        elif which == 'apply-profile':
+            self.execute_when_ready('profile_response', 'apply-profile', settings)
+        elif which == 'request-save':
+            self.execute_when_ready('profile_response', 'request-save', profile_name)
 
     def link_hovered(self, url):
         if url == 'javascript:void(0)':
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index d203304e0db9..4fddef953820 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -24,7 +24,9 @@ from read_book.iframe import main as iframe_main
 from read_book.open_book import remove_recently_opened
 from read_book.prefs.head_foot import set_time_formatter
 from read_book.view import View
-from session import local_storage, session_defaults, default_interface_data
+from session import (
+    apply_reader_profile, default_interface_data, local_storage, session_defaults, settings_for_reader_profile
+)
 from utils import debounce, encode_query_with_path, parse_url_params
 from viewer.constants import FAKE_HOST, FAKE_PROTOCOL
 
@@ -82,6 +84,15 @@ def profile_response(which, x):
     elif which is 'save-profile':
         profiles_callbacks.saved()
         profiles_callbacks.saved = None
+    elif which is 'apply-profile':
+        sd = get_session_data()
+        apply_reader_profile(sd, x)
+        if view:
+            view.preferences_changed()
+    elif which is 'request-save':
+        sd = get_session_data()
+        settings = settings_for_reader_profile(sd)
+        save_profile(x, settings, def(): pass;)
 
 
 def get_all_profiles(proceed):

From aeb0fdc4735820aec9195febfcbee950f7c9e74d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Feb 2024 09:38:49 +0530
Subject: [PATCH 50/72] Save toolbar actions in profile

---
 src/calibre/gui2/viewer/config.py   | 7 +++++++
 src/calibre/gui2/viewer/toolbars.py | 8 ++++++++
 src/calibre/gui2/viewer/web_view.py | 6 ++++++
 src/pyj/read_book/profiles.pyj      | 3 ++-
 src/pyj/viewer-main.pyj             | 3 +++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/viewer/config.py b/src/calibre/gui2/viewer/config.py
index 5439cddad44e..02ee94bcdbf3 100644
--- a/src/calibre/gui2/viewer/config.py
+++ b/src/calibre/gui2/viewer/config.py
@@ -111,6 +111,13 @@ def save_viewer_profile(profile_name, profile, *user_names: str):
         profile = json.loads(profile)
     if isinstance(profile, dict):
         profile['__timestamp__'] = isoformat(utcnow())
+        from calibre.gui2.viewer.toolbars import current_actions, DEFAULT_ACTIONS
+        ca = current_actions()
+        s = {}
+        if ca != DEFAULT_ACTIONS:
+            s['toolbar-actions'] = ca
+        if s:
+            profile['__standalone_extra_settings__'] = s
     try:
         with open(os.path.join(viewer_config_dir, 'profiles.json'), 'rb') as f:
             raw = json.loads(f.read())
diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index 3fe1c1493fd5..5b0403f588f3 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -152,6 +152,7 @@ def initialize(self, web_view, toggle_search_action):
         web_view.read_aloud_state_changed.connect(self.update_read_aloud_action)
         web_view.customize_toolbar.connect(self.customize, type=Qt.ConnectionType.QueuedConnection)
         web_view.view_created.connect(self.on_view_created)
+        web_view.change_toolbar_actions.connect(self.change_toolbar_actions)
 
         self.web_actions = {}
         self.back_action = a = shortcut_action('back')
@@ -223,6 +224,13 @@ def initialize(self, web_view, toggle_search_action):
 
         self.add_actions()
 
+    def change_toolbar_actions(self, toolbar_actions):
+        if toolbar_actions is None:
+            vprefs.__delitem__('actions-toolbar-actions')
+        else:
+            vprefs.set('actions-toolbar-actions', toolbar_actions)
+        self.add_actions()
+
     def update_web_action(self):
         a = self.sender()
         for x, ac in self.web_actions.items():
diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py
index 86160761e0ee..ec91e086844c 100644
--- a/src/calibre/gui2/viewer/web_view.py
+++ b/src/calibre/gui2/viewer/web_view.py
@@ -492,6 +492,7 @@ class WebView(RestartingWebEngineView):
     standalone_misc_settings_changed = pyqtSignal(object)
     view_created = pyqtSignal(object)
     content_file_changed = pyqtSignal(str)
+    change_toolbar_actions = pyqtSignal(object)
 
     def __init__(self, parent=None):
         self._host_widget = None
@@ -581,6 +582,11 @@ def profile_op(self, which, profile_name, settings):
             self.execute_when_ready('profile_response', 'apply-profile', settings)
         elif which == 'request-save':
             self.execute_when_ready('profile_response', 'request-save', profile_name)
+        elif which == 'apply-profile-to-viewer-ui':
+            toolbar_actions = None
+            s = settings.get('__standalone_extra_settings__', {})
+            toolbar_actions = s.get('toolbar-actions', None)
+            self.change_toolbar_actions.emit(toolbar_actions)
 
     def link_hovered(self, url):
         if url == 'javascript:void(0)':
diff --git a/src/pyj/read_book/profiles.pyj b/src/pyj/read_book/profiles.pyj
index e7800b7b1159..1feffa506216 100644
--- a/src/pyj/read_book/profiles.pyj
+++ b/src/pyj/read_book/profiles.pyj
@@ -38,11 +38,12 @@ def use_profile(container_id, profile_name, profile_data):
         return
     sd = get_session_data()
     apply_reader_profile(sd, profile_data)
+    if ui_operations.apply_profile:
+        ui_operations.apply_profile(profile_data)
     container.dispatchEvent(new Event('settings_changed'))
     container.dispatchEvent(new Event('close_panel'))
 
 
-
 def delete_profile(container_id, profile_name):
     question_dialog(_('Are you sure?'), _('Are you sure you want to delete the saved profile named: {}?').format(profile_name),
         def (ok):
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index 4fddef953820..b9d3d9186649 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -89,6 +89,7 @@ def profile_response(which, x):
         apply_reader_profile(sd, x)
         if view:
             view.preferences_changed()
+        ui_operations.apply_profile(x)
     elif which is 'request-save':
         sd = get_session_data()
         settings = settings_for_reader_profile(sd)
@@ -371,6 +372,8 @@ if window is window.top:
         install(TRANSLATIONS_DATA)
     ui_operations.get_all_profiles = get_all_profiles
     ui_operations.save_profile = save_profile
+    ui_operations.apply_profile = def(profile):
+        to_python.profile_op('apply-profile-to-viewer-ui', "", profile)
     ui_operations.get_file = get_file
     ui_operations.get_url_for_book_file_name = get_url_for_book_file_name
     ui_operations.get_mathjax_files = get_mathjax_files

From 4fb575d8fe1c58c09b40a62be4e1bbee82af3861 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Feb 2024 09:44:05 +0530
Subject: [PATCH 51/72] use cloned values from defaults as current value

---
 src/pyj/session.pyj     |  9 ++++++---
 src/pyj/viewer-main.pyj | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index 31fef9a8315e..e7f19e4c165a 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -372,11 +372,14 @@ class UserSessionData(SessionData):
         self.echo_changes = True
 
     def defval(self, key):
-        return session_defaults()[key]
+        ans = session_defaults()[key]
+        if ans:
+            ans = window.structuredClone(ans)
+        return ans
 
     def get(self, key, defval):
         if defval is undefined:
-            defval = session_defaults()[key]
+            defval = self.defval(key)
         return SessionData.get(self, (self.prefix + key), defval)
 
     def get_library_option(self, library_id, key, defval):
@@ -384,7 +387,7 @@ class UserSessionData(SessionData):
             return self.get(key, defval)
         lkey = key + '-||-' + library_id
         if defval is undefined:
-            defval = session_defaults()[key]
+            defval = self.defval(key)
         return self.get(lkey, defval)
 
     def set(self, key, value):
diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj
index b9d3d9186649..3bcc8c8457bd 100644
--- a/src/pyj/viewer-main.pyj
+++ b/src/pyj/viewer-main.pyj
@@ -157,11 +157,17 @@ def manifest_received(key, initial_position, pathtoebook, highlights, book_url,
         xhr.error_html or None)
 
 
+def clone(x):
+    if x:
+        x = window.structuredClone(x)
+    return x
+
+
 class SessionData:
 
     def __init__(self, prefs):
         defaults = session_defaults()
-        self.data = {k: defaults[k] if prefs[k] is undefined else prefs[k] for k in defaults}
+        self.data = {k: clone(defaults[k]) if prefs[k] is undefined else clone(prefs[k]) for k in defaults}
 
     def get(self, key, defval):
         ans = self.data[key]
@@ -173,7 +179,7 @@ class SessionData:
 
     def set(self, key, val):
         if val is None:
-            self.data[key] = session_defaults()[key]
+            self.data[key] = clone(session_defaults()[key])
         else:
             self.data[key] = val
         to_python.set_session_data(key, val)
@@ -183,14 +189,14 @@ class SessionData:
         for key in Object.keys(changes):
             val = changes[key]
             if val is None:
-                self.data[key] = defaults[key]
+                self.data[key] = clone(defaults[key])
             else:
                 self.data[key] = val
         to_python.set_session_data(changes, None)
 
     def clear(self):
         defaults = session_defaults()
-        self.data = {k: defaults[k] for k in defaults}
+        self.data = {k: clone(defaults[k]) for k in defaults}
         to_python.set_session_data('*', None)
 
 

From fec7d8bddfea6f3726154cac9bb97108085acd12 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Feb 2024 11:31:20 +0530
Subject: [PATCH 52/72] Allow deleting saved profiles from toolbar button

---
 src/calibre/gui2/viewer/toolbars.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index 5b0403f588f3..f8ebea7ed685 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -370,12 +370,24 @@ def a(name, display_name=''):
             a(profile_name)
         m.addSeparator()
         m.addAction(_('Save current settings as a profile')).triggered.connect(self.save_profile)
+        if len(self.profiles) > 1:
+            s = m.addMenu(_('Delete saved profile...'))
+            for pname in self.profiles:
+                if pname != '__default__':
+                    a = s.addAction(pname)
+                    a.setObjectName(f'profile-delete-action:{pname}')
+                    a.triggered.connect(self.profile_delete_triggerred)
 
     def profile_switch_triggered(self):
         key = self.sender().objectName().partition(':')[-1]
         profile = self.profiles[key]
         self.web_view.profile_op('apply-profile', key, profile)
 
+    def profile_delete_triggerred(self):
+        key = self.sender().objectName().partition(':')[-1]
+        from calibre.gui2.viewer.config import save_viewer_profile
+        save_viewer_profile(key, None, 'viewer:')
+
     def save_profile(self):
         name, ok = QInputDialog.getText(self, _('Enter name of profile to create'), _('&Name of profile'))
         if ok:

From 1f584ad77ec521a93526bfa3395bef2a72ce14d4 Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Thu, 22 Feb 2024 11:44:43 -0700
Subject: [PATCH 53/72] Adds Amazon Mexico store

---
 src/calibre/ebooks/metadata/sources/amazon.py |  1 +
 .../gui2/store/stores/amazon_mx_plugin.py     | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 src/calibre/gui2/store/stores/amazon_mx_plugin.py

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 14ac0bed50c7..bca6926c8d07 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -1240,6 +1240,7 @@ def referrer_for_domain(self, domain=None):
             'au':  'https://www.amazon.com.au/',
             'br':  'https://www.amazon.com.br/',
             'jp':  'https://www.amazon.co.jp/',
+            'mx':  'https://www.amazon.com.mx/',
         }.get(domain, 'https://www.amazon.%s/' % domain)
 
     def _get_book_url(self, identifiers):  # {{{
diff --git a/src/calibre/gui2/store/stores/amazon_mx_plugin.py b/src/calibre/gui2/store/stores/amazon_mx_plugin.py
new file mode 100644
index 000000000000..e83ecff303f1
--- /dev/null
+++ b/src/calibre/gui2/store/stores/amazon_mx_plugin.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+# License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+store_version = 20  # Needed for dynamic plugin loading
+
+from calibre.gui2.store import StorePlugin
+try:
+    from calibre.gui2.store.amazon_base import AmazonStore
+except ImportError:
+    class AmazonStore:
+        minimum_calibre_version = 9999, 0, 0
+
+
+class Base(AmazonStore):
+    scraper_storage = []
+    SEARCH_BASE_URL = 'https://www.amazon.com.mx/s/'
+    SEARCH_BASE_QUERY = {'url': 'search-alias=digital-text'}
+    DETAILS_URL = 'https://amazon.com.mx/dp/'
+    STORE_LINK =  'https://www.amazon.com.mx'
+
+
+class AmazonKindleStore(Base, StorePlugin):
+    pass
+
+
+if __name__ == '__main__':
+    Base().develop_plugin()

From 1ea4040a0dba00b5482e173f81d91c5ec0a80b45 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Feb 2024 13:40:53 +0530
Subject: [PATCH 54/72] ...

---
 src/calibre/gui2/store/stores/amazon_mx_plugin.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/calibre/gui2/store/stores/amazon_mx_plugin.py b/src/calibre/gui2/store/stores/amazon_mx_plugin.py
index e83ecff303f1..c64838460056 100644
--- a/src/calibre/gui2/store/stores/amazon_mx_plugin.py
+++ b/src/calibre/gui2/store/stores/amazon_mx_plugin.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
-from __future__ import absolute_import, division, print_function, unicode_literals
 
-store_version = 20  # Needed for dynamic plugin loading
+store_version = 1  # Needed for dynamic plugin loading
 
 from calibre.gui2.store import StorePlugin
 try:

From d587ddfbafd4d918213376b100f8b4951be3d378 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Mon, 26 Feb 2024 10:33:04 +0530
Subject: [PATCH 55/72] Update moneycontrol.recipe

---
 recipes/moneycontrol.recipe | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipes/moneycontrol.recipe b/recipes/moneycontrol.recipe
index 320398a975ca..2563b5cf503f 100644
--- a/recipes/moneycontrol.recipe
+++ b/recipes/moneycontrol.recipe
@@ -47,7 +47,7 @@ class MoneyControlRecipe(BasicNewsRecipe):
         dict(name=['svg', 'style', 'button', 'script']),
         dict(attrs={'id':['social_icon_impression', 'taboola-mid-article-thumbnails']}),
         classes(
-            'social_icons_wrapper mid-arti-ad lastPara related_stories_left_block social_icons_mobile_wrapper'
+            'social_icons_wrapper mid-arti-ad lastPara related_stories_left_block social_icons_mobile_wrapper '
             'advSlotsWithoutGrayBox tags_wrapper maintextdiv page_right_wrapper stockwidget tech_newsletter'
         )
     ]
@@ -73,11 +73,12 @@ class MoneyControlRecipe(BasicNewsRecipe):
         'personal-finance', 'commodities', 'trade', 'companies'
     ]
 
+    a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
+
     for sec in business_sections:
         allinurl_a = index + 'news/business'
-        a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
         feeds.append((sec.capitalize(), a.format(when, quote(allinurl_a, safe=''), '%2F' + sec + '%2F')))
-    feeds.append(('Business' , a.format(str(when), quote(allinurl_a, safe=''), '')))
+    feeds.append(('Business' , a.format(when, quote(allinurl_a, safe=''), '')))
 
     news_sections = [
         'india', 'world', 'opinion', 'politics', 'technology', 'trends', 'lifestyle'
@@ -85,11 +86,10 @@ class MoneyControlRecipe(BasicNewsRecipe):
 
     for sec in news_sections:
         allinurl_b = index + 'news'
-        b = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
-        feeds.append((sec.capitalize(), a.format(str(when), quote(allinurl_b, safe=''), '%2F' + sec + '%2F')))
-    feeds.append(('News', b.format(str(when), quote(allinurl_b, safe=''), '')))
+        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_b, safe=''), '%2F' + sec + '%2F')))
+    feeds.append(('News', a.format(when, quote(allinurl_b, safe=''), '')))
     feeds.append(
-        ('Others', 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=IN&ceid=IN:en'.format(str(when), quote(index, safe='')))
+        ('Others', 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=IN&ceid=IN:en'.format(when, quote(index, safe='')))
     )
 
     def populate_article_metadata(self, article, soup, first):

From 826e35cb19266a664536d7f04e64fb9641cd7645 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Feb 2024 11:31:20 +0530
Subject: [PATCH 56/72] Edit book: Live CSS: Fix regression causing incorrect
 colors in calibre 7.

Yet another Qt regression. Sigh. This time it looks like QPalette color
propagation is broken.
---
 src/calibre/gui2/tweak_book/live_css.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/live_css.py b/src/calibre/gui2/tweak_book/live_css.py
index cefe9c5a767d..bf665efa78c1 100644
--- a/src/calibre/gui2/tweak_book/live_css.py
+++ b/src/calibre/gui2/tweak_book/live_css.py
@@ -193,6 +193,12 @@ def paintEvent(self, ev):
         p.setPen(palette.color(QPalette.ColorRole.WindowText))
         if not self.is_first:
             p.drawLine(0, 0, self.width(), 0)
+        parent = self
+        while parent is not None:
+            parent = parent.parent()
+            if isinstance(parent, LiveCSS):
+                palette = parent.palette()
+                break
         try:
             for row in self.rows:
                 for cell in row:

From 09c17cc135df67749e6e28c09a2620f4ef87b0d7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Feb 2024 13:48:14 +0530
Subject: [PATCH 57/72] Fix #2054935 [[Enhancement] Switch focus to main
 calibre window when clicking Jump to this book in the library in the Full
 text search window](https://bugs.launchpad.net/calibre/+bug/2054935)

---
 src/calibre/gui2/fts/search.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/fts/search.py b/src/calibre/gui2/fts/search.py
index 259f48b93f81..cfe44074807c 100644
--- a/src/calibre/gui2/fts/search.py
+++ b/src/calibre/gui2/fts/search.py
@@ -46,7 +46,9 @@ def jump_to_book(book_id, parent=None):
     gui = get_gui()
     if gui is not None:
         parent = parent or gui
-        if not gui.library_view.select_rows((book_id,)):
+        if gui.library_view.select_rows((book_id,)):
+            gui.raise_and_focus()
+        else:
             if gprefs['fts_library_restrict_books']:
                 error_dialog(parent, _('Not found'), _('This book was not found in the calibre library'), show=True)
             else:

From f6185b2e55ce9c07045c5dae6c429ae61f94adcf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Feb 2024 22:45:50 +0530
Subject: [PATCH 58/72] Fix for New Yorker stupidly serving photographs in PNG
 format

---
 recipes/new_yorker.recipe | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/recipes/new_yorker.recipe b/recipes/new_yorker.recipe
index b9268da6edc1..a4eff565224c 100644
--- a/recipes/new_yorker.recipe
+++ b/recipes/new_yorker.recipe
@@ -76,10 +76,20 @@ class NewYorker(BasicNewsRecipe):
             noscript.name = 'div'
         return soup
 
-    def parse_index(self):
+    def preprocess_image(self, img_data, image_url):
+        from PIL import Image
+        from calibre import fit_image
+        from io import BytesIO
+        img = Image.open(BytesIO(img_data)).convert('RGB')
+        scaled, nwidth, nheight = fit_image(img.width, img.height, 1024, 1024)
+        if scaled:
+            img = img.resize((nwidth, nheight))
+        buf = BytesIO()
+        img.save(buf, format='JPEG')
+        return buf.getvalue()
 
+    def parse_index(self):
         # Get cover
-
         cover_soup = self.index_to_soup('https://www.newyorker.com/archive')
         cover_img = cover_soup.find(
             attrs={'class': lambda x: x and 'MagazineSection__cover___' in x})

From aae88fa07eb1b8336c3443607c37f28bd0ee3fe2 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Tue, 27 Feb 2024 23:12:27 +0530
Subject: [PATCH 59/72] ...

---
 recipes/new_yorker.recipe | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/recipes/new_yorker.recipe b/recipes/new_yorker.recipe
index a4eff565224c..bfe5c68d00e3 100644
--- a/recipes/new_yorker.recipe
+++ b/recipes/new_yorker.recipe
@@ -34,6 +34,7 @@ class NewYorker(BasicNewsRecipe):
     timefmt = ' [%b %d]'
     encoding = 'utf-8'
     extra_css = '''
+        img { display:block; margin:0 auto; }
         .byline { font-size:smaller; font-weight: bold;}
         h3 { margin-bottom: 6px; }
         .caption { font-size: smaller; font-style: italic; font-weight: normal; }
@@ -72,6 +73,21 @@ class NewYorker(BasicNewsRecipe):
             self.log.warn('Kindle Output profile being used, reducing image quality to keep file size below amazon email threshold')
 
     def preprocess_html(self, soup):
+        w = '/w_320' # use '/w_640' for highres
+        for img in soup.findAll('img'):
+            if img.has_attr('srcset'):
+                for x in img['srcset'].split():
+                    if w in x:
+                        img['src'] = x
+            elif img.find_previous_sibling('source', attrs={'srcset':True}):
+                srcset = img.find_previous_sibling('source', attrs={'srcset':True})
+                for x in srcset['srcset'].split():
+                    if w in x:
+                        img['src'] = x
+                    elif '/w_560' in x:
+                        img['src'] = x
+        for src in soup.findAll('source'):
+            src.decompose()
         for noscript in soup.findAll('noscript'):
             noscript.name = 'div'
         return soup

From 951ac220124304d445318a33e3696d227ee2bbff Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Tue, 27 Feb 2024 23:13:48 +0530
Subject: [PATCH 60/72] Update new_yorker.recipe

---
 recipes/new_yorker.recipe | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/recipes/new_yorker.recipe b/recipes/new_yorker.recipe
index bfe5c68d00e3..adaa5e398b6c 100644
--- a/recipes/new_yorker.recipe
+++ b/recipes/new_yorker.recipe
@@ -92,17 +92,17 @@ class NewYorker(BasicNewsRecipe):
             noscript.name = 'div'
         return soup
 
-    def preprocess_image(self, img_data, image_url):
-        from PIL import Image
-        from calibre import fit_image
-        from io import BytesIO
-        img = Image.open(BytesIO(img_data)).convert('RGB')
-        scaled, nwidth, nheight = fit_image(img.width, img.height, 1024, 1024)
-        if scaled:
-            img = img.resize((nwidth, nheight))
-        buf = BytesIO()
-        img.save(buf, format='JPEG')
-        return buf.getvalue()
+    # def preprocess_image(self, img_data, image_url):
+        # from PIL import Image
+        # from calibre import fit_image
+        # from io import BytesIO
+        # img = Image.open(BytesIO(img_data)).convert('RGB')
+        # scaled, nwidth, nheight = fit_image(img.width, img.height, 1024, 1024)
+        # if scaled:
+            # img = img.resize((nwidth, nheight))
+        # buf = BytesIO()
+        # img.save(buf, format='JPEG')
+        # return buf.getvalue()
 
     def parse_index(self):
         # Get cover

From 15dd52d0f1a75533839f4e9443679a3107dc4942 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Wed, 28 Feb 2024 09:53:44 +0530
Subject: [PATCH 61/72] Update the_week_magazine_free.recipe

---
 recipes/the_week_magazine_free.recipe | 105 +++++++++++++++++++++-----
 1 file changed, 86 insertions(+), 19 deletions(-)

diff --git a/recipes/the_week_magazine_free.recipe b/recipes/the_week_magazine_free.recipe
index 923cc239c59f..c424635e934f 100644
--- a/recipes/the_week_magazine_free.recipe
+++ b/recipes/the_week_magazine_free.recipe
@@ -1,27 +1,94 @@
-__license__ = 'GPL v3'
-__copyright__ = '2010, JOlo'
 '''
 www.theweek.com
 '''
-
-from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.web.feeds.news import BasicNewsRecipe, classes
+from urllib.parse import quote
 
 
 class TheWeek(BasicNewsRecipe):
-    title = 'TheWeek.com'
-    __author__ = 'Jim Olo'
-    description = "The best of the US and international media.  Daily coverage of commentary and analysis of the day's events, as well as arts, entertainment, people and gossip, and political cartoons."  # noqa
-    publisher = 'The Week Publications, Inc.'
-    masthead_url = 'http://test.theweek.com/images/logo_theweek.gif'
-    cover_url = masthead_url
-    category = 'news, politics, USA'
-    oldest_article = 7
-    max_articles_per_feed = 100
-    no_stylesheets = True
+    title = 'The Week'
+    __author__ = 'unkn0wn'
+    description = (
+        'The Week is for readers who want to know what\'s going on in the world, without having to read '
+        'several daily newspapers or get wrapped up in the endless news cycle. For every important story, '
+        'our editors carefully select commentary from all sides of the debate and artfully stitch them together '
+        'into one concise read. By showing you every perspective, we enable you to form your own opinion.'
+    )
+    language = 'en_US'
     encoding = 'utf-8'
-    use_embedded_content = False
-    language = 'en'
-    auto_cleanup = True
-    feeds = [
-        (u'Latest articles', u'http://theweek.com/rss.xml'),
+    no_stylesheets = True
+    remove_javascript = True
+    remove_attributes = ['width', 'height', 'style']
+
+    ignore_duplicate_articles = {'title', 'url'}
+    remove_empty_feeds = True
+    resolve_internal_links = True
+    simultaneous_downloads = 1
+    web_url = ''
+
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        .caption__text--hero, .credit { font-size:small; text-align:center; }
+        .header__strapline, em, i { color:#202020; }
+        .article-type__breadcrumb { color:grey; }
+        .author-byline__author-text {font-size:small; }
+    '''
+
+    def get_cover_url(self):
+        import json
+        url = 'https://usmagazine.theweek.com/timelines.json'
+        data = json.loads(self.index_to_soup(url, raw=True))
+        for x in data['timelines'][:5]:
+            if '-cover-' in x['image']:
+                return 'https://usmagazine.theweek.com' + x['image'][1:]
+
+    articles_are_obfuscated = True
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        soup = self.index_to_soup(url)
+        link = soup.a['href']
+        skip_sections =[ # add sections you want to skip
+            '/video/', '/videos/', '/multimedia/',
+        ]
+        if any(x in link for x in skip_sections):
+            self.abort_article('skipping video links ', link)
+        self.web_url = link
+        html = br.open(link).read()
+        return ({ 'data': html, 'url': link })
+
+    keep_only_tags = [
+        classes('article-type__breadcrumb header__title header__strapline image image--hero author-byline__author-text article__body')
+    ]
+
+    remove_tags = [
+        dict(name='aside'),
+        classes(
+            'blueconic-article__wrapper ad-unit van_vid_carousel tag-links'
+        )
     ]
+
+    def preprocess_html(self, soup):
+        for img in soup.findAll('img', attrs={'data-pin-media':True}):
+            img['src'] = img['data-pin-media'].replace('.jpg', '-768-80.jpg')
+        return soup
+
+    feeds = []
+    when = '168' # hours (7 days)
+    index = 'https://theweek.com/'   
+    sections = [
+        'politics', 'news', 'cartoons', 'tech', 'science', 'health', 
+        'culture-life', 'business', 'travel', 'arts-life', 'history'
+    ]
+    for sec in sections:
+        a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=US&ceid=US:en'
+        feeds.append((sec.capitalize(), a.format(when, quote(index + sec, safe=''))))
+    feeds.append(('Others', a.format(when, quote(index, safe=''), '')))
+
+    def populate_article_metadata(self, article, soup, first):
+        article.title = article.title.replace(' - The Week', '')
+        desc = soup.find(**classes('header__strapline'))
+        if desc:
+            article.summary = self.tag_to_string(desc)
+            article.text_summary = article.summary
+        article.url = self.web_url

From 215513510fc15fa24c87a66fdfa31e8985febab6 Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:08:58 +0530
Subject: [PATCH 62/72] ...

---
 recipes/moneycontrol.recipe           | 13 +++++++------
 recipes/the_week_magazine_free.recipe |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/recipes/moneycontrol.recipe b/recipes/moneycontrol.recipe
index 2563b5cf503f..4fcc5c57605c 100644
--- a/recipes/moneycontrol.recipe
+++ b/recipes/moneycontrol.recipe
@@ -16,6 +16,7 @@ class MoneyControlRecipe(BasicNewsRecipe):
     ignore_duplicate_articles = {'title', 'url'}
     remove_empty_feeds = True
     resolve_internal_links = True
+    oldest_article = 1 # days
 
     extra_css = '''
         img {display:block; margin:0 auto;}
@@ -65,7 +66,7 @@ class MoneyControlRecipe(BasicNewsRecipe):
 
     feeds = []
 
-    when = 27 # hours
+    when = oldest_article*24
     index = 'https://www.moneycontrol.com/'
 
     business_sections = [
@@ -73,12 +74,12 @@ class MoneyControlRecipe(BasicNewsRecipe):
         'personal-finance', 'commodities', 'trade', 'companies'
     ]
 
-    a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}{}&hl=en-IN&gl=IN&ceid=IN:en'
+    a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=IN&ceid=IN:en'
 
     for sec in business_sections:
         allinurl_a = index + 'news/business'
-        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_a, safe=''), '%2F' + sec + '%2F')))
-    feeds.append(('Business' , a.format(when, quote(allinurl_a, safe=''), '')))
+        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_a + sec, safe=''))))
+    feeds.append(('Business' , a.format(when, quote(allinurl_a + sec, safe=''))))
 
     news_sections = [
         'india', 'world', 'opinion', 'politics', 'technology', 'trends', 'lifestyle'
@@ -86,8 +87,8 @@ class MoneyControlRecipe(BasicNewsRecipe):
 
     for sec in news_sections:
         allinurl_b = index + 'news'
-        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_b, safe=''), '%2F' + sec + '%2F')))
-    feeds.append(('News', a.format(when, quote(allinurl_b, safe=''), '')))
+        feeds.append((sec.capitalize(), a.format(when, quote(allinurl_b + sec, safe=''))))
+    feeds.append(('News', a.format(when, quote(allinurl_b + sec, safe=''), '')))
     feeds.append(
         ('Others', 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=IN&ceid=IN:en'.format(when, quote(index, safe='')))
     )
diff --git a/recipes/the_week_magazine_free.recipe b/recipes/the_week_magazine_free.recipe
index c424635e934f..db4a44acaa20 100644
--- a/recipes/the_week_magazine_free.recipe
+++ b/recipes/the_week_magazine_free.recipe
@@ -24,6 +24,7 @@ class TheWeek(BasicNewsRecipe):
     remove_empty_feeds = True
     resolve_internal_links = True
     simultaneous_downloads = 1
+    oldest_article = 7 # days
     web_url = ''
 
     extra_css = '''
@@ -74,7 +75,7 @@ class TheWeek(BasicNewsRecipe):
         return soup
 
     feeds = []
-    when = '168' # hours (7 days)
+    when = oldest_article*24
     index = 'https://theweek.com/'   
     sections = [
         'politics', 'news', 'cartoons', 'tech', 'science', 'health', 

From 745409c1967db16028950d45a32d3992d5700c7c Mon Sep 17 00:00:00 2001
From: unkn0w7n <51942695+unkn0w7n@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:34:03 +0530
Subject: [PATCH 63/72] The Week UK

---
 recipes/icons/the_week_magazine_free.png | Bin 157 -> 286 bytes
 recipes/icons/the_week_uk.png            | Bin 0 -> 286 bytes
 recipes/the_week_uk.recipe               |  95 +++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 recipes/icons/the_week_uk.png
 create mode 100644 recipes/the_week_uk.recipe

diff --git a/recipes/icons/the_week_magazine_free.png b/recipes/icons/the_week_magazine_free.png
index 4fc029a27ff442c2159df3fa8d32eee043a2b876..f8d3c9013f4c04491ea6bd067e00f8c5dfe8c75c 100644
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001KP)t-s|NsB{
z+uYv@6!DRj`1tsel9K%V{GOhknwpy2+}z{i<CT?_*4Ebh;o|e5rGbHg&(F{4>FJ7!
zion3YCMG7Qr>9IzOc@y&U|?WTQBieub@1@;3=9mhv9UcpJzHB_ZEbDE#l_<*G=U{<
zUH||9a7jc#R2Y?wk4X-LFc1Wr;2pEXHamob|34Dsh%ra%)}<b`26zDDb@O)42r0$i
z_yDvWp!C)04P-A+(9xivIuA~w9hu^j^(5wHH98b54ShBsOt<Cw3}1H>_IHlkl*=qq
klGtC7okW#Kswa;E2X|itJ)?-$h5!Hn07*qoM6N<$g0Y@}rT_o{

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^HbAV)2qYM8@tQsaQYoG;jv*Ddk`J(a`+x8OL#!kl
z4<8>Z?;m!Fo}WT;e`+dzFf?1%A8fzRFVA%KLw$o`U5JSNABHrMDTgJV2^^CbF4b^$
zl|S|1al664gOWv`1d9KiR+doMog?x8_HE`|d5QhW3=Geoe>rvNK%+9qUQbs)mvv4F
FO#l(AIFkSX

diff --git a/recipes/icons/the_week_uk.png b/recipes/icons/the_week_uk.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8d3c9013f4c04491ea6bd067e00f8c5dfe8c75c
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001KP)t-s|NsB{
z+uYv@6!DRj`1tsel9K%V{GOhknwpy2+}z{i<CT?_*4Ebh;o|e5rGbHg&(F{4>FJ7!
zion3YCMG7Qr>9IzOc@y&U|?WTQBieub@1@;3=9mhv9UcpJzHB_ZEbDE#l_<*G=U{<
zUH||9a7jc#R2Y?wk4X-LFc1Wr;2pEXHamob|34Dsh%ra%)}<b`26zDDb@O)42r0$i
z_yDvWp!C)04P-A+(9xivIuA~w9hu^j^(5wHH98b54ShBsOt<Cw3}1H>_IHlkl*=qq
klGtC7okW#Kswa;E2X|itJ)?-$h5!Hn07*qoM6N<$g0Y@}rT_o{

literal 0
HcmV?d00001

diff --git a/recipes/the_week_uk.recipe b/recipes/the_week_uk.recipe
new file mode 100644
index 000000000000..b3a0cb58e93c
--- /dev/null
+++ b/recipes/the_week_uk.recipe
@@ -0,0 +1,95 @@
+'''
+www.theweek.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe, classes
+from urllib.parse import quote
+
+
+class TheWeek(BasicNewsRecipe):
+    title = 'The Week'
+    __author__ = 'unkn0wn'
+    description = (
+        'The Week is for readers who want to know what\'s going on in the world, without having to read '
+        'several daily newspapers or get wrapped up in the endless news cycle. For every important story, '
+        'our editors carefully select commentary from all sides of the debate and artfully stitch them together '
+        'into one concise read. By showing you every perspective, we enable you to form your own opinion.'
+    )
+    language = 'en_UK'
+    encoding = 'utf-8'
+    no_stylesheets = True
+    remove_javascript = True
+    remove_attributes = ['width', 'height', 'style']
+
+    ignore_duplicate_articles = {'title', 'url'}
+    remove_empty_feeds = True
+    resolve_internal_links = True
+    simultaneous_downloads = 1
+    oldest_article = 7 # days
+    web_url = ''
+
+    extra_css = '''
+        img {display:block; margin:0 auto;}
+        .caption__text--hero, .credit { font-size:small; text-align:center; }
+        .header__strapline, em, i { color:#202020; }
+        .article-type__breadcrumb { color:grey; }
+        .author-byline__author-text {font-size:small; }
+    '''
+
+    def get_cover_url(self):
+        import json
+        url = 'https://ukmagazine.theweek.com/timelines.json'
+        data = json.loads(self.index_to_soup(url, raw=True))
+        for x in data['timelines'][:5]:
+            if '-cover-' in x['image']:
+                return 'https://ukmagazine.theweek.com' + x['image'][1:]
+
+    articles_are_obfuscated = True
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        soup = self.index_to_soup(url)
+        link = soup.a['href']
+        skip_sections =[ # add sections you want to skip
+            '/video/', '/videos/', '/multimedia/',
+        ]
+        if any(x in link for x in skip_sections):
+            self.abort_article('skipping video links ', link)
+        self.web_url = link
+        html = br.open(link).read()
+        return ({ 'data': html, 'url': link })
+
+    keep_only_tags = [
+        classes('article-type__breadcrumb header__title header__strapline image image--hero author-byline__author-text article__body')
+    ]
+
+    remove_tags = [
+        dict(name='aside'),
+        classes(
+            'blueconic-article__wrapper ad-unit van_vid_carousel tag-links'
+        )
+    ]
+
+    def preprocess_html(self, soup):
+        for img in soup.findAll('img', attrs={'data-pin-media':True}):
+            img['src'] = img['data-pin-media'].replace('.jpg', '-768-80.jpg')
+        return soup
+
+    feeds = []
+    when = oldest_article*24
+    index = 'https://theweek.com/'   
+    sections = [
+        'politics', 'news', 'cartoons', 'tech', 'science', 'health', 
+        'culture-life', 'business', 'travel', 'arts-life', 'history'
+    ]
+    for sec in sections:
+        a = 'https://news.google.com/rss/search?q=when:{}h+allinurl:{}&hl=en-IN&gl=US&ceid=US:en'
+        feeds.append((sec.capitalize(), a.format(when, quote(index + sec, safe=''))))
+    feeds.append(('Others', a.format(when, quote(index, safe=''), '')))
+
+    def populate_article_metadata(self, article, soup, first):
+        article.title = article.title.replace(' - The Week', '')
+        desc = soup.find(**classes('header__strapline'))
+        if desc:
+            article.summary = self.tag_to_string(desc)
+            article.text_summary = article.summary
+        article.url = self.web_url

From 8489f711a958117c5626131ad4c5c4e4345e6820 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Feb 2024 12:22:47 +0530
Subject: [PATCH 64/72] Implement import/export for UI color palettes

---
 src/calibre/gui2/dialogs/palette.py | 56 +++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/dialogs/palette.py b/src/calibre/gui2/dialogs/palette.py
index fce57d8ebead..4928e19f2973 100644
--- a/src/calibre/gui2/dialogs/palette.py
+++ b/src/calibre/gui2/dialogs/palette.py
@@ -2,6 +2,7 @@
 # License: GPLv3 Copyright: 2024, Kovid Goyal <kovid at kovidgoyal.net>
 
 
+import json
 import textwrap
 from contextlib import suppress
 from qt.core import (
@@ -9,7 +10,7 @@
     QScrollArea, QSize, QSizePolicy, QTabWidget, QVBoxLayout, QWidget, pyqtSignal,
 )
 
-from calibre.gui2 import Application, gprefs
+from calibre.gui2 import Application, choose_files, choose_save_file, gprefs
 from calibre.gui2.palette import (
     default_dark_palette, default_light_palette, palette_colors, palette_from_dict,
 )
@@ -54,6 +55,13 @@ def value(self):
         if ans != self.default_palette.color(*self.color_key):
             return ans
 
+    @value.setter
+    def value(self, val):
+        if val is None:
+            self.restore_defaults()
+        else:
+            self.button.color = val
+
 
 class PaletteColors(QWidget):
 
@@ -117,6 +125,11 @@ def value(self):
                 ans[w.setting_key] = w.value
         return ans
 
+    @value.setter
+    def value(self, serialized):
+        for w in self.colors:
+            w.value = serialized.get(w.setting_key)
+
     def restore_defaults(self):
         for w in self.colors:
             w.restore_defaults()
@@ -156,8 +169,9 @@ def __init__(self, mode_name='light', parent=None):
 
     def import_system_colors(self):
         import subprocess
-        from calibre.startup import get_debug_executable
+
         from calibre.gui2.palette import unserialize_palette
+        from calibre.startup import get_debug_executable
         raw = subprocess.check_output(get_debug_executable() + [
             '--command', 'from qt.core import QApplication; from calibre.gui2.palette import *; app = QApplication([]);'
             'import sys; sys.stdout.buffer.write(serialize_palette(app.palette()))'])
@@ -173,6 +187,9 @@ def use_custom_toggled(self):
         for w in (self.palette_colors, self.import_system_button):
             w.setEnabled(enabled)
 
+    def serialized_colors(self):
+        return self.palette_colors.value
+
     def apply_settings(self):
         val = self.palette_colors.value
         v = gprefs[f'{self.mode_name}_palettes']
@@ -184,6 +201,13 @@ def restore_defaults(self):
         self.use_custom.setChecked(False)
         self.palette_colors.restore_defaults()
 
+    def serialize(self):
+        return {'use_custom': self.use_custom.isChecked(), 'palette': self.palette_colors.value}
+
+    def unserialize(self, val):
+        self.use_custom.setChecked(bool(val['use_custom']))
+        self.palette_colors.value = val['palette']
+
 
 class PaletteConfig(Dialog):
 
@@ -224,9 +248,35 @@ def setup_ui(self):
         h = QHBoxLayout()
         self.rd = b = QPushButton(QIcon.ic('clear_left.png'), _('Restore &defaults'))
         b.clicked.connect(self.restore_defaults)
-        h.addWidget(b), h.addStretch(10), h.addWidget(self.bb)
+        h.addWidget(b)
+        self.ib = b = QPushButton(QIcon(), _('&Import'))
+        b.clicked.connect(self.import_colors)
+        b.setToolTip(_('Import previously exported color scheme from a file'))
+        h.addWidget(b)
+        self.ib = b = QPushButton(QIcon(), _('E&xport'))
+        b.clicked.connect(self.export_colors)
+        b.setToolTip(_('Export current colors as a file'))
+        h.addWidget(b)
+        h.addStretch(10), h.addWidget(self.bb)
         l.addLayout(h)
 
+    def import_colors(self):
+        files = choose_files(self, 'import-calibre-palette', _('Choose file to import from'),
+                         filters=[(_('calibre Palette'), ['calibre-palette'])], all_files=False, select_only_single_file=True)
+        if files:
+            with open(files[0], 'rb') as f:
+                data = json.loads(f.read())
+            self.dark_tab.unserialize(data['dark'])
+            self.light_tab.unserialize(data['light'])
+
+    def export_colors(self):
+        data = {'dark': self.dark_tab.serialize(), 'light': self.light_tab.serialize()}
+        dest = choose_save_file(self, 'export-calibre-palette', _('Choose file to export to'),
+                         filters=[(_('calibre Palette'), ['calibre-palette'])], all_files=False, initial_filename='mycolors.calibre-palette')
+        if dest:
+            with open(dest, 'wb') as f:
+                f.write(json.dumps(data, indent=2, sort_keys=True).encode('utf-8'))
+
     def apply_settings(self):
         with gprefs:
             gprefs['color_palette'] = str(self.palette.currentData())

From e1238ea3ee96028081e141f1ae1650464cb478b7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Feb 2024 12:24:08 +0530
Subject: [PATCH 65/72] Default light tooltip color should be yellow

It's traditional
---
 src/calibre/gui2/palette.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/palette.py b/src/calibre/gui2/palette.py
index 3227f7fc5a6c..6f17830d329b 100644
--- a/src/calibre/gui2/palette.py
+++ b/src/calibre/gui2/palette.py
@@ -99,7 +99,7 @@ def default_light_palette():
     p.setColor(QPalette.ColorRole.PlaceholderText, disabled_color)
     p.setColor(QPalette.ColorRole.Base, Qt.GlobalColor.white)
     p.setColor(QPalette.ColorRole.AlternateBase, QColor(245, 245, 245))
-    p.setColor(QPalette.ColorRole.ToolTipBase, light_color)
+    p.setColor(QPalette.ColorRole.ToolTipBase, QColor(0xff, 0xff, 0xdc))
     p.setColor(QPalette.ColorRole.ToolTipText, light_text_color)
     p.setColor(QPalette.ColorRole.Text, light_text_color)
     p.setColor(QPalette.ColorRole.Button, light_color)

From 275cfd48750fe9f47047f157f0ba886968d8cb14 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 28 Feb 2024 16:57:57 +0530
Subject: [PATCH 66/72] Cover grid: Fix dragging the mouse while holding shift
 to extend the selection not working well. Fixes #2054617 [Multiple book
 selection in cover grid using mouse and shift
 key](https://bugs.launchpad.net/calibre/+bug/2054617)

---
 src/calibre/gui2/library/alternate_views.py | 83 ++++++++++++++++-----
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 49eaf8fbc9d9..cd9988cfb8a9 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -210,15 +210,18 @@ def url_for_id(i):
 
 
 def mouseMoveEvent(self, event):
+    if self.event_has_mods():
+        self.drag_start_pos = None
     if not self.drag_allowed:
+        if hasattr(self, 'handle_mouse_move_event'):
+            self.handle_mouse_move_event(event)
         return
     if self.drag_start_pos is None:
-        return qt_item_view_base_class(self).mouseMoveEvent(self, event)
-
-    if self.event_has_mods():
-        self.drag_start_pos = None
+        if hasattr(self, 'handle_mouse_move_event'):
+            self.handle_mouse_move_event(event)
+        else:
+            qt_item_view_base_class(self).mouseMoveEvent(self, event)
         return
-
     if not (event.buttons() & Qt.MouseButton.LeftButton) or \
             (event.pos() - self.drag_start_pos).manhattanLength() \
                     < QApplication.startDragDistance():
@@ -727,6 +730,7 @@ class GridView(QListView):
 
     def __init__(self, parent):
         QListView.__init__(self, parent)
+        self.shift_click_start_data = None
         self.dbref = lambda: None
         self._ncols = None
         self.gesture_manager = GestureManager(self)
@@ -1160,21 +1164,54 @@ def restore_vpos(self, vpos):
     def restore_hpos(self, hpos):
         pass
 
+    def handle_mouse_move_event(self, ev):
+        # handle shift drag to extend selections
+        if not QApplication.keyboardModifiers() & Qt.KeyboardModifier.ShiftModifier:
+            return super().mouseMoveEvent(ev)
+        index = self.indexAt(ev.pos())
+        if not index.isValid() or not self.shift_click_start_data:
+            return
+        m = self.model()
+        ci = m.index(self.shift_click_start_data[0], 0)
+        if not ci.isValid():
+            return
+        sm = self.selectionModel()
+        sm.setCurrentIndex(index, QItemSelectionModel.SelectionFlag.NoUpdate)
+        if not sm.hasSelection():
+            sm.select(index, QItemSelectionModel.SelectionFlag.ClearAndSelect)
+            return True
+        cr = ci.row()
+        tgt = index.row()
+        if cr == tgt:
+            sm.select(index, QItemSelectionModel.SelectionFlag.Select)
+            return
+        if cr < tgt:
+            # mouse is moved after the start pos
+            top = min(self.shift_click_start_data[1], cr)
+            bottom = tgt
+        else:
+            top = tgt
+            bottom = max(self.shift_click_start_data[2], cr)
+        sm.select(QItemSelection(m.index(top, 0), m.index(bottom, 0)), QItemSelectionModel.SelectionFlag.ClearAndSelect)
+
     def handle_mouse_press_event(self, ev):
-        if QApplication.keyboardModifiers() & Qt.KeyboardModifier.ShiftModifier:
-            # Shift-Click in QListView is broken. It selects extra items in
-            # various circumstances, for example, click on some item in the
-            # middle of a row then click on an item in the next row, all items
-            # in the first row will be selected instead of only items after the
-            # middle item.
-            index = self.indexAt(ev.pos())
-            if not index.isValid():
-                return
-            ci = self.currentIndex()
-            sm = self.selectionModel()
-            sm.setCurrentIndex(index, QItemSelectionModel.SelectionFlag.NoUpdate)
+        # Shift-Click in QListView is broken. It selects extra items in
+        # various circumstances, for example, click on some item in the
+        # middle of a row then click on an item in the next row, all items
+        # in the first row will be selected instead of only items after the
+        # middle item.
+        if not QApplication.keyboardModifiers() & Qt.KeyboardModifier.ShiftModifier:
+            return super().mousePressEvent(ev)
+        self.shift_click_start_data = None
+        index = self.indexAt(ev.pos())
+        if not index.isValid():
+            return
+        sm = self.selectionModel()
+        ci = self.currentIndex()
+        try:
             if not ci.isValid():
                 return
+            sm.setCurrentIndex(index, QItemSelectionModel.SelectionFlag.NoUpdate)
             if not sm.hasSelection():
                 sm.select(index, QItemSelectionModel.SelectionFlag.ClearAndSelect)
                 return
@@ -1183,8 +1220,16 @@ def handle_mouse_press_event(self, ev):
             top = self.model().index(min(cr, tgt), 0)
             bottom = self.model().index(max(cr, tgt), 0)
             sm.select(QItemSelection(top, bottom), QItemSelectionModel.SelectionFlag.Select)
-        else:
-            return QListView.mousePressEvent(self, ev)
+        finally:
+            min_row = self.model().rowCount(QModelIndex())
+            max_row = -1
+            for idx in sm.selectedIndexes():
+                r = idx.row()
+                if r < min_row:
+                    min_row = r
+                elif r > max_row:
+                    max_row = r
+            self.shift_click_start_data = index.row(), min_row, max_row
 
     def indices_for_merge(self, resolved=True):
         return self.selectionModel().selectedIndexes()

From 83a6ab947f981f55f5556459ad568ffdb698e57e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Feb 2024 13:11:38 +0530
Subject: [PATCH 67/72] Edit book: Add a shortcut Ctrl+M to merge selected
 files. Fixes #2053144 [ebook-edit: Keyboard shortcut for merging
 files](https://bugs.launchpad.net/calibre/+bug/2053144)

---
 src/calibre/gui2/tweak_book/boss.py      |  3 +++
 src/calibre/gui2/tweak_book/file_list.py | 19 +++++++++++++++++++
 src/calibre/gui2/tweak_book/ui.py        |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/src/calibre/gui2/tweak_book/boss.py b/src/calibre/gui2/tweak_book/boss.py
index 5845643725cf..690d5bef5ae6 100644
--- a/src/calibre/gui2/tweak_book/boss.py
+++ b/src/calibre/gui2/tweak_book/boss.py
@@ -1911,6 +1911,9 @@ def manage_snippets(self):
         from calibre.gui2.tweak_book.editor.snippets import UserSnippets
         UserSnippets(self.gui).exec()
 
+    def merge_files(self):
+        self.gui.file_list.merge_files()
+
     # Shutdown {{{
 
     def quit(self):
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index 15c696e54bf9..78f6e187eca7 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -766,6 +766,22 @@ def index_of_name(self, name):
                     return (category, i)
         return (None, -1)
 
+    def merge_files(self):
+        sel = self.selectedItems()
+        selected_map = defaultdict(list)
+        for item in sel:
+            selected_map[str(item.data(0, CATEGORY_ROLE) or '')].append(str(item.data(0, NAME_ROLE) or ''))
+
+        for items in selected_map.values():
+            items.sort(key=self.index_of_name)
+        if len(selected_map['text']) > 1:
+            self.start_merge('text', selected_map['text'])
+        elif len(selected_map['styles']) > 1:
+            self.start_merge('styles', selected_map['styles'])
+        else:
+            error_dialog(self, _('Cannot merge'), _(
+                'No files selected. Select two or more HTML files or two or more CSS files in the Files browser before trying to merge'), show=True)
+
     def start_merge(self, category, names):
         d = MergeDialog(names, self)
         if d.exec() == QDialog.DialogCode.Accepted and d.ans:
@@ -1264,6 +1280,9 @@ def build(self, container, preserve_state=True):
     def restore_temp_names(self):
         self.file_list.restore_temp_names()
 
+    def merge_files(self):
+        self.file_list.merge_files()
+
     @property
     def searchable_names(self):
         return self.file_list.searchable_names
diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py
index f0539ea57899..22be04cb16e9 100644
--- a/src/calibre/gui2/tweak_book/ui.py
+++ b/src/calibre/gui2/tweak_book/ui.py
@@ -559,6 +559,9 @@ def sreg(name, text, action, overrides={}, keys=(), description=None, icon=None)
         self.action_manage_snippets = treg(
             'snippets.png', _('Manage &Snippets'), self.boss.manage_snippets, 'manage-snippets', (), _(
                 'Manage user created Snippets'))
+        self.action_merge_files = treg(
+            'merge.png', _('&Merge files'), self.boss.merge_files, 'merge-files', 'Ctrl+M', _(
+                'Merge two or more selected files'))
 
         self.plugin_menu_actions = []
 

From 2e4b88059c7e2541cab4d0868556a26c8a2796d4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Feb 2024 13:29:50 +0530
Subject: [PATCH 68/72] ...

---
 src/pyj/select.pyj | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/pyj/select.pyj b/src/pyj/select.pyj
index f4dac0ec7b3f..6840e995fe4e 100644
--- a/src/pyj/select.pyj
+++ b/src/pyj/select.pyj
@@ -214,26 +214,27 @@ def move_end_of_selection(pos, start):
     if not sel.rangeCount:
         return
     p = caret_position_from_point(pos.x, pos.y)
-    if p:
-        r = sel.getRangeAt(0)
-        if start is None:
-            q = document.createRange()
-            q.setStart(p.offsetNode, p.offset)
-            q.setEnd(p.offsetNode, p.offset)
-            if r.compareBoundaryPoints(window.Range.START_TO_START, q) >= 0:
-                start = True
-            elif r.compareBoundaryPoints(window.Range.END_TO_END, q) <= 0:
-                start = False
-            else:
-                # point is inside the selection
-                start = False
-        if start:
-            if r.startContainer is not p.offsetNode or r.startOffset is not p.offset:
-                r.setStart(p.offsetNode, p.offset)
-                sel.removeAllRanges()
-                sel.addRange(r)
+    if not p:
+        return
+    r = sel.getRangeAt(0)
+    if start is None:
+        q = document.createRange()
+        q.setStart(p.offsetNode, p.offset)
+        q.setEnd(p.offsetNode, p.offset)
+        if r.compareBoundaryPoints(window.Range.START_TO_START, q) >= 0:
+            start = True
+        elif r.compareBoundaryPoints(window.Range.END_TO_END, q) <= 0:
+            start = False
         else:
-            if r.endContainer is not p.offsetNode or r.endOffset is not p.offset:
-                r.setEnd(p.offsetNode, p.offset)
-                sel.removeAllRanges()
-                sel.addRange(r)
+            # point is inside the selection
+            start = False
+    if start:
+        if r.startContainer is not p.offsetNode or r.startOffset is not p.offset:
+            r.setStart(p.offsetNode, p.offset)
+            sel.removeAllRanges()
+            sel.addRange(r)
+    else:
+        if r.endContainer is not p.offsetNode or r.endOffset is not p.offset:
+            r.setEnd(p.offsetNode, p.offset)
+            sel.removeAllRanges()
+            sel.addRange(r)

From b10eebf7a014556fbee7d7df0d8589536d0090c1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Feb 2024 13:59:17 +0530
Subject: [PATCH 69/72] Workaround chromium causing selection start to also
 change when end is changed in some circumstances

Fixes #2054934 [Extra text copied when selecting across pages](https://bugs.launchpad.net/calibre/+bug/2054934)
---
 src/pyj/select.pyj | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pyj/select.pyj b/src/pyj/select.pyj
index 6840e995fe4e..9b887f556dbd 100644
--- a/src/pyj/select.pyj
+++ b/src/pyj/select.pyj
@@ -228,13 +228,15 @@ def move_end_of_selection(pos, start):
         else:
             # point is inside the selection
             start = False
+    new_range = document.createRange()
     if start:
-        if r.startContainer is not p.offsetNode or r.startOffset is not p.offset:
-            r.setStart(p.offsetNode, p.offset)
-            sel.removeAllRanges()
-            sel.addRange(r)
+        new_range.setStart(p.offsetNode, p.offset)
+        new_range.setEnd(r.endContainer, r.endOffset)
+        other_boundary_changed = r.endContainer is not new_range.endContainer or r.endOffset is not new_range.endOffset
     else:
-        if r.endContainer is not p.offsetNode or r.endOffset is not p.offset:
-            r.setEnd(p.offsetNode, p.offset)
-            sel.removeAllRanges()
-            sel.addRange(r)
+        new_range.setStart(r.startContainer, r.startOffset)
+        new_range.setEnd(p.offsetNode, p.offset)
+        other_boundary_changed = r.startContainer is not new_range.startContainer or r.startOffset is not new_range.startOffset
+    if not new_range.collapsed or not other_boundary_changed:
+        sel.removeAllRanges()
+        sel.addRange(new_range)

From 544d34fa4289b1c90218f71c84ed3cbc82cf4293 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Feb 2024 14:02:19 +0530
Subject: [PATCH 70/72] ...

---
 src/pyj/select.pyj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pyj/select.pyj b/src/pyj/select.pyj
index 9b887f556dbd..55278ffc5492 100644
--- a/src/pyj/select.pyj
+++ b/src/pyj/select.pyj
@@ -238,5 +238,7 @@ def move_end_of_selection(pos, start):
         new_range.setEnd(p.offsetNode, p.offset)
         other_boundary_changed = r.startContainer is not new_range.startContainer or r.startOffset is not new_range.startOffset
     if not new_range.collapsed or not other_boundary_changed:
+        # we ignore the case when the new range is collapsed and the other end
+        # of the selection is also moved as this is a chromium bug. See https://bugs.launchpad.net/bugs/2054934
         sel.removeAllRanges()
         sel.addRange(new_range)

From 49e06d0cdabb47b91940fcfe200ee58fc164352e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Feb 2024 14:04:03 +0530
Subject: [PATCH 71/72] ...

---
 src/pyj/select.pyj | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pyj/select.pyj b/src/pyj/select.pyj
index 55278ffc5492..7ed3d9275a24 100644
--- a/src/pyj/select.pyj
+++ b/src/pyj/select.pyj
@@ -237,8 +237,9 @@ def move_end_of_selection(pos, start):
         new_range.setStart(r.startContainer, r.startOffset)
         new_range.setEnd(p.offsetNode, p.offset)
         other_boundary_changed = r.startContainer is not new_range.startContainer or r.startOffset is not new_range.startOffset
-    if not new_range.collapsed or not other_boundary_changed:
+    if new_range.collapsed and other_boundary_changed:
         # we ignore the case when the new range is collapsed and the other end
         # of the selection is also moved as this is a chromium bug. See https://bugs.launchpad.net/bugs/2054934
-        sel.removeAllRanges()
-        sel.addRange(new_range)
+        return
+    sel.removeAllRanges()
+    sel.addRange(new_range)

From f2be7dffef15986d08d068f0e469da66a612c26f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 1 Mar 2024 08:15:53 +0530
Subject: [PATCH 72/72] version 7.6.0

---
 Changelog.txt            | 42 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 9e6d49eba1dd..a91bdecbff42 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,6 +23,48 @@
 # - title by author
 # }}}
 
+{{{ 7.6.0 2024-03-01
+
+:: new features
+
+- [major 1979022] E-book viewer: Allow saving current settings in "profiles" that can be quickly and easily swapped between
+
+  To create a profile or switch to a previously saved profile access "Profiles" from the viewer controls or press the `Alt+P` shortcut.
+
+- [2053144] Edit book: Add a shortcut `Ctrl+M` to merge selected files
+
+- Get books: Add support for Amazon Mexico
+
+- A new toolbar button to show all available actions in sub menus. Can be added via `Preferences->Toolbars & menus`
+
+- Edit book: Allow selecting multiple books to edit at once, opening all selected books in separate editor instances
+
+:: bug fixes
+
+- [2054617] Cover grid: Fix dragging the mouse while holding shift to extend the selection not working well
+
+- [2054934] E-book viewer: Fix doing a multi-page selections sometimes causing the start of the selection to move backwards
+
+- Edit book: Live CSS: Fix regression causing incorrect colors in calibre 7
+
+- Windows: Fix a regression in calibre 7 that caused images in long text columns to not be displayed in the tooltip for the tooltip
+
+- Fix disabled items in menus having blurry text
+
+- Content server: Fix a regression in the previous release that caused an error when doing a search/sort on some browsers
+
+:: improved recipes
+- New Yorker
+- Moneycontrol
+- Swarajya Mag
+- nautil.us
+- Pro Physik
+
+:: new recipes
+- The Week UK by unkn0wn
+- Andhrajyothy by unkn0wn
+}}}
+
 {{{ 7.5.1 2024-02-09
 
 :: new features
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 27785b339da5..115ddacfa1bd 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -5,7 +5,7 @@
 import sys, locale, codecs, os, collections, collections.abc
 
 __appname__   = 'calibre'
-numeric_version = (7, 5, 1)
+numeric_version = (7, 6, 0)
 __version__   = '.'.join(map(str, numeric_version))
 git_version   = None
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"