Merge branch 'temp/staged' into staged

.github/workflows/macos.yml

@@ -1,4 +1,7 @@
-name: MacOS
+name: macos
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 on: 
   workflow_dispatch:
   push:
@@ -90,8 +93,8 @@ jobs:
             branch:               ${{ github.ref_name }}
             commit:               ${{ steps.vars.outputs.sha_short }} 
             Qt version:           ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
+            Windows built with:   msvc64  Visual studio 2019
+                                  goldendict.exe was provided alone ,if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
+            AppImage built with:  Ubuntu-20.04 ,latest gcc
             macos built with:     ${{ matrix.os }},clang_64
-            
-            This is a prerelease version ,auto build by github action. use on your on risk:-)
-
-      
+            This is a prerelease version ,auto build by github action. use on your on risk:-)   

.github/workflows/ubuntu.yml

@@ -109,6 +109,7 @@ jobs:
             commit:               ${{ steps.vars.outputs.sha_short }} 
             Qt version:           ${{ matrix.qt_ver }} ${{ matrix.qt_arch }}
             Windows built with:   msvc64  Visual studio 2019
+                                  goldendict.exe was provided alone ,if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
             AppImage built with:  Ubuntu-20.04 ,latest gcc
-            
-            This is a prerelease version ,auto build by github action. use on your on risk:-)
+            macos built with:     ${{ matrix.os }},clang_64
+            This is a prerelease version ,auto build by github action. use on your on risk:-)   

.github/workflows/windows.yml

@@ -148,5 +148,5 @@ jobs:
             Windows built with:   msvc64  Visual studio 2019
                                   goldendict.exe was provided alone ,if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
             AppImage built with:  Ubuntu-20.04 ,latest gcc
-
+            macos built with:     ${{ matrix.os }},clang_64
             This is a prerelease version ,auto build by github action. use on your on risk:-)   

article-style-st-lingoes-blue.css

@@ -226,9 +226,6 @@ h3 {
 	-webkit-border-radius: 100px;
 	text-align: center;
 	vertical-align: text-bottom;
-}
-
-.dsl_s_wav a {
 	color: #FFF;
 	border: 1px solid #798415;
 	-webkit-box-shadow: 1px 1px #CCC, inset -1px -1px #4E7500;

article-style.css

@@ -791,6 +791,8 @@ div.xdxf
 	font-style: italic;
 }
 
+.mwiki td.mw-label { vertical-align: top; }
+.mwiki td.mw-submit { white-space: nowrap; }
 /**
  * Forms
  */
@@ -801,9 +803,6 @@ div.xdxf
 .mwiki body.rtl td.mw-input { text-align: right; }
 .mwiki body.rtl td.mw-submit { text-align: right; }
 
-.mwiki td.mw-label { vertical-align: top; }
-.mwiki td.mw-submit { white-space: nowrap; }
-
 /**
  * Image captions
  */

mainwindow.cc

@@ -3566,7 +3566,7 @@ void MainWindow::on_saveArticle_triggered()
 
         // Pull and save resources to files
         for ( vector< pair< QUrl, QString > >::const_iterator i = downloadResources.begin();
-              i != downloadResources.end(); i++ )
+              i != downloadResources.end(); ++i )
         {
           ResourceToSaveHandler * handler = view->saveResource( i->first, i->second );
           if( !handler->isEmpty() )
@@ -4391,11 +4391,11 @@ void MainWindow::openDictionaryFolder( const QString & id )
       if( dictionaries[ x ]->getDictionaryFilenames().size() > 0 )
       {
         QString fileName = FsEncoding::decode( dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str() );
-        bool explorerLaunched = false;
 
         // Platform-dependent way to launch a file explorer and to select a file,
         // currently only on Windows.
 #if defined(Q_OS_WIN)
+        bool explorerLaunched = false;
         if ( !QFileInfo( fileName ).isDir() )
         {
           QString param = QLatin1String("explorer.exe ")
@@ -4425,12 +4425,9 @@ void MainWindow::openDictionaryFolder( const QString & id )
         }
 #endif
 
-        if ( !explorerLaunched )
-        {
-          QString folder = QFileInfo( fileName ).absoluteDir().absolutePath();
-          if( !folder.isEmpty() )
-            QDesktopServices::openUrl( QUrl::fromLocalFile( folder ) );
-        }
+        QString folder = QFileInfo( fileName ).absoluteDir().absolutePath();
+        if( !folder.isEmpty() )
+          QDesktopServices::openUrl( QUrl::fromLocalFile( folder ) );
       }
       break;
     }

mdictparser.cc

@@ -165,7 +165,7 @@ bool MdictParser::readNextHeadWordIndex( MdictParser::HeadWordIndex & headWordIn
     return false;
 
   headWordIndex = splitHeadWordBlock( decompressed );
-  headWordBlockInfosIter_++;
+  ++headWordBlockInfosIter_;
   return true;
 }
 

mdx.cc

@@ -848,7 +848,7 @@ void MddResourceRequest::run()
     catch ( File::exCantOpen & )
     {
       for ( vector< sptr< IndexedMdd > >::const_iterator i = dict.mddResources.begin();
-            i != dict.mddResources.end(); i++  )
+            i != dict.mddResources.end(); ++i  )
       {
         sptr< IndexedMdd > mddResource = *i;
         if ( mddResource->loadFile( resourceName, data ) )
@@ -1272,7 +1272,7 @@ QString MdxDictionary::getCachedFileName( QString filename )
         catch ( File::exCantOpen & )
         {
           for ( vector< sptr< IndexedMdd > >::const_iterator i = mddResources.begin();
-                i != mddResources.end(); i++  )
+                i != mddResources.end(); ++i )
           {
             sptr< IndexedMdd > mddResource = *i;
             if ( mddResource->loadFile( resourceName, data ) )
@@ -1447,7 +1447,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); i++ )
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i )
   {
     // Skip files with the extensions different to .mdx to speed up the
     // scanning
@@ -1477,7 +1477,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       initializing.indexingDictionary( title );
 
       for ( vector< string >::const_iterator mddIter = dictFiles.begin() + 1;
-            mddIter != dictFiles.end(); mddIter++ )
+            mddIter != dictFiles.end(); ++mddIter )
       {
         if ( File::exists( *mddIter ) )
         {
@@ -1576,7 +1576,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         idxHeader.styleSheetCount = styleSheets.size();
 
         for ( MdictParser::StyleSheets::const_iterator iter = styleSheets.begin();
-              iter != styleSheets.end(); iter++ )
+              iter != styleSheets.end(); ++iter )
         {
           string styleBegin( iter->second.first.toUtf8().constData() );
           string styleEnd( iter->second.second.toUtf8().constData() );
@@ -1607,7 +1607,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       // Build index info for each mdd file
       vector< IndexInfo > mddIndexInfos;
       for ( vector< sptr< IndexedWords > >::const_iterator mddIndexIter = mddIndices.begin();
-            mddIndexIter != mddIndices.end(); mddIndexIter++ )
+            mddIndexIter != mddIndices.end(); ++mddIndexIter )
       {
         IndexInfo resourceIdxInfo = BtreeIndexing::buildIndex( *( *mddIndexIter ), idx );
         mddIndexInfos.push_back( resourceIdxInfo );

processwrapper.cc

@@ -112,7 +112,7 @@ unsigned int ProcessWrapper::findProcess(const char *name, unsigned int pid_skip
     QDir pd("/proc");
     QFileInfoList list = pd.entryInfoList(QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot);
     QFileInfoList::iterator it, it_end = list.end();
-    for (it = list.begin(); it != it_end; it++)
+    for (it = list.begin(); it != it_end; ++it)
     {
         const QFileInfo &fi = *it;
         if (fi.baseName().at(0).isDigit()) {

resources/gd-builtin.js

@@ -59,7 +59,7 @@ function gdExpandOptPart(expanderId, optionalId) {
             d2.style.display = 'none';
         }
     }
-};
+}
 
 function emitClickedEvent(){
     try{