diff options
| author |  Fabio Bas | 2009-08-01 12:24:42 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-08-01 12:24:42 +0000 |
| commit | bcff2a5b76e3d41f62358dcc3a2f912d817bd8e6 (patch) | |
| tree | 01266efc840208d05d78b56550b57bb2d8441cad | |
| parent | a small fix to tree_window_list (diff) | |
| download | KVIrc-bcff2a5b76e3d41f62358dcc3a2f912d817bd8e6.tar.gz KVIrc-bcff2a5b76e3d41f62358dcc3a2f912d817bd8e6.tar.bz2 KVIrc-bcff2a5b76e3d41f62358dcc3a2f912d817bd8e6.zip | |
Changed multiline-editor toggle command from alt+backspace to alt+return: fixes #508 in a cross-os compatible way
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3399 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 9 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_input_editor.cpp | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 072934a9b..3265e3121 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -149,7 +149,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::On); is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::Off); m_pMultiEditorButton->setIcon(is2); - QString szTip = __tr2qs("Multi-line Editor<br><Alt+Backspace>"); + QString szTip = __tr2qs("Multi-line Editor<br><Alt+Return>"); KviTalToolTip::add(m_pMultiEditorButton,szTip); connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool))); @@ -211,11 +211,12 @@ void KviInput::keyPressEvent(QKeyEvent *e) { //debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().toUtf8().data()); - if((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier) || (e->modifiers() & Qt::MetaModifier)) + if(e->modifiers() & Qt::AltModifier) { switch(e->key()) { - case Qt::Key_Backspace: + case Qt::Key_Enter: + case Qt::Key_Return: multilineEditorButtonToggled(!m_pMultiLineEditor); break; } @@ -319,7 +320,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) m_pHelpLabel = new QLabel(); m_pHelpLabel->setIndent(5); // we only want a left margin here - m_pHelpLabel->setText(__tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor")); + m_pHelpLabel->setText(__tr2qs("<Ctrl+Return>; submits, <Alt+Return>; hides this editor")); m_pLayout->addWidget(m_pHelpLabel,0,0,1,1); m_pMultiLineEditor = KviScriptEditor::createInstance(this); diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index cf233726b..6544bda88 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -1237,7 +1237,8 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e) { switch(e->key()) { - case Qt::Key_Backspace: + case Qt::Key_Enter: + case Qt::Key_Return: if(m_pInputParent->inherits("KviInput")) { ((KviInput*)(m_pInputParent))->multiLinePaste(m_szTextBuffer); |