From d721e627b18ed13e51e77e13aca1b0c9ff7bf9e3 Mon Sep 17 00:00:00 2001
From: Abs62 <ottomann@yandex.ru>
Date: Sun, 2 Jun 2013 15:20:33 +0400
Subject: [PATCH] Allow to collapse/expand articles; auto collapse for big
 articles (issue #331)

---
 article-style.css   |  16 +++++++++
 article_maker.cc    |  78 +++++++++++++++++++++++++++++++++++++-------
 article_maker.hh    |   9 ++++-
 config.cc           |  17 +++++++++-
 config.hh           |   3 ++
 icons/blank.png     | Bin 0 -> 91 bytes
 icons/downarrow.png | Bin 0 -> 479 bytes
 mainwindow.cc       |   8 +++++
 preferences.cc      |   6 ++++
 preferences.ui      |  52 ++++++++++++++++++++++++++++-
 resources.qrc       |   2 ++
 11 files changed, 177 insertions(+), 14 deletions(-)
 create mode 100644 icons/blank.png
 create mode 100644 icons/downarrow.png

diff --git a/article-style.css b/article-style.css
index 5101b89c..7dd6a0fc 100644
--- a/article-style.css
+++ b/article-style.css
@@ -2713,3 +2713,19 @@ in bg url to hide it from iemac */
 .mwiki .infl-table { display: none }
 /****default hide dict icon ***/
 .gddicticon{display:none;}
+
+.gdexpandicon {
+    cursor:pointer;
+    width:16px;
+    height:16px;
+    vertical-align: text-bottom;
+    background-image:url('qrcx://localhost/icons/arrow.png');
+}
+
+.gdcollapseicon {
+    cursor:pointer;
+    width:16px;
+    height:16px;
+    vertical-align: text-bottom;
+    background-image:url('qrcx://localhost/icons/downarrow.png');
+}
diff --git a/article_maker.cc b/article_maker.cc
index 30358f35..de55347e 100644
--- a/article_maker.cc
+++ b/article_maker.cc
@@ -9,6 +9,7 @@
 #include <limits.h>
 #include <QFile>
 #include <QUrl>
+#include <QTextDocumentFragment>
 #include "folding.hh"
 #include "langcoder.hh"
 #include "dprintf.hh"
@@ -28,6 +29,8 @@ ArticleMaker::ArticleMaker( vector< sptr< Dictionary::Class > > const & dictiona
   displayStyle( displayStyle_ ),
   addonStyle( addonStyle_ ),
   needExpandOptionalParts( true )
+, collapseBigArticles( true )
+, articleLimitSize( 500 )
 {
 }
 
@@ -121,8 +124,8 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
             "gdAudioLinks = { first: null, current: null };"
             "function gdMakeArticleActive( newId ) {"
             "if ( gdCurrentArticle != 'gdfrom-' + newId ) {"
-            "document.getElementById( gdCurrentArticle ).className = 'gdarticle';"
-            "document.getElementById( 'gdfrom-' + newId ).className = 'gdarticle gdactivearticle';"
+            "el=document.getElementById( gdCurrentArticle ); el.className = el.className.replace(' gdactivearticle','');"
+            "el=document.getElementById( 'gdfrom-' + newId ); el.className = el.className + ' gdactivearticle';"
             "gdCurrentArticle = 'gdfrom-' + newId; gdAudioLinks.current = newId;"
             "articleview.onJsActiveArticleChanged(gdCurrentArticle); } }"
             "var overIframeId = null;"
@@ -137,7 +140,22 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
             "window.addEventListener('load', init, false);"
             "function gdExpandOptPart( expanderId, optionalId ) {  var d1=document.getElementById(expanderId); var i = 0; if( d1.alt == '[+]' ) {"
             "d1.alt = '[-]'; d1.src = 'qrcx://localhost/icons/collapse_opt.png'; for( i = 0; i < 1000; i++ ) { var d2=document.getElementById( optionalId + i ); if( !d2 ) break; d2.style.display='inline'; } }"
-            "else { d1.alt = '[+]'; d1.src = 'qrcx://localhost/icons/expand_opt.png'; for( i = 0; i < 1000; i++ ) { var d2=document.getElementById( optionalId + i ); if( !d2 ) break; d2.style.display='none'; } } }"
+            "else { d1.alt = '[+]'; d1.src = 'qrcx://localhost/icons/expand_opt.png'; for( i = 0; i < 1000; i++ ) { var d2=document.getElementById( optionalId + i ); if( !d2 ) break; d2.style.display='none'; } } };"
+            "function gdExpandArticle( id ) { elem = document.getElementById('gdarticlefrom-'+id); ico = document.getElementById('expandicon-'+id); art=document.getElementById('gdfrom-'+id);"
+            "t=window.event.target || window.event.srcElement;"
+            "if(elem.style.display=='inline' && t==ico) {"
+            "elem.style.display='none'; ico.className='gdexpandicon';"
+            "art.className = art.className+' gdcollapsedarticle';"
+            "nm=document.getElementById('gddictname-'+id); nm.style.cursor='pointer';"
+            "window.event.stopPropagation(); ico.title=''; nm.title='";
+  result += tr( "Expand article" ).toUtf8().data();
+  result += "' } else {"
+            "elem.style.display='inline'; ico.className='gdcollapseicon';"
+            "art.className=art.className.replace(' gdcollapsedarticle','');"
+            "nm=document.getElementById('gddictname-'+id); nm.style.cursor='default';"
+            "nm.title=''; ico.title='";
+  result += tr( "Collapse article").toUtf8().data();
+  result += "' } }"
             "</script>";
 
   result += "</head><body>";
@@ -259,11 +277,13 @@ sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor(
         unmutedDicts.push_back( activeDicts[ x ] );
 
     return new ArticleRequest( inWord.trimmed(), activeGroup ? activeGroup->name : "",
-                               contexts, unmutedDicts, header );
+                               contexts, unmutedDicts, header,
+                               collapseBigArticles ? articleLimitSize : -1 );
   }
   else
     return new ArticleRequest( inWord.trimmed(), activeGroup ? activeGroup->name : "",
-                               contexts, activeDicts, header );
+                               contexts, activeDicts, header,
+                               collapseBigArticles ? articleLimitSize : -1 );
 }
 
 sptr< Dictionary::DataRequest > ArticleMaker::makeNotFoundTextFor(
@@ -315,6 +335,13 @@ void ArticleMaker::setExpandOptionalParts( bool expand )
   needExpandOptionalParts = expand;
 }
 
+void ArticleMaker::setCollapseParameters( bool autoCollapse, int articleSize )
+{
+  collapseBigArticles = autoCollapse;
+  articleLimitSize = articleSize;
+}
+
+
 bool ArticleMaker::adjustFilePath( QString & fileName )
 {
   QFileInfo info( fileName );
@@ -338,11 +365,13 @@ ArticleRequest::ArticleRequest(
   QString const & word_, QString const & group_,
   QMap< QString, QString > const & contexts_,
   vector< sptr< Dictionary::Class > > const & activeDicts_,
-  string const & header ):
+  string const & header,
+  int sizeLimit ):
     word( word_ ), group( group_ ), contexts( contexts_ ),
     activeDicts( activeDicts_ ),
     altsDone( false ), bodyDone( false ), foundAnyDefinitions( false ),
     closePrevSpan( false )
+,   articleSizeLimit( sizeLimit )
 {
   // No need to lock dataMutex on construction
 
@@ -461,7 +490,7 @@ void ArticleRequest::bodyFinished()
 
         if ( closePrevSpan )
         {
-          head += "</span></span><span class=\"gdarticleseparator\"></span>";
+          head += "</span></span><div style=\"clear:both;\"></div><span class=\"gdarticleseparator\"></span>";
         }
         else
         {
@@ -471,6 +500,22 @@ void ArticleRequest::bodyFinished()
                   "articleview.onJsActiveArticleChanged(gdCurrentArticle)</script>";
         }
 
+        bool collapse = false;
+        if( articleSizeLimit >= 0 )
+        {
+          try
+          {
+            Mutex::Lock _( dataMutex );
+            QString text = QString::fromUtf8( req.getFullData().data(), req.getFullData().size() );
+            int size = QTextDocumentFragment::fromHtml( text ).toPlainText().length();
+            if( size > articleSizeLimit )
+              collapse = true;
+          }
+          catch(...)
+          {
+          }
+        }
+
         string jsVal = Html::escapeForJavaScript( dictId );
         head += "<script type=\"text/javascript\">var gdArticleContents; "
           "if ( !gdArticleContents ) gdArticleContents = \"" + jsVal +" \"; "
@@ -478,6 +523,7 @@ void ArticleRequest::bodyFinished()
 
         head += string( "<span class=\"gdarticle" ) +
                 ( closePrevSpan ? "" : " gdactivearticle" ) +
+                ( collapse ? " gdcollapsedarticle" : "" ) +
                 "\" id=\"" + gdFrom +
                 "\" onClick=\"gdMakeArticleActive( '" + jsVal + "' );\" " +
                 " onContextMenu=\"gdMakeArticleActive( '" + jsVal + "' );\""
@@ -485,18 +531,28 @@ void ArticleRequest::bodyFinished()
 
         closePrevSpan = true;
 
-        head += string( "<div class=\"gddictname\"><span class=\"gddicticon\"><img src=\"gico://")
-                +  Html::escape( dictId )
+        head += string( "<div class=\"gddictname\" onclick=\"gdExpandArticle(\'" ) + dictId + "\');"
+          + ( collapse ? "\" style=\"cursor:pointer;" : "" )
+          + "\" id=\"gddictname-" + Html::escape( dictId ) + "\""
+          + ( collapse ? string( " title=\"" ) + tr( "Expand article" ).toUtf8().data() + "\"" : "" )
+          + "><span class=\"gddicticon\"><img src=\"gico://" + Html::escape( dictId )
           + "/dicticon.png\"></span><span class=\"gdfromprefix\">"  +
           Html::escape( tr( "From " ).toUtf8().data() ) + "</span>" +
           Html::escape( activeDict->getName().c_str() )
-           + "</div>";
+          + "<span><img src=\"qrcx://localhost/icons/blank.png\" class=\""
+          + ( collapse ? "gdexpandicon" : "gdcollapseicon" )
+          + "\" id=\"expandicon-" + Html::escape( dictId ) + "\""
+          + ( collapse ? "" : string( " title=\"" ) + tr( "Collapse article" ).toUtf8().data() + "\"" )
+          + "></span>" + "</div>";
 
         head += "<span class=\"gdarticlebody gdlangfrom-";
         head += LangCoder::intToCode2( activeDict->getLangFrom() ).toLatin1().data();
         head += "\" lang=\"";
         head += LangCoder::intToCode2( activeDict->getLangTo() ).toLatin1().data();
-        head += "\">";
+        head += "\"";
+        head += " style=\"display:";
+        head += collapse ? "none" : "inline";
+        head += string( "\" id=\"gdarticlefrom-" ) + Html::escape( dictId ) + "\">";
 
         if ( errorString.size() )
         {
diff --git a/article_maker.hh b/article_maker.hh
index ba25af39..6a822ea3 100644
--- a/article_maker.hh
+++ b/article_maker.hh
@@ -23,6 +23,8 @@ class ArticleMaker: public QObject
   QString displayStyle, addonStyle;
 
   bool needExpandOptionalParts;
+  bool collapseBigArticles;
+  int articleLimitSize;
 
 public:
 
@@ -71,6 +73,9 @@ public:
   /// Return true if path successfully adjusted
   static bool adjustFilePath( QString & fileName );
 
+  /// Set collapse articles parameters
+  void setCollapseParameters( bool autoCollapse, int articleSize );
+
 private:
 
   /// Makes everything up to and including the opening body tag.
@@ -115,13 +120,15 @@ class ArticleRequest: public Dictionary::DataRequest
   QString currentSplittedWordCompound;
   QString lastGoodCompoundResult;
   bool firstCompoundWasFound;
+  int articleSizeLimit;
 
 public:
 
   ArticleRequest( QString const & word, QString const & group,
                   QMap< QString, QString > const & contexts,
                   std::vector< sptr< Dictionary::Class > > const & activeDicts,
-                  std::string const & header );
+                  std::string const & header,
+                  int sizeLimit );
 
   virtual void cancel();
 //  { finish(); } // Add our own requests cancellation here
diff --git a/config.cc b/config.cc
index 35e07cd5..ebf405c6 100644
--- a/config.cc
+++ b/config.cc
@@ -122,6 +122,8 @@ Preferences::Preferences():
   storeHistory( 1 ),
   alwaysExpandOptionalParts( true )
 , historyStoreInterval( 0 )
+, collapseBigArticles( false )
+, articleSizeLimit( 2000 )
 {
 }
 
@@ -725,6 +727,12 @@ Class load() throw( exError )
 
     if ( !preferences.namedItem( "historyStoreInterval" ).isNull() )
       c.preferences.historyStoreInterval = preferences.namedItem( "historyStoreInterval" ).toElement().text().toUInt() ;
+
+    if ( !preferences.namedItem( "collapseBigArticles" ).isNull() )
+      c.preferences.collapseBigArticles = ( preferences.namedItem( "collapseBigArticles" ).toElement().text() == "1" );
+
+    if ( !preferences.namedItem( "articleSizeLimit" ).isNull() )
+      c.preferences.articleSizeLimit = preferences.namedItem( "articleSizeLimit" ).toElement().text().toUInt() ;
   }
 
   c.lastMainGroupId = root.namedItem( "lastMainGroupId" ).toElement().text().toUInt();
@@ -1446,7 +1454,14 @@ void save( Class const & c ) throw( exError )
     opt = dd.createElement( "addonStyle" );
     opt.appendChild( dd.createTextNode( c.preferences.addonStyle ) );
     preferences.appendChild( opt );
-  }
+
+    opt = dd.createElement( "collapseBigArticles" );
+    opt.appendChild( dd.createTextNode( c.preferences.collapseBigArticles ? "1" : "0" ) );
+    preferences.appendChild( opt );
+
+    opt = dd.createElement( "articleSizeLimit" );
+    opt.appendChild( dd.createTextNode( QString::number( c.preferences.articleSizeLimit ) ) );
+    preferences.appendChild( opt );  }
 
   {
     QDomElement opt = dd.createElement( "lastMainGroupId" );
diff --git a/config.hh b/config.hh
index 56722a9b..ccd13f6a 100644
--- a/config.hh
+++ b/config.hh
@@ -207,6 +207,9 @@ struct Preferences
 
   unsigned historyStoreInterval;
 
+  bool collapseBigArticles;
+  int articleSizeLimit;
+
   QString addonStyle;
 
   Preferences();
diff --git a/icons/blank.png b/icons/blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd396de62e493c894552d9ca112992b72158b96a
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4jBOuH;Rhv&5D9G#S
g;uyj)GdTeWfLvAv#`cANSAZ-APgg&ebxsLQ0Hf>?e*gdg

literal 0
HcmV?d00001

diff --git a/icons/downarrow.png b/icons/downarrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1b18170a6f3369081d511aa4804b1bf576ff45c
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm00058
z000580b!UZ4gdfE33NqRbVF}#ZDnqB004<9jRpV!0eneBK~#90WBC97KLaJ0BF%%y
z0On4%K*4FE`}ijb@8;>{-@)C%x0SPrXCqq;`+AlV)-_By%qtm^7?v@F1F;_z`!jeU
z4CrD{(^;wapL-AYf6l9%|2Zyj{Ab(E_Mc@L%YUt<TL0~q*!>S(5&A!ObMF7vgRTFo
z*H-`I2;zuA@d8i3;2N=w;=dV=GW=&a0>oQ@cp<}o)y1m+Z5G-54_yf~U`y`*f;9zy
zdBb^UV}t=i0|TSbM9~{O8+iUOYyfIr2E@}D{%bAJ`tPvF;eX`H$p6{vv;RuQOP&R(
z#TtkV<qV=Clf*u-&Sw3`FooeiV+Z4Zy_tIdUFW&}k69k`PdQupHG>O-5Z+i|C}p)^
zsAKxcP|xt6xq|t>;RM6~p0hmv>sILgWbkA#Bq|yiikPwmtAu_tBs2Us>oEIoRB!Z~
zA%G!)q;$ZR&#{OrhU>RcmC+y8NY<GoCnQinainpa;YsE_jT~qsr9>cL1mVG*7XahQ
VeNVnl#b^Kk002ovPDHLkV1mry-YftB

literal 0
HcmV?d00001

diff --git a/mainwindow.cc b/mainwindow.cc
index 4bb42734..98739d7f 100644
--- a/mainwindow.cc
+++ b/mainwindow.cc
@@ -87,6 +87,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   ui.setupUi( this );
 
+  articleMaker.setCollapseParameters( cfg.preferences.collapseBigArticles, cfg.preferences.articleSizeLimit );
+
   // use our own, cutsom statusbar
   setStatusBar(0);
   mainStatusBar = new MainStatusBar( this );
@@ -1741,6 +1743,12 @@ void MainWindow::editPreferences()
       needReload = true;
     }
 
+    if( cfg.preferences.collapseBigArticles != p.collapseBigArticles
+        || cfg.preferences.articleSizeLimit != p.articleSizeLimit )
+    {
+      articleMaker.setCollapseParameters( p.collapseBigArticles, p.articleSizeLimit );
+    }
+
     // See if we need to reapply expand optional parts mode
     if( cfg.preferences.alwaysExpandOptionalParts != p.alwaysExpandOptionalParts )
     {
diff --git a/preferences.cc b/preferences.cc
index bd88c684..0e891a17 100644
--- a/preferences.cc
+++ b/preferences.cc
@@ -135,6 +135,9 @@ Preferences::Preferences( QWidget * parent, Config::Preferences const & p ):
   ui.historySaveIntervalField->setValue( p.historyStoreInterval );
   ui.alwaysExpandOptionalParts->setChecked( p.alwaysExpandOptionalParts );
 
+  ui.collapseBigArticles->setChecked( p.collapseBigArticles );
+  ui.articleSizeLimit->setValue( p.articleSizeLimit );
+
   // Different platforms have different keys available
 
 #ifdef Q_OS_WIN32
@@ -252,6 +255,9 @@ Config::Preferences Preferences::getPreferences()
   p.historyStoreInterval = ui.historySaveIntervalField->text().toUInt();
   p.alwaysExpandOptionalParts = ui.alwaysExpandOptionalParts->isChecked();
 
+  p.collapseBigArticles = ui.collapseBigArticles->isChecked();
+  p.articleSizeLimit = ui.articleSizeLimit->text().toInt();
+
   p.pronounceOnLoadMain = ui.pronounceOnLoadMain->isChecked();
   p.pronounceOnLoadPopup = ui.pronounceOnLoadPopup->isChecked();
   p.useExternalPlayer = ui.useExternalPlayer->isChecked();
diff --git a/preferences.ui b/preferences.ui
index bf80bb40..cb79ab8c 100644
--- a/preferences.ui
+++ b/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>572</width>
-    <height>394</height>
+    <height>403</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1231,6 +1231,56 @@ It is not needed to select this option if you don't use such programs.</string>
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <item>
+             <widget class="QCheckBox" name="collapseBigArticles">
+              <property name="toolTip">
+               <string>Select this option to automatic collapse big articles</string>
+              </property>
+              <property name="text">
+               <string>Collapse articles more than</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="articleSizeLimit">
+              <property name="toolTip">
+               <string>Artiles longer than this size will be collapsed</string>
+              </property>
+              <property name="maximum">
+               <number>100000</number>
+              </property>
+              <property name="singleStep">
+               <number>50</number>
+              </property>
+              <property name="value">
+               <number>2000</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_13">
+              <property name="text">
+               <string>symbols</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_11">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/resources.qrc b/resources.qrc
index 032da846..efebd0e8 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -65,5 +65,7 @@
         <file>qt-style-st-lingoes-blue.css</file>
         <file>qt-style-macos.css</file>
         <file>icons/mdict.png</file>
+        <file>icons/downarrow.png</file>
+        <file>icons/blank.png</file>
     </qresource>
 </RCC>