diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-09-24 21:37:21 +0400 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-09-24 21:37:21 +0400 |
| commit | 4e4a6a5ca8638898f17e009b45fca978f540f3ff (patch) | |
| tree | cf01bbcdc0c68bddaea4c3453879bfab0a9b76c9 /src/mumble/ACLEditor.cpp | |
| parent | 0419b34c0d4fdc5625305d2f11868f3e31c85572 (diff) | |
Rich Text Editor
Diffstat (limited to 'src/mumble/ACLEditor.cpp')
| -rw-r--r-- | src/mumble/ACLEditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index 8ca298a29..f9a7599de 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -100,7 +100,7 @@ ACLEditor::ACLEditor(int channelid, const MumbleProto::ACL &mea, QWidget *p) : Q qleChannelName->setText(pChannel->qsName); if (channelid == 0) qleChannelName->setEnabled(false); - qteChannelDescription->setPlainText(pChannel->qsDesc); + rteChannelDescription->setText(pChannel->qsDesc); qsbChannelPosition->setRange(INT_MIN, INT_MAX); qsbChannelPosition->setValue(pChannel->iPosition); @@ -253,7 +253,7 @@ void ACLEditor::accept() { if (bAddChannelMode) { MumbleProto::ChannelState mpcs; mpcs.set_name(u8(qleChannelName->text())); - mpcs.set_description(u8(qteChannelDescription->toPlainText())); + mpcs.set_description(u8(rteChannelDescription->text())); mpcs.set_parent(iChannel); mpcs.set_position(qsbChannelPosition->value()); mpcs.set_temporary(qcbChannelTemporary->isChecked()); @@ -269,8 +269,8 @@ void ACLEditor::accept() { mpcs.set_name(u8(qleChannelName->text())); b = true; } - if (pChannel->qsDesc != qteChannelDescription->toPlainText()) { - mpcs.set_description(u8(qteChannelDescription->toPlainText())); + if (rteChannelDescription->isModified() && (pChannel->qsDesc != rteChannelDescription->text())) { + mpcs.set_description(u8(rteChannelDescription->text())); b = true; } if (pChannel->iPosition != qsbChannelPosition->value()) { |