Fix bug 3413:

http://bugzilla.lyx.org/show_bug.cgi?id=3413

* ui/QNomenclUi.ui
  - description field: replace LineEdit with TexEdit

* QNomencl.C: take care of the \n <-> \\ conversion in the description field.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17748 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QNomencl.C b/src/frontends/qt4/QNomencl.C
index df0ee3aafdce74d8674cce325aa597782e84071c..8a50ecbbe398282c2b1a368cda2280ac179ccea0 100644 (file)
--- a/src/frontends/qt4/QNomencl.C
+++ b/src/frontends/qt4/QNomencl.C
@@ -19,9 +19,10 @@
 #include "QNomencl.h"
 #include "Qt2BC.h"
 #include "ButtonController.h"
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTextEdit>
 
 using std::string;
 
@@ -44,7 +45,7 @@ void QNomencl::build_dialog()
        bcview().setOK(dialog_->okPB);
        bcview().setCancel(dialog_->closePB);
        bcview().addReadOnly(dialog_->symbolED);
-       bcview().addReadOnly(dialog_->descrED);
+       bcview().addReadOnly(dialog_->descriptionTE);
        bcview().addReadOnly(dialog_->prefixED);
 }
 
@@ -53,7 +54,9 @@ void QNomencl::update_contents()
 {
        dialog_->prefixED->setText(toqstr(controller().params()["prefix"]));
        dialog_->symbolED->setText(toqstr(controller().params()["symbol"]));
-       dialog_->descrED->setText(toqstr(controller().params()["description"]));
+       QString description = toqstr(controller().params()["description"]);
+       description.replace("\\\\","\n");
+       dialog_->descriptionTE->setPlainText(description);
 
        bc().valid(isValid());
 }
@@ -63,13 +66,16 @@ void QNomencl::apply()
 {
        controller().params()["prefix"] = qstring_to_ucs4(dialog_->prefixED->text());
        controller().params()["symbol"] = qstring_to_ucs4(dialog_->symbolED->text());
-       controller().params()["description"] = qstring_to_ucs4(dialog_->descrED->text());
+       QString description = dialog_->descriptionTE->toPlainText();
+       description.replace('\n',"\\\\");
+       controller().params()["description"] = qstring_to_ucs4(description);
 }
 
 
 bool QNomencl::isValid()
 {
-       return (!dialog_->symbolED->text().isEmpty() && !dialog_->descrED->text().isEmpty());
+       QString const description = dialog_->descriptionTE->toPlainText();
+       return !dialog_->symbolED->text().isEmpty() && !description.isEmpty();
 }
 
 } // namespace frontend

diff --git a/src/frontends/qt4/QNomenclDialog.C b/src/frontends/qt4/QNomenclDialog.C
index 1e0788b1b65b2e53841f2a79db155f0f8441cf5c..7e1ce53132432e81e7fd60060a08ce6e88c8cc51 100644 (file)
--- a/src/frontends/qt4/QNomenclDialog.C
+++ b/src/frontends/qt4/QNomenclDialog.C
@@ -20,6 +20,7 @@
 #include <QLineEdit>
 #include <QWhatsThis>
 #include <QCloseEvent>
+#include <QTextEdit>
 
 namespace lyx {
 namespace frontend {
@@ -33,10 +34,10 @@ QNomenclDialog::QNomenclDialog(QNomencl * form)
        connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose()));
        connect(symbolED, SIGNAL(textChanged(const QString&)),
                this, SLOT(change_adaptor()));
-       connect(descrED, SIGNAL(textChanged(const QString&)),
+       connect(descriptionTE, SIGNAL(textChanged()),
                this, SLOT(change_adaptor()));
 
-       setFocusProxy(descrED);
+       setFocusProxy(descriptionTE);
 }
 
 

diff --git a/src/frontends/qt4/ui/QNomenclUi.ui b/src/frontends/qt4/ui/QNomenclUi.ui
index 27a10f4d0daac5f6bf19d451d9d273860be2e6a1..9fd6eef585b31e2437375e81fb1ec42b98464ca2 100644 (file)
--- a/src/frontends/qt4/ui/QNomenclUi.ui
+++ b/src/frontends/qt4/ui/QNomenclUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>248</width>
-    <height>136</height>
+    <width>254</width>
+    <height>165</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -25,9 +25,6 @@
    <item row="2" column="1" >
     <widget class="QLineEdit" name="prefixED" />
    </item>
-   <item row="1" column="1" >
-    <widget class="QLineEdit" name="descrED" />
-   </item>
    <item row="2" column="0" >
     <widget class="QLabel" name="prefixLA" >
      <property name="text" >
@@ -44,7 +41,7 @@
       <string>&amp;Description:</string>
      </property>
      <property name="buddy" >
-      <cstring>descrED</cstring>
+      <cstring>descriptionTE</cstring>
      </property>
     </widget>
    </item>
@@ -111,12 +108,14 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="1" >
+    <widget class="QTextEdit" name="descriptionTE" />
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>symbolED</tabstop>
-  <tabstop>descrED</tabstop>
   <tabstop>prefixED</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>closePB</tabstop>