Merge branch 'staged' into dev

xiaoyifang · May 22, 2022 · 7c9c4c1 · 7c9c4c1
2 parents 413ce8c + 3e5ad72
commit 7c9c4c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/articleview.cc b/articleview.cc
@@ -1960,7 +1960,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
     else
     if ( result == lookupSelection )
       showDefinition( selectedText, getGroup( ui.definition->url() ), getCurrentArticle() );
-    else if( result = sendToAnkiAction )
+    else if( result == sendToAnkiAction )
     {
       sendToAnki( ui.definition->title(), ui.definition->selectedText() );
     }

diff --git a/dsl.cc b/dsl.cc
@@ -2153,10 +2153,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           hasString = false;
 
-          // The line read should either consist of pure whitespace, or be a
-          // headword
-
-          if ( curString.empty() )
+          // The line read should either consist of pure whitespace, or be a headword
+          // skip too long headword,it can never be headword.
+          if( curString.empty() || curString.size() > 100 )
             continue;
 
           if ( isDslWs( curString[ 0 ] ) )

diff --git a/dsl_details.cc b/dsl_details.cc
@@ -1155,12 +1155,6 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
   list< wstring > * headwords;
   headwords = inside_recurse ? result : &expanded;
 
-  //if str is too long ,it can never be headwords.
-  //todo?
-  if( str.size() > 100 )
-  {
-    return;
-  }
   for( ; x < str.size(); )
   {
     wchar ch = str[ x ];

diff --git a/howto/how to connect with anki.md b/howto/how to connect with anki.md
@@ -15,7 +15,7 @@ the back template
 
 # configure goldendict
 ## 1. through toolbar=>preference=>network
-![image](https://user-images.githubusercontent.com/105986/169638498-fcb36ca7-02ac-4384-9a77-52aab657f5c1.png)
+![image](https://user-images.githubusercontent.com/105986/169657672-d1affbde-e80e-4110-8fd9-55f2645c5ee1.png)
 
 ## 2. action
 ![image](https://user-images.githubusercontent.com/105986/169638740-abecde84-d33b-45ce-932c-d465c6650334.png)