From 38f1d820b108185773eceaf04d9eebddccdb688e Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Sun, 20 Apr 2014 18:53:10 +0000
Subject: [PATCH] Update richtexteditor

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3014 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 ico/32x32/simplifyrichtext.png      | Bin 0 -> 1933 bytes
 qelectrotech.qrc                    |   1 +
 sources/richtext/richtexteditor.cpp | 189 +++++++++++++++++++---------
 3 files changed, 130 insertions(+), 60 deletions(-)
 create mode 100644 ico/32x32/simplifyrichtext.png

diff --git a/ico/32x32/simplifyrichtext.png b/ico/32x32/simplifyrichtext.png
new file mode 100644
index 0000000000000000000000000000000000000000..e251cf7b9c248861f128d3508e2c1793679d935f
GIT binary patch
literal 1933
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

literal 0
HcmV?d00001

diff --git a/qelectrotech.qrc b/qelectrotech.qrc
index 64bd3cf9c..117c83ad8 100644
--- a/qelectrotech.qrc
+++ b/qelectrotech.qrc
@@ -227,5 +227,6 @@
         <file>ico/22x22/applications-development-translation.png</file>
         <file>ico/48x48/view-pim-journal.png</file>
         <file>ico/24x16/nl.png</file>
+        <file>ico/32x32/simplifyrichtext.png</file>
     </qresource>
 </RCC>
diff --git a/sources/richtext/richtexteditor.cpp b/sources/richtext/richtexteditor.cpp
index e7739265f..fa5e8eeaa 100644
--- a/sources/richtext/richtexteditor.cpp
+++ b/sources/richtext/richtexteditor.cpp
@@ -53,9 +53,9 @@
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QPointer>
-#include <QtCore/QProcess>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamAttributes>
 
 #include <QtGui/QAction>
 #include <QtGui/QColorDialog>
@@ -78,10 +78,103 @@
 
 QT_BEGIN_NAMESPACE
 
-//static const char *RichTextDialogC = "RichTextDialog";
-//static const char *Geometry = "Geometry";
+static const char RichTextDialogGroupC[] = "RichTextDialog";
+static const char GeometryKeyC[] = "Geometry";
+static const char TabKeyC[] = "Tab";
+
+const bool simplifyRichTextDefault = true;
 
 namespace qdesigner_internal {
+	// Richtext simplification filter helpers: Elements to be discarded
+	static inline bool filterElement(const QStringRef &name)
+	{
+		return name != QLatin1String("meta") && name != QLatin1String("style");
+	}
+
+	// Richtext simplification filter helpers: Filter attributes of elements
+	static inline void filterAttributes(const QStringRef &name,
+										QXmlStreamAttributes *atts,
+										bool *paragraphAlignmentFound)
+	{
+		typedef QXmlStreamAttributes::iterator AttributeIt;
+
+		if (atts->isEmpty())
+			return;
+
+		 // No style attributes for <body>
+		if (name == QLatin1String("body")) {
+			atts->clear();
+			return;
+		}
+
+		// Clean out everything except 'align' for 'p'
+		if (name == QLatin1String("p")) {
+			for (AttributeIt it = atts->begin(); it != atts->end(); ) {
+				if (it->name() == QLatin1String("align")) {
+					++it;
+					*paragraphAlignmentFound = true;
+				} else {
+					it = atts->erase(it);
+				}
+			}
+			return;
+		}
+	}
+
+	// Richtext simplification filter helpers: Check for blank QStringRef.
+	static inline bool isWhiteSpace(const QStringRef &in)
+	{
+		const int count = in.size();
+		for (int i = 0; i < count; i++)
+			if (!in.at(i).isSpace())
+				return false;
+		return true;
+	}
+
+	// Richtext simplification filter: Remove hard-coded font settings,
+	// <style> elements, <p> attributes other than 'align' and
+	// and unnecessary meta-information.
+	QString simplifyRichTextFilter(const QString &in, bool *isPlainTextPtr = 0)
+	{
+		unsigned elementCount = 0;
+		bool paragraphAlignmentFound = false;
+		QString out;
+		QXmlStreamReader reader(in);
+		QXmlStreamWriter writer(&out);
+		writer.setAutoFormatting(false);
+		writer.setAutoFormattingIndent(0);
+
+		while (!reader.atEnd()) {
+			switch (reader.readNext()) {
+			case QXmlStreamReader::StartElement:
+				elementCount++;
+				if (filterElement(reader.name())) {
+					const QStringRef name = reader.name();
+					QXmlStreamAttributes attributes = reader.attributes();
+					filterAttributes(name, &attributes, &paragraphAlignmentFound);
+					writer.writeStartElement(name.toString());
+					if (!attributes.isEmpty())
+						writer.writeAttributes(attributes);
+				} else {
+					reader.readElementText(); // Skip away all nested elements and characters.
+				}
+				break;
+			case QXmlStreamReader::Characters:
+				if (!isWhiteSpace(reader.text()))
+					writer.writeCharacters(reader.text().toString());
+				break;
+			case QXmlStreamReader::EndElement:
+				writer.writeEndElement();
+				break;
+			default:
+				break;
+			}
+		}
+		// Check for plain text (no spans, just <html><head><body><p>)
+		if (isPlainTextPtr)
+			*isPlainTextPtr = !paragraphAlignmentFound && elementCount == 4u; //
+		return out;
+	}
 
 class RichTextEditor : public QTextEdit
 {
@@ -91,6 +184,7 @@ public:
     void setDefaultFont(const QFont &font);
 
     QToolBar *createToolBar(QWidget *parent = 0);
+    bool simplifyRichText() const      { return m_simplifyRichText; }
 
 public slots:
     void setFontBold(bool b);
@@ -100,6 +194,10 @@ public slots:
 
 signals:
     void stateChanged();
+    void simplifyRichTextChanged(bool);
+
+private:
+    bool m_simplifyRichText;
 };
 
 class AddLinkDialog : public QDialog
@@ -293,7 +391,7 @@ private slots:
     void setVAlignSub(bool sub);
     void insertLink();
     void insertImage();
-    void runXmlPatterns();
+
 
 private:
     QAction *m_bold_action;
@@ -307,7 +405,7 @@ private:
     QAction *m_align_justify_action;
     QAction *m_link_action;
     QAction *m_image_action;
-    QAction *m_xmlPatterns;
+    QAction *m_simplify_richtext_action;
     ColorAction *m_color_action;
     QComboBox *m_font_size_input;
 
@@ -338,11 +436,6 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
     m_editor(editor)
 {
 
-    m_xmlPatterns = new QAction("Run XMLPatterns", this);
-    connect(m_xmlPatterns, SIGNAL(triggered()), this, SLOT(runXmlPatterns()));
-    addAction(m_xmlPatterns);
-	m_xmlPatterns -> setVisible( false );
-	
     // Font size combo box
     m_font_size_input->setEditable(false);
     const QList<int> font_sizes = QFontDatabase::standardSizes();
@@ -353,7 +446,6 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
             this, SLOT(sizeInputActivated(QString)));
     addWidget(m_font_size_input);
 
-    addSeparator();
 
     // Bold, italic and underline buttons
 
@@ -375,7 +467,6 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
     m_underline_action->setShortcut(tr("CTRL+U"));
     addAction(m_underline_action);
 
-    addSeparator();
 
     // Left, center, right and justified alignment buttons
 
@@ -404,10 +495,9 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
     addAction(m_align_justify_action);
 
 	m_align_justify_action -> setVisible( false );
-	m_align_center_action  -> setVisible( false );
-	m_align_left_action   -> setVisible( false );
-	m_align_right_action   -> setVisible( false );
-    //addSeparator();
+    m_align_center_action -> setVisible( false );
+    m_align_left_action -> setVisible( false );
+    m_align_right_action -> setVisible( false );
 
     // Superscript and subscript buttons
 
@@ -426,8 +516,6 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
 	m_valign_sup_action -> setVisible( false );
 	m_valign_sub_action -> setVisible( false );
 
-    //addSeparator();
-
     // Insert hyperlink and image buttons
 
 	m_link_action->setText(tr("Ins\351rer un lien"));
@@ -443,13 +531,23 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor,
 
 	// Text color button
 	connect(m_color_action, SIGNAL(colorChanged(QColor)),
-            this, SLOT(colorChanged(QColor)));
-    addAction(m_color_action);
+		 this, SLOT(colorChanged(QColor)));
+   addAction(m_color_action);
 
-    connect(editor, SIGNAL(textChanged()), this, SLOT(updateActions()));
-    connect(editor, SIGNAL(stateChanged()), this, SLOT(updateActions()));
 
-    updateActions();
+   // Simplify rich text
+   m_simplify_richtext_action = createCheckableAction(
+	QIcon(":/ico/32x32/simplifyrichtext.png"),
+			 tr("Simplify Rich Text"), editor, SLOT(setSimplifyRichText(bool)),this);
+   m_simplify_richtext_action->setChecked(editor->simplifyRichText());
+   connect(m_editor, SIGNAL(simplifyRichTextChanged(bool)),
+   m_simplify_richtext_action, SLOT(setChecked(bool)));
+   addAction(m_simplify_richtext_action);
+
+   connect(editor, SIGNAL(textChanged()), this, SLOT(updateActions()));
+   connect(editor, SIGNAL(stateChanged()), this, SLOT(updateActions()));
+
+   updateActions();
 }
 
 void RichTextEditorToolBar::alignmentActionTriggered(QAction *action)
@@ -469,37 +567,8 @@ void RichTextEditorToolBar::alignmentActionTriggered(QAction *action)
     m_editor->setAlignment(new_alignment);
 }
 
-QString runXSLT(const QString &t)
-{
-    QString pattern = QDir::tempPath();
-    if (!pattern.endsWith('/'))
-        pattern += '/';
-    pattern += "qt_tempXXXXXX.html";
-    QTemporaryFile tf(pattern);
-    if (!tf.open())
-        return QLatin1String("Open failure");
-    const QString tfName = tf.fileName();
-    tf.write(t.toUtf8());
-    tf.close();
-    QProcess p;
-    QStringList args;
-    args << "tohtml.xsl" << tfName;
-    p.start("xmlpatterns",args);
-    if (!p.waitForStarted() || !p.waitForFinished())
-        return QLatin1String("Run failure");
-    const QByteArray output = p.exitStatus() == QProcess::NormalExit &&
-                           p.exitCode() == 0 ?
-                           p.readAllStandardOutput() :
-                           p.readAllStandardError();
-    return QString::fromUtf8(output);
-}
 
 
-void RichTextEditorToolBar::runXmlPatterns()
-{
-    qWarning("%s", qPrintable(runXSLT(m_editor->text(Qt::RichText))));
-}
-
 void RichTextEditorToolBar::colorChanged(const QColor &color)
 {
     m_editor->setTextColor(color);
@@ -649,15 +718,16 @@ QString RichTextEditor::text(Qt::TextFormat format) const
     case Qt::PlainText:
         return toPlainText();
     case Qt::RichText:
-        return toHtml();
+    return m_simplifyRichText ? simplifyRichTextFilter(toHtml()) : toHtml();
     case Qt::AutoText:
         break;
     }
     const QString html = toHtml();
-    const QString plain = toPlainText();
-    QTextEdit tester;
-    tester.setPlainText(plain);
-    return tester.toHtml() == html ? plain : html;
+    bool isPlainText;
+    const QString simplifiedHtml = simplifyRichTextFilter(html, &isPlainText);
+    if (isPlainText)
+    return toPlainText();
+    return m_simplifyRichText ? simplifiedHtml : html;
 }
 
 RichTextEditorDialog::RichTextEditorDialog(QWidget *parent)  :
@@ -771,7 +841,6 @@ void RichTextEditorDialog::tabIndexChanged(int newIndex)
 
     if (newIndex == SourceIndex) {
         const QString html = m_editor->text(Qt::RichText);
-        qWarning("%s", qPrintable(runXSLT(html)));
         m_text_edit->setPlainText(html);
 
     } else