Show paragraph separator

source/fb2main.cpp

@@ -355,14 +355,10 @@ void FbMainWindow::createActions()
     text->setAction(Fb::InsertText, act);
     menu->addAction(act);
 
-    act = new QAction(tr("Paragraph"), this);
+    act = new FbTextAction(tr("Paragraph"), QWebPage::InsertParagraphSeparator, text);
     text->setAction(Fb::InsertParag, act);
     menu->addAction(act);
 
-    act = new QAction(tr("Line end"), this);
-    text->setAction(Fb::InsertLine, act);
-    menu->addAction(act);
-
     menu = menuBar()->addMenu(tr("Fo&rmat"));
     mainDock->addMenu(menu);
 

source/fb2mode.h

@@ -41,7 +41,6 @@ enum Actions {
     InsertSection,
     InsertText,
     InsertParag,
-    InsertLine,
     ClearFormat,
     TextBold,
     TextItalic,

source/fb2page.cpp

@@ -410,7 +410,8 @@ void FbTextPage::loadFinished()
     if (!child.isNull()) element = child;
     element.select();
 
-    mainFrame()->findFirstElement("style#fb2edit").setInnerXml("p:after{content:' \\B6';}");
+    QString style = "p:after{display:inline;content:'\\A0\\B6';color:gray;}";
+    mainFrame()->findFirstElement("html>head>style#inline").setInnerXml(style);
 }
 
 void FbTextPage::fixContents()

source/fb2read.cpp

@@ -191,13 +191,14 @@ void FbReadHandler::RootHandler::writeHeader()
     if (!m_style.isEmpty()) {
         writer().writeStartElement("style");
         writer().writeAttribute("type", "text/css");
+        writer().writeAttribute("id", "origin");
         writer().writeCharacters(m_style);
         writer().writeEndElement();
     }
 
     writer().writeStartElement("style");
     writer().writeAttribute("type", "text/css");
-    writer().writeAttribute("id", "fb2edit");
+    writer().writeAttribute("id", "inline");
     writer().writeCharacters("");
     writer().writeEndElement();
 

source/fb2save.cpp

@@ -141,7 +141,7 @@ FbSaveWriter::FbSaveWriter(FbTextEdit &view, QByteArray *array)
     , m_view(view)
 {
     if (QWebFrame * frame = m_view.page()->mainFrame()) {
-        m_style = frame->findFirstElement("html>head>style").toPlainText();
+        m_style = frame->findFirstElement("html>head>style#origin").toPlainText();
     }
 }
 

source/res/style.css

@@ -120,3 +120,6 @@ table, td, th {
   border: 1 solid gray; 
 }
 
+br {
+  display: none;
+}

source/ts/ru.ts

@@ -86,6 +86,21 @@
         <translation>&amp;Образец:</translation>
     </message>
 </context>
+<context>
+    <name>FbHeadEdit</name>
+    <message>
+        <source>&amp;Append</source>
+        <translation type="unfinished">&amp;Добавить</translation>
+    </message>
+    <message>
+        <source>&amp;Modify</source>
+        <translation type="unfinished">&amp;Изменить</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Удалить</translation>
+    </message>
+</context>
 <context>
     <name>FbHeadItem</name>
     <message>
@@ -204,15 +219,15 @@
     <name>FbHeadView</name>
     <message>
         <source>&amp;Append</source>
-        <translation>&amp;Добавить</translation>
+        <translation type="obsolete">&amp;Добавить</translation>
     </message>
     <message>
         <source>&amp;Modify</source>
-        <translation>&amp;Изменить</translation>
+        <translation type="obsolete">&amp;Изменить</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Удалить</translation>
+        <translation type="obsolete">&amp;Удалить</translation>
     </message>
 </context>
 <context>
@@ -350,7 +365,7 @@
     </message>
     <message>
         <source>Contents</source>
-        <translation>Содержание</translation>
+        <translation type="obsolete">Содержание</translation>
     </message>
     <message>
         <source>Zoom out</source>
@@ -551,7 +566,7 @@
     </message>
     <message>
         <source>Pictures</source>
-        <translation>Иллюстрации</translation>
+        <translation type="obsolete">Иллюстрации</translation>
     </message>
     <message>
         <source>Paragraph</source>
@@ -559,7 +574,7 @@
     </message>
     <message>
         <source>Line end</source>
-        <translation>Конец строки</translation>
+        <translation type="obsolete">Конец строки</translation>
     </message>
     <message>
         <source>Clear format</source>
@@ -723,9 +738,14 @@
         <source>Fo&amp;rmat</source>
         <translation type="unfinished">Фо&amp;рмат</translation>
     </message>
-</context>
-<context>
-    <name>FbTextFrame</name>
+    <message>
+        <source>Contents</source>
+        <translation type="unfinished">Содержание</translation>
+    </message>
+    <message>
+        <source>Pictures</source>
+        <translation type="unfinished">Иллюстрации</translation>
+    </message>
     <message>
         <source>Web inspector</source>
         <translation type="unfinished"></translation>
@@ -847,6 +867,10 @@
         <source>+ Date</source>
         <translation>+ Дата</translation>
     </message>
+    <message>
+        <source>+ Simple text</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>