Changes: In WG text entries, add multiline MRTE and remove extra spacing at bottom

RevBy: Viacheslav Sobolev
Details: Multi-line rich text edit allows more user interactions (see for
example NB#168075, or text formatting in general). Also, the extra spacing at
the bottom of the text entries page was only added to hide a bug (NB#175181).
Please think twice before adding workarounds in demos. Try to report bugs
instead.

2 files changed, 46 insertions, 37 deletions

diff --git a/demos/widgetsgallery/textentrypage.cpp b/demos/widgetsgallery/textentrypage.cpp
index 8d1a77eb..a030bfaa 100644
--- a/demos/widgetsgallery/textentrypage.cpp
+++ b/demos/widgetsgallery/textentrypage.cpp
@@ -502,6 +502,18 @@ void TextEntryPage::createContent()
     layoutPolicy->addItem(Entries.at(row), row, 1);
     row++;
 
+    // multiline rich text entry
+    Entries << new MRichTextEdit(MTextEditModel::MultiLine, "", centralWidget());
+
+    label10 = new MLabel(centralWidget());
+    label10->setWordWrap(true);
+    label10->setMinimumWidth(MaxminLabelWidth);
+    label10->setMaximumWidth(MaxminLabelWidth);
+    label10->setAlignment(Qt::AlignTop);
+    layoutPolicy->addItem(label10, row, 0);
+    layoutPolicy->addItem(Entries.at(row), row, 1);
+    row++;
+
     //direct input custom widget.
     directIMWidget = new CustomDirectIMWidget(centralWidget());
     labelDirectIM = new MLabel(centralWidget());
@@ -560,13 +572,6 @@ void TextEntryPage::createContent()
     connect(button1, SIGNAL(toggled(bool)), this, SLOT(changeAutoCapitalisation(bool)));
     connect(button2, SIGNAL(toggled(bool)), this, SLOT(changeErrorCorrection(bool)));
 
-    //add an empty lable here, then the lower textenties won't be covered by vkb
-    labelHeader1 = new MLabel(centralWidget());
-    labelHeader1->setMinimumHeight(350);
-    labelHeader1->setMaximumHeight(350);
-    layoutPolicy->addItem(labelHeader1, row, 0);
-    row++;
-
     layoutPolicy->setColumnMinimumWidth(1, MiniminTextEntryWidth);
 
     // switch on Auto Capitalistaion and error correction
@@ -596,7 +601,7 @@ void TextEntryPage::retranslateUi()
 
     //% "Free text:"
     label0->setText(qtTrId("xx_textentry_free_text"));
-    //% "Free text(masked):"
+    //% "Free text (masked):"
     label1->setText(qtTrId("xx_textentry_free_text_masked"));
     //% "Number text:"
     label2->setText(qtTrId("xx_textentry_number_text"));
@@ -604,7 +609,7 @@ void TextEntryPage::retranslateUi()
     label3->setText(qtTrId("xx_textentry_phone_number"));
     //% "Email text:"
     label4->setText(qtTrId("xx_textentry_email_text"));
-    //% "Url text:"
+    //% "URL text:"
     label5->setText(qtTrId("xx_textentry_url_text"));
     //% "Multiline:"
     label6->setText(qtTrId("xx_textentry_multiline"));
@@ -612,21 +617,23 @@ void TextEntryPage::retranslateUi()
     label7->setText(qtTrId("xx_textentry_singleselectall"));
     //% "Email suggestion text:"
     label8->setText(qtTrId("xx_textentry_completion_text"));
-    //% "Rich Text:"
+    //% "Rich text:"
     label9->setText(qtTrId("xx_textentry_richtext_text"));
+    //% "Rich text (multiline):"
+    label10->setText(qtTrId("xx_textentry_richtext_text_multiline"));
 
-    //% "No Echo mode:"
+    //% "No echo mode:"
     labelNoEcho->setText(qtTrId("xx_textentry_noecho"));
 
     //% "Echo on edit:"
     labelEchoOnEdit->setText(qtTrId("xx_textentry_echoonedit"));
 
-    //% "Direct Input Mode:"
+    //% "Direct input mode:"
     labelDirectIM->setText(qtTrId("xx_textentry_direct_input_mode"));
 
-    //% "Custom ToolBar 1:"
+    //% "Custom toolbar 1:"
     labelCustomToolbar1->setText(qtTrId("xx_textentry_custom_toolbar1"));
-    //% "Custom ToolBar 2:"
+    //% "Custom toolbar 2:"
     labelCustomToolbar2->setText(qtTrId("xx_textentry_custom_toolbar2"));
 
     //% "Auto capitalisation"
@@ -659,10 +666,10 @@ void TextEntryPage::changeAutoCapitalisation(bool val)
     }
 
     if (val)
-        //% "Auto Capitalisation is active"
+        //% "Auto capitalisation is active"
         Entries.at(9)->setPrompt(qtTrId("xx_auto_true_entry0"));
     else
-        //% "No Auto Capitalisation"
+        //% "No auto capitalisation"
         Entries.at(9)->setPrompt(qtTrId("xx_auto_false_entry0"));
 }
 
diff --git a/demos/widgetsgallery/textentrypage.h b/demos/widgetsgallery/textentrypage.h
index 81756daf..54454e62 100644
--- a/demos/widgetsgallery/textentrypage.h
+++ b/demos/widgetsgallery/textentrypage.h
@@ -24,6 +24,7 @@
 
 #include "templatepage.h"
 #include <MTextEdit>
+#include <QPointer>
 
 class MWidget;
 class MLabel;
@@ -70,25 +71,26 @@ protected:
     virtual void retranslateUi();
 
 private:
-    MLabel *label0;
-    MLabel *label1;
-    MLabel *label2;
-    MLabel *label3;
-    MLabel *label4;
-    MLabel *label5;
-    MLabel *label6;
-    MLabel *label7;
-    MLabel *label8;
-    MLabel *label9;
-    MLabel *labelNoEcho;
-    MLabel *labelEchoOnEdit;
-    MLabel *labelDirectIM;
-    MLabel *labelCustomToolbar1;
-    MLabel *labelCustomToolbar2;
-
-    MLabel *labelHeader1;
-    MButton *button1;
-    MButton *button2;
+    QPointer<MLabel> label0;
+    QPointer<MLabel> label1;
+    QPointer<MLabel> label2;
+    QPointer<MLabel> label3;
+    QPointer<MLabel> label4;
+    QPointer<MLabel> label5;
+    QPointer<MLabel> label6;
+    QPointer<MLabel> label7;
+    QPointer<MLabel> label8;
+    QPointer<MLabel> label9;
+    QPointer<MLabel> label10;
+    QPointer<MLabel> labelNoEcho;
+    QPointer<MLabel> labelEchoOnEdit;
+    QPointer<MLabel> labelDirectIM;
+    QPointer<MLabel> labelCustomToolbar1;
+    QPointer<MLabel> labelCustomToolbar2;
+
+    QPointer<MLabel> labelHeader1;
+    QPointer<MButton> button1;
+    QPointer<MButton> button2;
 
     QList<MLabel *> labels;
     QList<MTextEdit *> Entries;
@@ -96,8 +98,8 @@ private:
     bool m_autoCapitalisation;
     bool m_errorCorrection;
 
-    MCompleter *m_completer;
-    CustomDirectIMWidget *directIMWidget;
+    QPointer<MCompleter> m_completer;
+    QPointer<CustomDirectIMWidget> directIMWidget;
 };
 
 #endif