diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_input.h | 2 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 01055502c..9d36f670e 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -2387,7 +2387,6 @@ void KviInput::keyPressEvent(QKeyEvent *e) switch(e->key()) { case Qt::Key_Backspace: - //if(m_pMultiLineEditor) multilineEditorButtonToggled(!m_pMultiLineEditor); break; } @@ -2465,9 +2464,13 @@ void KviInput::multilineEditorButtonToggled(bool bOn) if(m_pMultiLineEditor) { if(bOn)return; + QString szTmp; + m_pMultiLineEditor->getText(szTmp); m_pLayout->removeWidget(m_pMultiLineEditor); KviScriptEditor::destroyInstance(m_pMultiLineEditor); m_pMultiLineEditor = 0; + szTmp.replace(QRegExp("[\a\f\n\r\t\v]"), QString(" ")); + m_pInputEditor->setText(szTmp); m_pInputEditor->show(); m_pWindow->childrenTreeChanged(0); m_pInputEditor->setFocus(); @@ -2478,6 +2481,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) QString szText = __tr2qs("<Ctrl+Return>; submits, <Ctrl+Backspace>; hides this editor"); m_pMultiLineEditor->setFindText(szText); m_pMultiLineEditor->setFindLineeditReadOnly(true); + m_pMultiLineEditor->setText(m_pInputEditor->text()); m_pInputEditor->hide(); m_pLayout->addWidget(m_pMultiLineEditor); m_pWindow->childrenTreeChanged(m_pMultiLineEditor); diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 71dafeb02..2c20090e8 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -228,7 +228,7 @@ public: QToolButton * m_pIconButton; QToolButton * m_pCommandlineModeButton; QToolButton * m_pHideToolsButton; - QHBoxLayout * m_pLayout; + QHBoxLayout * m_pLayout; protected: // virtual void resizeEvent(QResizeEvent * e); virtual void focusInEvent(QFocusEvent * e); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index b20f4ac43..6ed605fd5 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -1081,7 +1081,7 @@ void KviScriptEditorImplementation::setText(const QString &txt) {
m_pEditor->setText(txt);
// m_pEditor->setTextFormat(Qt::PlainText);
-// m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false);
+ m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false);
m_pEditor->document()->setModified(false);
updateRowColLabel();
}
|