1
0
Эх сурвалжийг харах

Hide description, show annotation

Kandrashin Denis 13 жил өмнө
parent
commit
5cac350f59

+ 4 - 3
source/fb2read.cpp

@@ -195,11 +195,12 @@ void Fb2Handler::RootHandler::EndTag(const QString &name)
 //  Fb2Handler::HeadHandler
 //---------------------------------------------------------------------------
 
-Fb2Handler::HeadHandler::HeadHandler(Fb2HtmlWriter &writer, const QString &name)
+Fb2Handler::HeadHandler::HeadHandler(Fb2HtmlWriter &writer, const QString &name, bool hide)
     : BaseHandler(writer, name)
 {
     m_writer.writeStartElement("div");
     m_writer.writeAttribute("class", name);
+    if (hide) m_writer.writeAttribute("style", "display:none");
 }
 
 Fb2Handler::BaseHandler * Fb2Handler::HeadHandler::NewTag(const QString &name, const QXmlAttributes &attributes)
@@ -240,7 +241,7 @@ Fb2Handler::BaseHandler * Fb2Handler::DescrHandler::NewTag(const QString &name,
         case Document :
         case Publish :
         case Custom :
-            return new HeadHandler(m_writer, name);
+            return new HeadHandler(m_writer, name, true);
         default:
             return NULL;
     }
@@ -253,7 +254,7 @@ Fb2Handler::BaseHandler * Fb2Handler::DescrHandler::NewTag(const QString &name,
 Fb2Handler::BaseHandler * Fb2Handler::TitleHandler::NewTag(const QString &name, const QXmlAttributes &attributes)
 {
     if (name == "annotation") return new BodyHandler(m_writer, name, attributes, "div", name);
-    return new HeadHandler(m_writer, name);
+    return new HeadHandler(m_writer, name, true);
 }
 
 //---------------------------------------------------------------------------

+ 1 - 1
source/fb2read.h

@@ -114,7 +114,7 @@ private:
     class HeadHandler : public BaseHandler
     {
     public:
-        explicit HeadHandler(Fb2HtmlWriter &writer, const QString &name);
+        explicit HeadHandler(Fb2HtmlWriter &writer, const QString &name, bool hide = false);
     protected:
         virtual BaseHandler * NewTag(const QString &name, const QXmlAttributes &attributes);
         virtual void TxtTag(const QString &text);

+ 5 - 18
source/res/style.css

@@ -2,20 +2,7 @@ body {
   font-family: serif;
 }
 
-div.description div {
-  display: none;
-}
-
-div.description div.title-info {
-  display: block;
-}
-
-div.description div.title-info . {
-  display: none;
-}
-
-div.description div.title-info div.annotation {
-  display: block;
+div.description div.annotation {
   padding-left: 10;
   padding-right: 10;
   border-width: thin;
@@ -52,19 +39,19 @@ div.subtitle {
   background: #d8a903;
   text-align: center;
   font-family: sans-serif;
-  margin-left: 5%;
-  margin-right: 5%;
+  margin-left: 2%;
+  margin-right: 2%;
 }
 
 div.epigraph {
   border-left: 2 dotted purple;
-  margin-left: 10%;
+  margin-left: 15%;
   padding-left: 4;
 }
 
 div.cite {
   border-left: 2 dotted teal;
-  margin-left: 5%;
+  margin-left: 10%;
   padding-left: 4;
 }