Merge branch 'staged' into dev

.github/workflows/macos-6.x.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-11]
-        qt_ver: [6.4.0]
+        qt_ver: [6.3.2]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/macos-homebrew-PR-check.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-12]
-        qt_ver: [6.4.0]
+        qt_ver: [6.3.2]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/ubuntu-6.2.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        qt_ver: [6.4.0]
+        qt_ver: [6.3.2]
         qt_arch: [gcc_64]
     env:
       version: 22.9.24

.github/workflows/windows-6.x-xapian.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.4.0]
+        qt_ver: [6.3.2]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

.github/workflows/windows-6.x.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.4.0]
+        qt_ver: [6.3.2]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

about.cc

@@ -34,7 +34,11 @@ About::About( QWidget * parent ): QDialog( parent )
   ui.qtVersion->setText( tr( "Based on Qt %1 (%2, %3 bit)" ).arg(
                            QLatin1String( qVersion() ),
                            compilerVersion,
-                           QString::number( QSysInfo::WordSize ) ) );
+                           QString::number( QSysInfo::WordSize ) )
+#ifdef USE_XAPIAN
+  +" (Xapian inside)"
+#endif
+                         );
 
   QFile creditsFile( ":/CREDITS.txt" );
 

article-style-st-lingoes-blue.css

@@ -141,7 +141,7 @@ h3 {
 
 /* The first headword in a (possibly) multi-headword DSL article */
 .gdarticlebody > div:first-child .dsl_headwords,
-.gdarticlebody > h3:first-child {
+{
 	margin-top: -3px;
 	display: inline-block;
 }

article-style-st-modern.css

@@ -155,7 +155,6 @@ a:hover
 
 /* The first headword in a (possibly) multi-headword DSL article */
 .gdarticlebody > div:first-child .dsl_headwords,
-.gdarticlebody > h3:first-child
 {
   margin-top: -3px;
   display: inline-block;

article-style.css

@@ -9,6 +9,10 @@ body
    font-family: system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Open Sans","Helvetica Neue",sans-serif;
 }
 
+h1,h2,h3,h4,h5,h6 {
+  unicode-bidi: plaintext;
+  text-align: start;
+}
 /* This stylesheet is used to highligh current selection when doing a search.
   It changes the default selection color (e.g. blue under Windows, orange under Ubuntu) */
 
@@ -132,6 +136,8 @@ pre
 /* StarDict type 'h' -- Html content. We don't normally do anything here. */
 div.sdct_h
 {
+  unicode-bidi: plaintext;
+  text-align: start;
 }
 
 .sdict_h_wav img

article_netmgr.cc

@@ -335,7 +335,7 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
                 QByteArray bytes;
                 QBuffer buffer(&bytes);
                 buffer.open(QIODevice::WriteOnly);
-                dictionaries[ x ]->getIcon().pixmap( 64 ).save(&buffer, "webp");
+                dictionaries[ x ]->getIcon().pixmap( 64 ).save(&buffer, "PNG");
                 buffer.close();
                 sptr< Dictionary::DataRequestInstant > ico = new Dictionary::DataRequestInstant( true );
                 ico->getData().resize( bytes.size() );

articleview.cc

@@ -2759,7 +2759,7 @@ void ResourceToSaveHandler::downloadFinished()
   {
     if ( (*i)->isFinished() )
     {
-      if ( (*i)->dataSize() >= 0 && !alreadyDone )
+      if ( (*i)->dataSize() > 0 && !alreadyDone )
       {
         QByteArray resourceData;
         vector< char > const & data = (*i)->getFullData();