diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 31 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_input.h | 14 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_input_editor.cpp | 2 |
3 files changed, 11 insertions, 36 deletions
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index cfcc07b2e..f7360d009 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -40,7 +40,7 @@ #include "kvi_scripteditor.h" #include "kvi_historywin.h" #include "kvi_userinput.h" -//#include "kvi_shortcuts.h" +#include "kvi_shortcuts.h" #include "kvi_tal_popupmenu.h" #include "kvi_tal_hbox.h" #include "kvi_tal_tooltip.h" @@ -58,7 +58,7 @@ #include <QMouseEvent> #include <QUrl> #include <QHBoxLayout> -//#include <QShortcut> +#include <QShortcut> #include <ctype.h> #include <stdlib.h> @@ -171,10 +171,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) m_pLayout->addWidget(m_pButtonContainer,0,1,2,1); m_pLayout->addWidget(m_pInputEditor,0,0,2,1); - /* - FIXME: see toggleMultiLine() installShortcuts(); - */ } KviInput::~KviInput() @@ -214,31 +211,14 @@ void KviInput::inputEditorEnterPressed() m_pInputEditor->setText(""); } -/* -FIXME: see toggleMultiLine() void KviInput::installShortcuts() { - new QShortcut(QKeySequence(KVI_SHORTCUTS_MULTILINE_OPEN),this,SLOT(toggleMultiLine()),0,Qt::WidgetShortcut); - new QShortcut(QKeySequence(KVI_SHORTCUTS_MULTILINE_OPEN_2),this,SLOT(toggleMultiLine()),0,Qt::WidgetShortcut); + new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_MULTILINE),this,SLOT(toggleMultiLine()),0,Qt::WidgetWithChildrenShortcut); + new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_MULTILINE_2),this,SLOT(toggleMultiLine()),0,Qt::WidgetWithChildrenShortcut); } -*/ void KviInput::keyPressEvent(QKeyEvent * e) { - //FIXME: this block of code have to be removed if QShortcut will work; see toggleMultiLine() - if(e->modifiers() & Qt::AltModifier) - { - switch(e->key()) - { - case Qt::Key_Enter: - case Qt::Key_Return: - { - multiLineEditorButtonToggled(!m_pMultiLineEditor); - } - break; - } - } - if(e->modifiers() & Qt::ControlModifier) { switch(e->key()) @@ -445,13 +425,10 @@ QString KviInput::text() return szText; } -/* -FIXME: with the shortcut, it opens the multiline but then it can't close it void KviInput::toggleMultiLine() { multiLineEditorButtonToggled(!m_pMultiLineEditor); } -*/ /* @doc: commandline diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 6f893dfce..99ef0bde1 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -170,7 +170,7 @@ public: */ inline KviInputHistory * history(){ return KviInputHistory::instance(); }; protected: - //void installShortcuts(); + void installShortcuts(); virtual void focusInEvent(QFocusEvent * e); virtual void setFocusProxy(QWidget * w); virtual void keyPressEvent(QKeyEvent * e); @@ -205,12 +205,12 @@ public slots: * \return void */ void toggleToolButtons(); -//private slots: -// /** -// * \brief Toggles multiline -// * \return void -// */ -// void toggleMultiLine(); +private slots: + /** + * \brief Toggles multiline + * \return void + */ + void toggleMultiLine(); }; #endif //_KVI_INPUT_H_ diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index 2d5bcd8da..f4d93d136 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -1268,8 +1268,6 @@ void KviInputEditor::inputMethodEvent(QInputMethodEvent * e) void KviInputEditor::installShortcuts() { - new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_MULTILINE),this,SLOT(toggleMultiLineEditor()),0,Qt::WidgetShortcut); - new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_MULTILINE_2),this,SLOT(toggleMultiLineEditor()),0,Qt::WidgetShortcut); new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_HISTORY),this,SLOT(openHistory()),0,Qt::WidgetShortcut); new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_HISTORY_PREV),this,SLOT(historyPrev()),0,Qt::WidgetShortcut); new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_HISTORY_NEXT),this,SLOT(historyNext()),0,Qt::WidgetShortcut); |