From 744b480b1b4596c63b9e780574314c87486a89fb Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@noreply.com>
Date: Sun, 8 Oct 2023 10:39:35 +0800
Subject: [PATCH 01/13] opt: in  the darkmode , set image background to white
 in case the backgroud is transparent

---
 src/article_maker.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/article_maker.cc b/src/article_maker.cc
index 6684a767d..d7ffd7136 100644
--- a/src/article_maker.cc
+++ b/src/article_maker.cc
@@ -156,7 +156,7 @@ body { background: #242525; }
 .gdarticle { background: initial;}
 
 .gdarticlebody img{
-  background: white;
+  background: white !important;
 }
 </style>
 <script>

From efb3ee2bc923a9c6918e025e8f6c05b55456b042 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@noreply.com>
Date: Sun, 8 Oct 2023 13:40:40 +0800
Subject: [PATCH 02/13] [Win]: drop support of 5.15.2 on Windows Platform

---
 .github/workflows/windows.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 83e7d3c62..89e19d7ad 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,21 +3,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
-  # workflow_run:
-  #   workflows: [AutoTag]
-  #   types: [completed]
   workflow_dispatch:
-  push:
-    branches:
-      - dev
-      - master
-      # - staged
-    paths-ignore:
-      - 'docs/**'
-      # - ".github/**"
-      - "howto/**"
-      - "*.md"
-      - ".clang-format"      
+  # push:
+  #   branches:
+  #     - dev
+  #     - master
+  #   paths-ignore:
+  #     - 'docs/**'
+  #     - "howto/**"
+  #     - "*.md"
+  #     - ".clang-format"      
 
 jobs:
   build:

From 810c4b32a272e1091a833814bd75d7f367ecfb52 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@noreply.com>
Date: Sun, 8 Oct 2023 16:14:51 +0800
Subject: [PATCH 03/13] fix: save article , process qrc protocol link

---
 src/ui/mainwindow.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index a5f0be9d4..d950927aa 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -3290,8 +3290,8 @@ void MainWindow::on_saveArticle_triggered()
 
       if ( complete ) {
         QString folder = fi.absoluteDir().absolutePath() + "/" + fi.baseName() + "_files";
-        QRegExp rx1( "\"((?:bres|gico|gdau|qrcx|gdvideo)://[^\"]+)\"" );
-        QRegExp rx2( "'((?:bres|gico|gdau|qrcx|gdvideo)://[^']+)'" );
+        QRegExp rx1( "\"((?:bres|gico|gdau|qrcx|qrc|gdvideo)://[^\"]+)\"" );
+        QRegExp rx2( "'((?:bres|gico|gdau|qrcx|qrc|gdvideo)://[^']+)'" );
         set< QByteArray > resourceIncluded;
         vector< pair< QUrl, QString > > downloadResources;
 

From 3ab2d10e167f965df428e6727b96779ff13a3f49 Mon Sep 17 00:00:00 2001
From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com>
Date: Sun, 8 Oct 2023 21:50:17 +0800
Subject: [PATCH 04/13] =?UTF-8?q?opt:=20remove=20the=20reply=20attribute?=
 =?UTF-8?q?=20settings=20which=20is=20not=20supported=20in=20we=E2=80=A6?=
 =?UTF-8?q?=20(#1200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* opt: remove the reply attribute settings which is not supported in webengine

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 src/article_netmgr.cc | 65 ++++---------------------------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

diff --git a/src/article_netmgr.cc b/src/article_netmgr.cc
index 5be0e1fb4..ef41dfd20 100644
--- a/src/article_netmgr.cc
+++ b/src/article_netmgr.cc
@@ -62,45 +62,7 @@ AllowFrameReply::AllowFrameReply( QNetworkReply * _reply ):
 
 void AllowFrameReply::applyMetaData()
 {
-  // Set raw headers except X-Frame-Options
-  QList< QByteArray > rawHeaders = baseReply->rawHeaderList();
-  for ( QList< QByteArray >::iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
-    auto headerName = it->toLower();
-    if ( headerName != "x-frame-options" && headerName != "content-security-policy" )
-      setRawHeader( *it, baseReply->rawHeader( *it ) );
-  }
-
-  // Set known headers
-  setHeader( QNetworkRequest::ContentDispositionHeader,
-             baseReply->header( QNetworkRequest::ContentDispositionHeader ) );
-  setHeader( QNetworkRequest::ContentTypeHeader, baseReply->header( QNetworkRequest::ContentTypeHeader ) );
-  setHeader( QNetworkRequest::ContentLengthHeader, baseReply->header( QNetworkRequest::ContentLengthHeader ) );
-  setHeader( QNetworkRequest::LocationHeader, baseReply->header( QNetworkRequest::LocationHeader ) );
-  setHeader( QNetworkRequest::LastModifiedHeader, baseReply->header( QNetworkRequest::LastModifiedHeader ) );
-  setHeader( QNetworkRequest::CookieHeader, baseReply->header( QNetworkRequest::CookieHeader ) );
-  setHeader( QNetworkRequest::SetCookieHeader, baseReply->header( QNetworkRequest::SetCookieHeader ) );
-  setHeader( QNetworkRequest::UserAgentHeader, baseReply->header( QNetworkRequest::UserAgentHeader ) );
-  setHeader( QNetworkRequest::ServerHeader, baseReply->header( QNetworkRequest::ServerHeader ) );
-
-  // Set attributes
-  setAttribute( QNetworkRequest::HttpStatusCodeAttribute,
-                baseReply->attribute( QNetworkRequest::HttpStatusCodeAttribute ) );
-  setAttribute( QNetworkRequest::HttpReasonPhraseAttribute,
-                baseReply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ) );
-  setAttribute( QNetworkRequest::RedirectionTargetAttribute,
-                baseReply->attribute( QNetworkRequest::RedirectionTargetAttribute ) );
-  setAttribute( QNetworkRequest::ConnectionEncryptedAttribute,
-                baseReply->attribute( QNetworkRequest::ConnectionEncryptedAttribute ) );
-  setAttribute( QNetworkRequest::SourceIsFromCacheAttribute,
-                baseReply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ) );
-  setAttribute( QNetworkRequest::HttpPipeliningWasUsedAttribute,
-                baseReply->attribute( QNetworkRequest::HttpPipeliningWasUsedAttribute ) );
-  setAttribute( QNetworkRequest::BackgroundRequestAttribute,
-                baseReply->attribute( QNetworkRequest::BackgroundRequestAttribute ) );
-  setAttribute( QNetworkRequest::Http2WasUsedAttribute,
-                baseReply->attribute( QNetworkRequest::Http2WasUsedAttribute ) );
-
-  emit metaDataChanged();
+  // The webengine does not support to customize the headers right now ,maybe until Qt6.7 there should be some api supports
 }
 
 void AllowFrameReply::setReadBufferSize( qint64 size )
@@ -135,29 +97,14 @@ void AllowFrameReply::finishedSlot()
 
 QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest const & req )
 {
-  QUrl url;
-  auto op = GetOperation;
-
   if ( req.url().scheme() == "qrcx" ) {
-    // We had to override the local load policy for the qrc URL scheme until QWebSecurityOrigin::addLocalScheme() was
-    // introduced in Qt 4.6. Hence we used a custom qrcx URL scheme and redirected it here back to qrc. Qt versions
-    // older than 4.6 are no longer supported, so GoldenDict itself no longer uses the qrcx scheme. However, qrcx has
-    // been used for many years in our built-in article styles, and so may appear in user-defined article styles.
-    // TODO: deprecate (print a warning or show a warning message box) and eventually remove support for the obsolete
-    // qrcx URL scheme. A recent commit "Add support for qrc:// URL scheme" is the first one where the qrc scheme
-    // works correctly. So the deprecation has to wait until older GoldenDict versions become rarely used.
-    QUrl newUrl( req.url() );
-
-    newUrl.setScheme( "qrc" );
-    newUrl.setHost( "" );
-
-    QNetworkRequest newReq( req );
-    newReq.setUrl( newUrl );
-
-    return QNetworkAccessManager::createRequest( op, newReq, nullptr );
+    // Do not support qrcx which is the custom define protocol.
+    return new BlockedNetworkReply( this );
   }
 
-  url                 = req.url();
+  auto op = GetOperation;
+
+  QUrl url            = req.url();
   QMimeType mineType  = db.mimeTypeForUrl( url );
   QString contentType = mineType.name();
 

From 4465355502133f00ad83e4865c02e4b24c31b1df Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@foxmail.com>
Date: Sun, 8 Oct 2023 21:40:18 +0800
Subject: [PATCH 05/13] fix: invalid url response with 206 partial content many
 times

[autofix.ci] apply automated fixes
---
 src/article_netmgr.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/article_netmgr.cc b/src/article_netmgr.cc
index ef41dfd20..e34ce8d94 100644
--- a/src/article_netmgr.cc
+++ b/src/article_netmgr.cc
@@ -365,11 +365,12 @@ qint64 ArticleResourceReply::bytesAvailable() const
   if ( avail < 0 )
     return 0;
 
-  if ( !req->isFinished() ) {
-    return 65536;
+  qint64 availBytes = avail - alreadyRead + QNetworkReply::bytesAvailable();
+  if ( availBytes == 0 && !req->isFinished() ) {
+    return 10240;
   }
 
-  return avail - alreadyRead + QNetworkReply::bytesAvailable();
+  return availBytes;
 }
 
 

From 6f9fa8eaa756114034439f293eafe0fdb6a0c463 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@foxmail.com>
Date: Sun, 8 Oct 2023 22:23:17 +0800
Subject: [PATCH 06/13] fix: mdx audio/video html5 tag src value replacement

[autofix.ci] apply automated fixes
---
 src/common/globalregex.cc | 3 ++-
 src/dict/mdx.cc           | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/common/globalregex.cc b/src/common/globalregex.cc
index bb604abf1..08c11d5c9 100644
--- a/src/common/globalregex.cc
+++ b/src/common/globalregex.cc
@@ -24,7 +24,8 @@ QRegularExpression Ftx::token( R"((".*?")|([\w\W\+\-]+))",
                                  | QRegularExpression::CaseInsensitiveOption );
 //mdx
 
-QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source)(?:\s+[^>]+|\s*)>))",
+//<audio src="xxx"> is also a valid url.
+QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source|audio|video)(?:\s+[^>]+|\s*)>))",
                                     QRegularExpression::CaseInsensitiveOption );
 QRegularExpression Mdx::wordCrossLink( R"(([\s"']href\s*=)\s*(["'])entry://([^>#]*?)((?:#[^>]*?)?)\2)",
                                        QRegularExpression::CaseInsensitiveOption );
diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index f2b8d5c24..c245f98c9 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -908,7 +908,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
     QString linkType = allLinksMatch.captured( 1 ).toLower();
     QString newLink;
 
-    if ( !linkType.isEmpty() && linkType.at( 0 ) == 'a' ) {
+    if ( linkType.compare( "a" ) == 0 || linkType.compare( "area" ) == 0 ) {
       newLink = linkTxt;
 
       QRegularExpressionMatch match = RX::Mdx::audioRe.match( newLink );
@@ -956,8 +956,8 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
       else
         newLink = linkTxt.replace( RX::Mdx::stylesRe2, R"(\1"bres://)" + id + R"(/\2")" );
     }
-    else if ( linkType.compare( "script" ) == 0 || linkType.compare( "img" ) == 0
-              || linkType.compare( "source" ) == 0 ) {
+    else {
+      //linkType in ("script","img","source","audio","video")
       // javascripts and images
       QRegularExpressionMatch match = RX::Mdx::inlineScriptRe.match( linkTxt );
       if ( linkType.at( 1 ) == 'c' // "script" tag
@@ -972,6 +972,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
         continue;
       }
       else {
+        //audio ,video ,html5 tags fall here.
         match = RX::Mdx::srcRe.match( linkTxt );
         if ( match.hasMatch() ) {
           QString newText;
@@ -992,6 +993,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
           newLink = linkTxt.replace( RX::Mdx::srcRe2, R"(\1"bres://)" + id + R"(/\2")" );
       }
     }
+
     if ( !newLink.isEmpty() ) {
       articleNewText += newLink;
     }

From 7ec51d9453585bbf1949fe98a649f2128c242a50 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@foxmail.com>
Date: Sun, 8 Oct 2023 23:34:08 +0800
Subject: [PATCH 07/13] fix: use more meaningful tag name

---
 src/dict/mdx.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index c245f98c9..8554db650 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -960,7 +960,8 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
       //linkType in ("script","img","source","audio","video")
       // javascripts and images
       QRegularExpressionMatch match = RX::Mdx::inlineScriptRe.match( linkTxt );
-      if ( linkType.at( 1 ) == 'c' // "script" tag
+      // "script" tag
+      if ( linkType.compare( "script" ) == 0
            && match.hasMatch() && match.capturedLength() == linkTxt.length() ) {
         // skip inline scripts
         articleNewText += linkTxt;

From e3f6a2849c3e95702f2ae8804ae0b8800b50f34c Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sun, 8 Oct 2023 15:36:55 +0000
Subject: [PATCH 08/13] [autofix.ci] apply automated fixes

---
 src/dict/mdx.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index 8554db650..de8c35080 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -961,8 +961,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
       // javascripts and images
       QRegularExpressionMatch match = RX::Mdx::inlineScriptRe.match( linkTxt );
       // "script" tag
-      if ( linkType.compare( "script" ) == 0
-           && match.hasMatch() && match.capturedLength() == linkTxt.length() ) {
+      if ( linkType.compare( "script" ) == 0 && match.hasMatch() && match.capturedLength() == linkTxt.length() ) {
         // skip inline scripts
         articleNewText += linkTxt;
         match = RX::Mdx::closeScriptTagRe.match( article, linkPos );

From 64529805ff40d0495fbb43b65df7778d12892221 Mon Sep 17 00:00:00 2001
From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:06:38 +0800
Subject: [PATCH 09/13] fix: dsl max width image (#1217)

* fix: dsl max width image

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 src/article_maker.cc |  5 ++--
 src/dict/dsl.cc      | 59 ++++----------------------------------------
 src/ui/mainwindow.cc |  9 ++++---
 3 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/src/article_maker.cc b/src/article_maker.cc
index d7ffd7136..ed360b7ef 100644
--- a/src/article_maker.cc
+++ b/src/article_maker.cc
@@ -444,9 +444,8 @@ string ArticleMaker::makeEmptyPageHtml() const
 
 sptr< Dictionary::DataRequest > ArticleMaker::makePicturePage( string const & url ) const
 {
-  string const result = makeHtmlHeader( tr( "(picture)" ), QString(), true )
-    + R"lit(<a href="javascript: if(history.length>2) history.go(-1)">)lit" + R"(<img src=")" + url + R"(" /></a>)"
-    + "</body></html>";
+  string const result =
+    makeHtmlHeader( tr( "(picture)" ), QString(), true ) + R"(<img src=")" + url + R"(" />)" + "</body></html>";
 
   sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 
diff --git a/src/dict/dsl.cc b/src/dict/dsl.cc
index 6a214d737..dba31523d 100644
--- a/src/dict/dsl.cc
+++ b/src/dict/dsl.cc
@@ -840,61 +840,12 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       url.setHost( QString::fromUtf8( getId().c_str() ) );
       url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
 
-      vector< char > imgdata;
-      bool resize = false;
+      string maxWidthStyle = " style=\"max-width:100%;\" ";
 
-      try {
-        File::loadFromFile( n, imgdata );
-      }
-      catch ( File::exCantOpen & ) {
-        try {
-          n = resourceDir2 + filename;
-          File::loadFromFile( n, imgdata );
-        }
-        catch ( File::exCantOpen & ) {
-          try {
-            n = getContainingFolder().toStdString() + Utils::Fs::separator() + filename;
-            File::loadFromFile( n, imgdata );
-          }
-          catch ( File::exCantOpen & ) {
-            // Try reading from zip file
-            if ( resourceZip.isOpen() ) {
-              QMutexLocker _( &resourceZipMutex );
-              resourceZip.loadFile( Utf8::decode( filename ), imgdata );
-            }
-          }
-        }
-      }
-      catch ( ... ) {
-      }
-
-      if ( !imgdata.empty() ) {
-        if ( Filetype::isNameOfSvg( filename ) ) {
-          // We don't need to render svg file now
-
-          QSvgRenderer svg;
-          svg.load( QByteArray::fromRawData( imgdata.data(), imgdata.size() ) );
-          if ( svg.isValid() ) {
-            QSize imgsize = svg.defaultSize();
-            resize        = maxPictureWidth > 0 && imgsize.width() > maxPictureWidth;
-          }
-        }
-        else {
-          QImage img = QImage::fromData( (unsigned char *)&imgdata.front(), imgdata.size() );
-
-          resize = maxPictureWidth > 0 && img.width() > maxPictureWidth;
-        }
-      }
-
-      if ( resize ) {
-        string link( url.toEncoded().data() );
-        link.replace( 0, 4, "gdpicture" );
-        result += string( "<a href=\"" ) + link + "\">" + "<img src=\"" + url.toEncoded().data() + "\" alt=\""
-          + Html::escape( filename ) + "\"" + "width=\"" + QString::number( maxPictureWidth ).toStdString() + "\"/>"
-          + "</a>";
-      }
-      else
-        result += string( "<img src=\"" ) + url.toEncoded().data() + "\" alt=\"" + Html::escape( filename ) + "\"/>";
+      string link( url.toEncoded().data() );
+      link.replace( 0, 4, "gdpicture" );
+      result += string( "<a href=\"" ) + link + "\">" + "<img src=\"" + url.toEncoded().data() + "\" " + maxWidthStyle
+        + " alt=\"" + Html::escape( filename ) + "\"/>" + "</a>";
     }
     else if ( Filetype::isNameOfVideo( filename ) ) {
       QUrl url;
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index d950927aa..8c5c73379 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -182,14 +182,15 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   GlobalBroadcaster::instance()->setPreference( &cfg.preferences );
 
   localSchemeHandler = new LocalSchemeHandler( articleNetMgr, this );
-  QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "gdlookup", localSchemeHandler );
-  QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "bword", localSchemeHandler );
-  QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "entry", localSchemeHandler );
+  QStringList htmlScheme = { "gdlookup", "bword", "entry", "gdpicture" };
+  for ( const auto & localScheme : htmlScheme ) {
+    QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localScheme.toLatin1(), localSchemeHandler );
+  }
 
   iframeSchemeHandler = new IframeSchemeHandler( this );
   QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "ifr", iframeSchemeHandler );
 
-  QStringList localSchemes = { "gdau", "gico", "qrcx", "bres", "gdprg", "gdvideo", "gdpicture", "gdtts" };
+  QStringList localSchemes = { "gdau", "gico", "qrcx", "bres", "gdprg", "gdvideo", "gdtts" };
   resourceSchemeHandler    = new ResourceSchemeHandler( articleNetMgr, this );
   for ( const auto & localScheme : localSchemes ) {
     QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localScheme.toLatin1(), resourceSchemeHandler );

From 5e148eaea66e9fab6578bef4bdfb68479279767b Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@noreply.com>
Date: Mon, 9 Oct 2023 18:06:54 +0800
Subject: [PATCH 10/13] fix: fix image path in default article css

[autofix.ci] apply automated fixes
---
 icons/audio.png                              | Bin 0 -> 441 bytes
 icons/document.png                           | Bin 0 -> 567 bytes
 resources.qrc                                |   2 ++
 src/stylesheets/article-style-st-classic.css |   9 ++++-----
 src/stylesheets/article-style.css            |  13 ++++++-------
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 icons/audio.png
 create mode 100644 icons/document.png

diff --git a/icons/audio.png b/icons/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f403ae69f41ca52adf50b5c3dbae396260446fd
GIT binary patch
literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{Xiaj
ziKnkC`!i-?E?&b2O4{~7p@W_-jv*T7YcFo}b}AG(`q6*A`uU3-OzkCJGQYH?iUeYe
zq;Ab+5#RoeLn<d*heI&){7JFH|9Ycl$woifX|pB#uT8nleeUn`4(D$b%?Ugo)Fj=z
zKkZGN*3<==&-C)&&-A*^uu)vLj7PRX`6`cYmPOgxH?eci=j0o6=EXiZ7|EeA^T8zr
zuA0pON7@gcC|jzy;EA+oyyAmX%6?~(^KZ^Jox1hzCWCG7L*Azctlzny;u61mtnn8e
zuIZ+iw*LNK`TXau@Pai~zt^d+uLOEVwZt`|BqgyV)hf9t6-Y4{85kMq8W`&uT80=J
uSQ#2ynOJHY7+4t?)G908LeY?$pOTqYiCY6t-K;dA1_n=8KbLh*2~7ZR-<lTy

literal 0
HcmV?d00001

diff --git a/icons/document.png b/icons/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c2d61658d9261354dc039b0bb7e8939e45c4f84
GIT binary patch
literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000E*
z000E*0oW>A4FCWD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10mMl}
zK~y-6rIR~v6G0GwzZviP!P!1v3M^qk2Q<)7BP1kbi8dAdk@RWOAbtW>8h!#P5L8Hr
z!X1c?1}Tc{pg1`kKX!-0+$lD88b%uJYv!BTnO!k6{zqIf84L#B+U<4*NQ}`!2$&gW
zMvSo>7mEd>(P-T7_wTI$k|fDgwd=jd%n*@M*Tu|AKX>&&RS^-+_x89vIs%}2c*te9
zTiWz`y%lH)h%q7}s48(hCZ3)GQ1_l{yS)-*V-1RXsw$N<MR#@pn8(Ovo+Bcd8CjNX
z1{B>85gG>vxc&XI230`f94gg+GSI64?>!>IWHKSob1p6}m`^9Td5(O3L#I)>9#BL~
zl7v>PMVhA6Y7M3zUi0hSD`r2wTwjCPY=-w9fbr=$t+a`+d72NO(|*vW*1fwOU}iYy
z5D~t9`p)~eAIZ8IFZOns-h8xdZ-86d03igNTP}w`hX9-n&rqpQue&nx`s3Qzg(tg@
zso$t`=l*RPNu9-Ffpd;dr$Y!~dkqRuGfjB*@+qpiqJ_;y!13|%Z!;T<NF{`zW~R%8
zL_{R2YE;!IBJt$pBrp7A({~mT2Q-1k->oT-o7r^T_76mkz&D|<QP%(f002ovPDHLk
FV1hAb@<#vw

literal 0
HcmV?d00001

diff --git a/resources.qrc b/resources.qrc
index 3de960bbc..7c49291da 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,6 +1,8 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/add-anki-icon.svg</file>
+        <file>icons/document.png</file>
+        <file>icons/audio.png</file>
         <file>version.txt</file>
         <file>icons/arrow.png</file>
         <file>icons/prefix.png</file>
diff --git a/src/stylesheets/article-style-st-classic.css b/src/stylesheets/article-style-st-classic.css
index ff1e08abe..1abc45aca 100644
--- a/src/stylesheets/article-style-st-classic.css
+++ b/src/stylesheets/article-style-st-classic.css
@@ -1661,7 +1661,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href$=".wma"],
 .mwiki #bodyContent a.external[href$=".WMA"],
 .mwiki .link-audio {
-  background: url("audio.png") center right no-repeat;
+  background: url("qrc:///icons/audio.png") center right no-repeat;
   padding-right: 1em;
 }
 .mwiki #bodyContent a.external[href$=".ogm"],
@@ -1673,7 +1673,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href$=".mpg"],
 .mwiki #bodyContent a.external[href$=".MPG"],
 .mwiki .link-video {
-  background: url("video.png") center right no-repeat;
+  background: url("qrc:///icons/video.png") center right no-repeat;
   padding-right: 1em;
 }
 .mwiki #bodyContent a.external[href$=".pdf"],
@@ -1683,7 +1683,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href*=".pdf?"],
 .mwiki #bodyContent a.external[href*=".PDF?"],
 .mwiki .link-document {
-  background: url("document.png") center right no-repeat;
+  background: url("qrc:///icons/document.png") center right no-repeat;
   padding-right: 12px;
 }
 
@@ -2980,8 +2980,7 @@ table#sv-hooks,
 /****** Wiktionary-specific excerpts *********/
 
 .mwiki .audiolink a {
-  background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png")
-    center left no-repeat !important;
+  background: url("qrc:///icons/audio.png") center left no-repeat !important;
   padding-left: 20px !important;
   padding-right: 0 !important;
 }
diff --git a/src/stylesheets/article-style.css b/src/stylesheets/article-style.css
index f7852ada7..48de2a516 100644
--- a/src/stylesheets/article-style.css
+++ b/src/stylesheets/article-style.css
@@ -1720,7 +1720,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href$=".wma"],
 .mwiki #bodyContent a.external[href$=".WMA"],
 .mwiki .link-audio {
-  background: url("audio.png") center right no-repeat;
+  background: url("qrc:///icons/audio.png") center right no-repeat;
   padding-right: 1em;
 }
 .mwiki #bodyContent a.external[href$=".ogm"],
@@ -1732,7 +1732,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href$=".mpg"],
 .mwiki #bodyContent a.external[href$=".MPG"],
 .mwiki .link-video {
-  background: url("video.png") center right no-repeat;
+  background: url("qrc:///icons/video.png") center right no-repeat;
   padding-right: 1em;
 }
 .mwiki #bodyContent a.external[href$=".pdf"],
@@ -1742,7 +1742,7 @@ in the bottom-right corner of the content area */
 .mwiki #bodyContent a.external[href*=".pdf?"],
 .mwiki #bodyContent a.external[href*=".PDF?"],
 .mwiki .link-document {
-  background: url("document.png") center right no-repeat;
+  background: url("qrc:///icons/document.png") center right no-repeat;
   padding-right: 12px;
 }
 
@@ -3039,8 +3039,7 @@ table#sv-hooks,
 /****** Wiktionary-specific excerpts *********/
 
 .mwiki .audiolink a {
-  background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png")
-    center left no-repeat !important;
+  background: url("qrc:///icons/audio.png") center left no-repeat !important;
   padding-left: 20px !important;
   padding-right: 0 !important;
 }
@@ -3064,7 +3063,7 @@ table#sv-hooks,
   height: 16px;
   vertical-align: text-bottom;
   background-size: contain;
-  content: url("qrc://localhost/icons/arrow.png");
+  content: url("qrc:///icons/arrow.png");
 }
 
 .gdcollapseicon {
@@ -3073,7 +3072,7 @@ table#sv-hooks,
   height: 16px;
   vertical-align: text-bottom;
   background-size: contain;
-  content: url("qrc://localhost/icons/downarrow.png");
+  content: url("qrc:///icons/downarrow.png");
 }
 
 /********** Slob dictionaries ***********/

From 526621a9c91decd710f4f1d96fc877acf788e15b Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@noreply.com>
Date: Mon, 9 Oct 2023 18:14:09 +0800
Subject: [PATCH 11/13] opt: remove invalid css style in the style file

[autofix.ci] apply automated fixes
---
 src/stylesheets/article-style-st-classic.css | 52 +----------------
 src/stylesheets/article-style.css            | 59 +-------------------
 2 files changed, 2 insertions(+), 109 deletions(-)

diff --git a/src/stylesheets/article-style-st-classic.css b/src/stylesheets/article-style-st-classic.css
index 1abc45aca..94f835e0d 100644
--- a/src/stylesheets/article-style-st-classic.css
+++ b/src/stylesheets/article-style-st-classic.css
@@ -1068,22 +1068,6 @@ div.xdxf {
 }
 /* the left column width is specified in class .portlet */
 
-/* Font size:
-** We take advantage of keyword scaling- browsers won't go below 9px
-** More at http://www.w3.org/2003/07/30-font-size
-** http://style.cleverchimp.com/font_size_intervals/altintervals.html
-*/
-
-/*
-body {
-	font: x-small sans-serif;
-	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-	color: black;
-	margin: 0;
-	padding: 0;
-}
-*/
-
 /* scale back up to a sane default */
 .mwiki #globalWrapper {
   font-size: 127%;
@@ -1220,7 +1204,6 @@ body {
   list-style-type: square;
   margin: 0.3em 0 0 1.5em;
   padding: 0;
-  list-style-image: url(bullet.gif);
 }
 .mwiki ol {
   line-height: 1.5em;
@@ -1614,38 +1597,7 @@ in the bottom-right corner of the content area */
 ** keep the whitespace in front of the ^=, hides rule from konqueror
 ** this is css3, the validator doesn't like it when validating as css2
 */
-.mwiki #bodyContent a.external,
-.mwiki #bodyContent a[href ^="gopher://"]
-{
-  background: url(external.png) center right no-repeat;
-  padding-right: 1em;
-}
-.mwiki #bodyContent a[href ^="https://"],
-.mwiki .link-https {
-  background: url(lock_icon.gif) center right no-repeat;
-  padding-right: 16px;
-}
-.mwiki #bodyContent a[href^="mailto:"],
-.mwiki .link-mailto {
-  background: url(mail_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="news://"]
-{
-  background: url(news_icon.png) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="ftp://"],
-.mwiki .link-ftp {
-  background: url(file_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="irc://"],
-.mwiki #bodyContent a.extiw[href ^="irc://"],
-.mwiki .link-irc {
-  background: url(discussionitem_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
+
 .mwiki #bodyContent a.external[href$=".ogg"],
 .mwiki #bodyContent a.external[href$=".OGG"],
 .mwiki #bodyContent a.external[href$=".oga"],
@@ -1763,7 +1715,6 @@ special external link styling */
 .mwiki .portlet ul {
   line-height: 1.5em;
   list-style-type: square;
-  list-style-image: url(bullet.gif);
   font-size: 95%;
 }
 .mwiki .portlet li {
@@ -1899,7 +1850,6 @@ in bg url to hide it from iemac */
 .mwiki li#pt-userpage,
 .mwiki li#pt-anonuserpage,
 .mwiki li#pt-login {
-  background: url(user.gif) top left no-repeat;
   padding-left: 20px;
   text-transform: none;
 }
diff --git a/src/stylesheets/article-style.css b/src/stylesheets/article-style.css
index 48de2a516..7355192d3 100644
--- a/src/stylesheets/article-style.css
+++ b/src/stylesheets/article-style.css
@@ -1084,12 +1084,6 @@ div.xdxf {
   font-size: smaller;
 }
 
-/* feed links */
-.mwiki a.feedlink {
-  background: url("images/feed-icon.png") center left no-repeat;
-  padding-left: 16px;
-}
-
 /************ monobook/main.css **************/
 
 /*
@@ -1125,23 +1119,6 @@ div.xdxf {
   border-right: none;
   line-height: 1.5em;
 }
-/* the left column width is specified in class .portlet */
-
-/* Font size:
-** We take advantage of keyword scaling- browsers won't go below 9px
-** More at http://www.w3.org/2003/07/30-font-size
-** http://style.cleverchimp.com/font_size_intervals/altintervals.html
-*/
-
-/*
-body {
-	font: x-small sans-serif;
-	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-	color: black;
-	margin: 0;
-	padding: 0;
-}
-*/
 
 /* scale back up to a sane default */
 .mwiki #globalWrapper {
@@ -1279,7 +1256,6 @@ body {
   list-style-type: square;
   margin: 0.3em 0 0 1.5em;
   padding: 0;
-  list-style-image: url(bullet.gif);
 }
 .mwiki ol {
   line-height: 1.5em;
@@ -1673,38 +1649,7 @@ in the bottom-right corner of the content area */
 ** keep the whitespace in front of the ^=, hides rule from konqueror
 ** this is css3, the validator doesn't like it when validating as css2
 */
-.mwiki #bodyContent a.external,
-.mwiki #bodyContent a[href ^="gopher://"]
-{
-  background: url(external.png) center right no-repeat;
-  padding-right: 1em;
-}
-.mwiki #bodyContent a[href ^="https://"],
-.mwiki .link-https {
-  background: url(lock_icon.gif) center right no-repeat;
-  padding-right: 16px;
-}
-.mwiki #bodyContent a[href^="mailto:"],
-.mwiki .link-mailto {
-  background: url(mail_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="news://"]
-{
-  background: url(news_icon.png) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="ftp://"],
-.mwiki .link-ftp {
-  background: url(file_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
-.mwiki #bodyContent a[href ^="irc://"],
-.mwiki #bodyContent a.extiw[href ^="irc://"],
-.mwiki .link-irc {
-  background: url(discussionitem_icon.gif) center right no-repeat;
-  padding-right: 18px;
-}
+
 .mwiki #bodyContent a.external[href$=".ogg"],
 .mwiki #bodyContent a.external[href$=".OGG"],
 .mwiki #bodyContent a.external[href$=".oga"],
@@ -1822,7 +1767,6 @@ special external link styling */
 .mwiki .portlet ul {
   line-height: 1.5em;
   list-style-type: square;
-  list-style-image: url(bullet.gif);
   font-size: 95%;
 }
 .mwiki .portlet li {
@@ -1958,7 +1902,6 @@ in bg url to hide it from iemac */
 .mwiki li#pt-userpage,
 .mwiki li#pt-anonuserpage,
 .mwiki li#pt-login {
-  background: url(user.gif) top left no-repeat;
   padding-left: 20px;
   text-transform: none;
 }

From b1781b63d6e3d995c0c05214005eb1304eb1ce29 Mon Sep 17 00:00:00 2001
From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com>
Date: Mon, 9 Oct 2023 19:58:16 +0800
Subject: [PATCH 12/13] opt: remove gdpicture & maxPictureWidth which has not
 been used at all. (#1220)

* opt: remove gdpicture protocol which has lost effect for a long time

* opt: remove maxPictureWidth which has no place to configure this variable value

* [autofix.ci] apply automated fixes

* [autofix.ci] apply automated fixes (attempt 2/3)

---------

Co-authored-by: YiFang Xiao <yifang.xiao@noreply.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 src/article_netmgr.cc        |  7 -------
 src/config.cc                |  7 -------
 src/config.hh                |  3 ---
 src/dict/dsl.cc              | 23 ++++++-----------------
 src/dict/dsl.hh              |  1 -
 src/dict/loaddictionaries.cc |  4 +---
 src/dict/loaddictionaries.hh |  1 -
 src/main.cc                  |  2 +-
 src/ui/articleview.cc        |  7 +------
 src/ui/mainwindow.cc         |  2 +-
 10 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/src/article_netmgr.cc b/src/article_netmgr.cc
index e34ce8d94..d023bd71a 100644
--- a/src/article_netmgr.cc
+++ b/src/article_netmgr.cc
@@ -292,13 +292,6 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource( QUrl c
     }
   }
 
-  if ( url.scheme() == "gdpicture" ) {
-    contentType = "text/html";
-    QUrl imgUrl( url );
-    imgUrl.setScheme( "bres" );
-    return articleMaker.makePicturePage( imgUrl.toEncoded().data() );
-  }
-
   return sptr< Dictionary::DataRequest >();
 }
 
diff --git a/src/config.cc b/src/config.cc
index 9a975dcbf..43ada5196 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -1160,9 +1160,6 @@ Class load()
   if ( !root.namedItem( "editDictionaryCommandLine" ).isNull() )
     c.editDictionaryCommandLine = root.namedItem( "editDictionaryCommandLine" ).toElement().text();
 
-  if ( !root.namedItem( "maxPictureWidth" ).isNull() )
-    c.maxPictureWidth = root.namedItem( "maxPictureWidth" ).toElement().text().toInt();
-
   if ( !root.namedItem( "maxHeadwordSize" ).isNull() ) {
     unsigned int value = root.namedItem( "maxHeadwordSize" ).toElement().text().toUInt();
     if ( value != 0 ) // 0 is invalid value for our purposes
@@ -2172,10 +2169,6 @@ void save( Class const & c )
     opt.appendChild( dd.createTextNode( c.editDictionaryCommandLine ) );
     root.appendChild( opt );
 
-    opt = dd.createElement( "maxPictureWidth" );
-    opt.appendChild( dd.createTextNode( QString::number( c.maxPictureWidth ) ) );
-    root.appendChild( opt );
-
     opt = dd.createElement( "maxHeadwordSize" );
     opt.appendChild( dd.createTextNode( QString::number( c.maxHeadwordSize ) ) );
     root.appendChild( opt );
diff --git a/src/config.hh b/src/config.hh
index de15f0c3b..ee5d634d8 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -881,8 +881,6 @@ struct Class
 
   bool usingSmallIconsInToolbars;
 
-  int maxPictureWidth; // Maximum picture width
-
   /// Maximum size for the headwords.
   /// Bigger headwords won't be indexed. For now, only in DSL.
   unsigned int maxHeadwordSize;
@@ -899,7 +897,6 @@ struct Class
     pinPopupWindow( false ),
     showingDictBarNames( false ),
     usingSmallIconsInToolbars( false ),
-    maxPictureWidth( 0 ),
     maxHeadwordSize( 256U ),
     maxHeadwordsToExpand( 0 )
   {
diff --git a/src/dict/dsl.cc b/src/dict/dsl.cc
index dba31523d..2f2ea7524 100644
--- a/src/dict/dsl.cc
+++ b/src/dict/dsl.cc
@@ -163,17 +163,13 @@ class DslDictionary: public BtreeIndexing::BtreeDictionary
 
   int optionalPartNom;
   quint8 articleNom;
-  int maxPictureWidth;
 
   wstring currentHeadword;
   string resourceDir1, resourceDir2;
 
 public:
 
-  DslDictionary( string const & id,
-                 string const & indexFile,
-                 vector< string > const & dictionaryFiles,
-                 int maxPictureWidth_ );
+  DslDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   void deferredInit() override;
 
@@ -285,18 +281,14 @@ class DslDictionary: public BtreeIndexing::BtreeDictionary
   friend class DslFTSResultsRequest;
 };
 
-DslDictionary::DslDictionary( string const & id,
-                              string const & indexFile,
-                              vector< string > const & dictionaryFiles,
-                              int maxPictureWidth_ ):
+DslDictionary::DslDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
   BtreeDictionary( id, dictionaryFiles ),
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() ),
   dz( 0 ),
   deferredInitRunnableStarted( false ),
   optionalPartNom( 0 ),
-  articleNom( 0 ),
-  maxPictureWidth( maxPictureWidth_ )
+  articleNom( 0 )
 {
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
@@ -842,10 +834,8 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
 
       string maxWidthStyle = " style=\"max-width:100%;\" ";
 
-      string link( url.toEncoded().data() );
-      link.replace( 0, 4, "gdpicture" );
-      result += string( "<a href=\"" ) + link + "\">" + "<img src=\"" + url.toEncoded().data() + "\" " + maxWidthStyle
-        + " alt=\"" + Html::escape( filename ) + "\"/>" + "</a>";
+      result += string( "<img src=\"" ) + url.toEncoded().data() + "\" " + maxWidthStyle + " alt=\""
+        + Html::escape( filename ) + "\"/>";
     }
     else if ( Filetype::isNameOfVideo( filename ) ) {
       QUrl url;
@@ -1655,7 +1645,6 @@ sptr< Dictionary::DataRequest > DslDictionary::getSearchResults( QString const &
 vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
                                                       string const & indicesDir,
                                                       Dictionary::Initializing & initializing,
-                                                      int maxPictureWidth,
                                                       unsigned int maxHeadwordSize )
 
 {
@@ -2115,7 +2104,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
       } // if need to rebuild
 
-      dictionaries.push_back( std::make_shared< DslDictionary >( dictId, indexFile, dictFiles, maxPictureWidth ) );
+      dictionaries.push_back( std::make_shared< DslDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
       gdWarning( "DSL dictionary reading failed: %s:%u, error: %s\n", fileName.c_str(), atLine, e.what() );
diff --git a/src/dict/dsl.hh b/src/dict/dsl.hh
index f7f6e7d5c..1360fcae3 100644
--- a/src/dict/dsl.hh
+++ b/src/dict/dsl.hh
@@ -15,7 +15,6 @@ using std::string;
 vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
                                                       string const & indicesDir,
                                                       Dictionary::Initializing &,
-                                                      int maxPictureWidth,
                                                       unsigned int maxHeadwordSize );
 
 } // namespace Dsl
diff --git a/src/dict/loaddictionaries.cc b/src/dict/loaddictionaries.cc
index cea5025b6..5a358fc10 100644
--- a/src/dict/loaddictionaries.cc
+++ b/src/dict/loaddictionaries.cc
@@ -58,7 +58,6 @@ LoadDictionaries::LoadDictionaries( Config::Class const & cfg ):
   hunspell( cfg.hunspell ),
   transliteration( cfg.transliteration ),
   exceptionText( "Load did not finish" ), // Will be cleared upon success
-  maxPictureWidth( cfg.maxPictureWidth ),
   maxHeadwordSize( cfg.maxHeadwordSize ),
   maxHeadwordToExpand( cfg.maxHeadwordsToExpand )
 {
@@ -167,8 +166,7 @@ void LoadDictionaries::handlePath( Config::Path const & path )
   addDicts( Bgl::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this ) );
   addDicts( Stardict::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this, maxHeadwordToExpand ) );
   addDicts( Lsa::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this ) );
-  addDicts(
-    Dsl::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this, maxPictureWidth, maxHeadwordSize ) );
+  addDicts( Dsl::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this, maxHeadwordSize ) );
   addDicts( DictdFiles::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this ) );
   addDicts( Xdxf::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this ) );
   addDicts( Sdict::makeDictionaries( allFiles, Config::getIndexDir().toStdString(), *this ) );
diff --git a/src/dict/loaddictionaries.hh b/src/dict/loaddictionaries.hh
index aa0a82975..bae93521b 100644
--- a/src/dict/loaddictionaries.hh
+++ b/src/dict/loaddictionaries.hh
@@ -23,7 +23,6 @@ class LoadDictionaries: public QThread, public Dictionary::Initializing
   Config::Transliteration const & transliteration;
   std::vector< sptr< Dictionary::Class > > dictionaries;
   std::string exceptionText;
-  int maxPictureWidth;
   unsigned int maxHeadwordSize;
   unsigned int maxHeadwordToExpand;
 
diff --git a/src/main.cc b/src/main.cc
index 6b9d3f86a..fb2cbe80f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -405,7 +405,7 @@ int main( int argc, char ** argv )
 #endif
 
   const QStringList localSchemes =
-    { "gdlookup", "gdau", "gico", "qrcx", "bres", "bword", "gdprg", "gdvideo", "gdpicture", "gdtts", "ifr", "entry" };
+    { "gdlookup", "gdau", "gico", "qrcx", "bres", "bword", "gdprg", "gdvideo", "gdtts", "ifr", "entry" };
 
   for ( const auto & localScheme : localSchemes ) {
     QWebEngineUrlScheme webUiScheme( localScheme.toLatin1() );
diff --git a/src/ui/articleview.cc b/src/ui/articleview.cc
index 3981a53e2..260374445 100644
--- a/src/ui/articleview.cc
+++ b/src/ui/articleview.cc
@@ -862,9 +862,6 @@ void ArticleView::linkHovered( const QString & link )
   else if ( url.scheme() == "gdtts" ) {
     msg = tr( "TTS Voice" );
   }
-  else if ( url.scheme() == "gdpicture" ) {
-    msg = tr( "Picture" );
-  }
   else if ( url.scheme() == "gdvideo" ) {
     if ( url.path().isEmpty() ) {
       msg = tr( "Video" );
@@ -967,9 +964,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
 
   Contexts contexts( contexts_ );
 
-  if ( url.scheme().compare( "gdpicture" ) == 0 )
-    load( url );
-  else if ( url.scheme().compare( "ankisearch" ) == 0 ) {
+  if ( url.scheme().compare( "ankisearch" ) == 0 ) {
     ankiConnector->ankiSearch( url.path() );
     return;
   }
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index 8c5c73379..a9d69aa67 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -182,7 +182,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   GlobalBroadcaster::instance()->setPreference( &cfg.preferences );
 
   localSchemeHandler = new LocalSchemeHandler( articleNetMgr, this );
-  QStringList htmlScheme = { "gdlookup", "bword", "entry", "gdpicture" };
+  QStringList htmlScheme = { "gdlookup", "bword", "entry" };
   for ( const auto & localScheme : htmlScheme ) {
     QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localScheme.toLatin1(), localSchemeHandler );
   }

From 00d504cc170b31d791bc7f9451b8cc8287d13661 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <yifang.xiao@foxmail.com>
Date: Mon, 9 Oct 2023 22:16:39 +0800
Subject: [PATCH 13/13] action: macos build failed

---
 .github/workflows/macos-homebrew-PR-check.yml |  7 +------
 .github/workflows/macos-homebrew-breakpad.yml |  9 ++-------
 .github/workflows/macos-homebrew.yml          | 14 +++-----------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml
index e27dfbfe6..ff2f9ea66 100644
--- a/.github/workflows/macos-homebrew-PR-check.yml
+++ b/.github/workflows/macos-homebrew-PR-check.yml
@@ -49,16 +49,12 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
           brew install opencc
           
-          # brew install speex
-          # brew tap homebrew-ffmpeg/ffmpeg
-          # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
           brew install libao
           brew install libiconv
           brew install lzo bzip2
@@ -69,7 +65,6 @@ jobs:
           wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2
           tar xvjf eb-4.4.3.tar.bz2
           cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
-          #brew install qt # or use official offline installer
           brew install  xz lzo 
           brew install pkg-config
           brew install libiconv
diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
index a638205d8..9cbdc4b91 100644
--- a/.github/workflows/macos-homebrew-breakpad.yml
+++ b/.github/workflows/macos-homebrew-breakpad.yml
@@ -42,8 +42,7 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
@@ -51,11 +50,7 @@ jobs:
           brew install speex
           brew install wavpack
           brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          brew install speex
           
-          brew tap homebrew-ffmpeg/ffmpeg
-          brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
-
           brew install libiconv
           brew install lzo bzip2
           brew install libogg
@@ -105,7 +100,7 @@ jobs:
           
       - name: compile
         run: |          
-          qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=use_breakpad
+          qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=use_breakpad  CONFIG+=no_ffmpeg_player CONFIG+=no_tts_support
           make -j8
           
       - name: package
diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml
index 86f6e2bcb..d2132292f 100644
--- a/.github/workflows/macos-homebrew.yml
+++ b/.github/workflows/macos-homebrew.yml
@@ -41,20 +41,12 @@ jobs:
        
       - name: install deps on macos
         run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
+          brew install cmake ninja
           brew install automake
           brew install autoconf
           brew install libtool
           brew install opencc
-          # brew install speex
-          brew install wavpack
           brew install automake git lame libass libtool shtool texi2html theora wget xvid nasm
-          # brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          
-          # brew tap homebrew-ffmpeg/ffmpeg
-          # brew options homebrew-ffmpeg/ffmpeg/ffmpeg 
-          # brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
 
           brew install libiconv
           brew install lzo bzip2
@@ -76,8 +68,8 @@ jobs:
           cmake -B build -DCMAKE_BUILD_TYPE=release
           cmake --build build --config release
           sudo make install
-          find /usr/local -name libzstd.1.dylib 
-          find /usr/local -name liblzma.5.dylib
+          # find /usr/local -name libzstd.1.dylib 
+          # find /usr/local -name liblzma.5.dylib
       - name: version-file
         shell: bash
         env: