From bc7a8b39c8548b271c75a077e4f12cc93ea4c31c Mon Sep 17 00:00:00 2001 From: Abs62 Date: Sun, 16 Sep 2012 19:54:00 +0400 Subject: [PATCH] Icons instead of text markers to show/hide articles optional parts --- article-style.css | 1 + article_maker.cc | 6 +++--- dsl.cc | 4 ++-- icons/collapse_opt.png | Bin 0 -> 3587 bytes icons/expand_opt.png | Bin 0 -> 3587 bytes resources.qrc | 2 ++ 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 icons/collapse_opt.png create mode 100644 icons/expand_opt.png diff --git a/article-style.css b/article-style.css index 3f9536d2..acad5bb2 100644 --- a/article-style.css +++ b/article-style.css @@ -369,6 +369,7 @@ div.xdxf { color: blue; cursor: pointer; + vertical-align: center; } /************* Spelling suggestions *****************/ diff --git a/article_maker.cc b/article_maker.cc index 1f61d773..ca52faa9 100644 --- a/article_maker.cc +++ b/article_maker.cc @@ -109,9 +109,9 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word, "function processIframeClick() { if( overIframeId != null ) { overIframeId = overIframeId.replace( 'gdexpandframe-', '' ); gdMakeArticleActive( overIframeId ) } }" "function init() { window.addEventListener('blur', processIframeClick, false); }" "window.addEventListener('load', init, false);" - "function gdExpandOptPart( expanderId, optionalId ) { var d1=document.getElementById(expanderId); var i = 0; if( d1.innerHTML == '[+]' ) {" - "d1.innerHTML = '[-]'; for( i = 0; i < 1000; i++ ) { var d2=document.getElementById( optionalId + i ); if( !d2 ) break; d2.style.display='inline'; } }" - "else { d1.innerHTML = '[+]'; for( i = 0; i < 1000; i++ ) { var d2=document.getElementById( optionalId + i ); if( !d2 ) break; d2.style.display='none'; } } }" + "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'; } } }" ""; result += ""; diff --git a/dsl.cc b/dsl.cc index 11da8bce..0a30e541 100644 --- a/dsl.cc +++ b/dsl.cc @@ -1157,8 +1157,8 @@ void DslArticleRequest::run() string prefix = "O" + dict.getId().substr( 0, 7 ) + "_" + QString::number( dict.articleNom ).toStdString(); string id1 = prefix + "_expand"; string id2 = prefix + "_opt_"; - string button = "[+]"; + string button = "\"[+]\"/"; if( articleText.compare( articleText.size() - 4, 4, "

" ) == 0 ) articleText.insert( articleText.size() - 4, " " + button ); else diff --git a/icons/collapse_opt.png b/icons/collapse_opt.png new file mode 100644 index 0000000000000000000000000000000000000000..fe50c033341d7e54c6f7b937b62a30a8c3710685 GIT binary patch literal 3587 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 a@O}76t_n2d=I|VRWx&kH+OP`g67g^DWE+eC literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index 1c003569..1c95ed92 100644 --- a/resources.qrc +++ b/resources.qrc @@ -49,6 +49,8 @@ icons/macicon.png icons/icon32_sdict.png icons/icon32_aard.png + icons/expand_opt.png + icons/collapse_opt.png article-style-st-babylon.css qt-style-st-babylon.css