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
#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;
bcview().setOK(dialog_->okPB);
bcview().setCancel(dialog_->closePB);
bcview().addReadOnly(dialog_->symbolED);
- bcview().addReadOnly(dialog_->descrED);
+ bcview().addReadOnly(dialog_->descriptionTE);
bcview().addReadOnly(dialog_->prefixED);
}
{
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());
}
{
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
#include <QLineEdit>
#include <QWhatsThis>
#include <QCloseEvent>
+#include <QTextEdit>
namespace lyx {
namespace frontend {
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);
}
<rect>
<x>0</x>
<y>0</y>
- <width>248</width>
- <height>136</height>
+ <width>254</width>
+ <height>165</height>
</rect>
</property>
<property name="windowTitle" >
<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" >
<string>&Description:</string>
</property>
<property name="buddy" >
- <cstring>descrED</cstring>
+ <cstring>descriptionTE</cstring>
</property>
</widget>
</item>
</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>