Commit 681f4053 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Merge remote-tracking branch 'origin/release/20.08'

parents 5c3b67ca 82590da1
Pipeline #38964 passed with stage
in 12 minutes and 46 seconds
...@@ -135,7 +135,6 @@ QDomDocument EditAnnotToolDialog::toolXml() const ...@@ -135,7 +135,6 @@ QDomDocument EditAnnotToolDialog::toolXml() const
engineElement.appendChild(annotationElement); engineElement.appendChild(annotationElement);
const QString color = m_stubann->style().color().name(QColor::HexArgb); const QString color = m_stubann->style().color().name(QColor::HexArgb);
const QString textColor = static_cast<Okular::TextAnnotation *>(m_stubann)->textColor().name();
const QString opacity = QString::number(m_stubann->style().opacity()); const QString opacity = QString::number(m_stubann->style().opacity());
const QString width = QString::number(m_stubann->style().width()); const QString width = QString::number(m_stubann->style().width());
...@@ -251,6 +250,7 @@ QDomDocument EditAnnotToolDialog::toolXml() const ...@@ -251,6 +250,7 @@ QDomDocument EditAnnotToolDialog::toolXml() const
annotationElement.setAttribute(QStringLiteral("icon"), sa->stampIconName()); annotationElement.setAttribute(QStringLiteral("icon"), sa->stampIconName());
} else if (toolType == ToolTypewriter) { } else if (toolType == ToolTypewriter) {
Okular::TextAnnotation *ta = static_cast<Okular::TextAnnotation *>(m_stubann); Okular::TextAnnotation *ta = static_cast<Okular::TextAnnotation *>(m_stubann);
const QString textColor = ta->textColor().name();
toolElement.setAttribute(QStringLiteral("type"), QStringLiteral("typewriter")); toolElement.setAttribute(QStringLiteral("type"), QStringLiteral("typewriter"));
engineElement.setAttribute(QStringLiteral("type"), QStringLiteral("PickPoint")); engineElement.setAttribute(QStringLiteral("type"), QStringLiteral("PickPoint"));
engineElement.setAttribute(QStringLiteral("block"), QStringLiteral("true")); engineElement.setAttribute(QStringLiteral("block"), QStringLiteral("true"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment