aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-01-16 17:26:46 +0000
committerGravatar Fabio Bas2009-01-16 17:26:46 +0000
commitd3808f5cb44c986255b4266e7ffb353ebc0f64d7 (patch)
tree8cf014039f694af1ad39ad78206af76bef0c208b
parentupdated sources date (diff)
downloadKVIrc-d3808f5cb44c986255b4266e7ffb353ebc0f64d7.tar.gz
KVIrc-d3808f5cb44c986255b4266e7ffb353ebc0f64d7.tar.bz2
KVIrc-d3808f5cb44c986255b4266e7ffb353ebc0f64d7.zip
chnaged the inputline hotkeys so that they follow other sw standards
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2999 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--src/kvirc/ui/kvi_input.cpp3
-rw-r--r--src/kvirc/ui/kvi_input_editor.cpp6
2 files changed, 4 insertions, 5 deletions
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index f2d40a942..c4d9ed708 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -154,7 +154,6 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::Off);
m_pMultiEditorButton->setIcon(is2);
QString szTip = __tr2qs("Multi-line Editor<br>&lt;Alt+Backspace&gt;");
- szTip += " - &lt;Ctrl+Backspace&gt;";
KviTalToolTip::add(m_pMultiEditorButton,szTip);
connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool)));
@@ -324,7 +323,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, <Ctrl+Backspace>; hides this editor"));
+ m_pHelpLabel->setText(__tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; 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 b6705bf58..9ba66f544 100644
--- a/src/kvirc/ui/kvi_input_editor.cpp
+++ b/src/kvirc/ui/kvi_input_editor.cpp
@@ -1223,7 +1223,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e)
return;
}
- if((e->modifiers() & Qt::AltModifier) || (e->modifiers() & Qt::ControlModifier))
+ if((e->modifiers() & Qt::AltModifier))
{
switch(e->key())
{
@@ -1347,8 +1347,8 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e)
case Qt::Key_Y:
if(!m_bReadOnly) redo();
break;
- //case Qt::Key_Backspace:
- case Qt::Key_W:
+ case Qt::Key_Backspace:
+ //delete last word
if(m_iCursorPosition > 0 && !m_bReadOnly && !hasSelection())
{
// skip whitespace