View | Details | Raw Unified | Return to bug 8631
Collapse All | Expand All

(-)vyqchat-0.2.8.orig/src/msgrcvwin.cpp (+17 lines)
Lines 28-33 Link Here
28
	msg->setTextFormat(PlainText);
28
	msg->setTextFormat(PlainText);
29
	msg->setFocusPolicy(NoFocus);
29
	msg->setFocusPolicy(NoFocus);
30
	rpl->setTextFormat(PlainText);
30
	rpl->setTextFormat(PlainText);
31
	rpl->installEventFilter(this);
31
	rpl->setFocus();
32
	rpl->setFocus();
32
	l1->addWidget(msg);
33
	l1->addWidget(msg);
33
	l1->addWidget(rpl);
34
	l1->addWidget(rpl);
Lines 54-59 Link Here
54
{
55
{
55
}/*}}}*/
56
}/*}}}*/
56
57
58
bool MessageRcvWindow::eventFilter(QObject *target, QEvent *event)
59
{
60
	if (target == rpl) {
61
		if (event->type() == QEvent::KeyPress) {
62
			QKeyEvent *keyEvent = (QKeyEvent *)event;
63
			if (((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return))
64
					&& (keyEvent->state() & Qt::ControlButton)) {
65
				replyPressed();
66
				return true;
67
			}
68
		}
69
	}
70
	return QWidget::eventFilter(target, event);
71
}
72
73
57
/*-----------------------------------------------------------------------------------------------------
74
/*-----------------------------------------------------------------------------------------------------
58
 * 
75
 * 
59
 *                                            S L O T S
76
 *                                            S L O T S
(-)vyqchat-0.2.8.orig/src/msgrcvwin.h (+1 lines)
Lines 38-43 Link Here
38
	public:
38
	public:
39
		MessageRcvWindow(const QString &from, const QString &msg);
39
		MessageRcvWindow(const QString &from, const QString &msg);
40
		virtual ~MessageRcvWindow();
40
		virtual ~MessageRcvWindow();
41
		bool eventFilter(QObject *target, QEvent *event);
41
};
42
};
42
43
43
#endif
44
#endif
(-)vyqchat-0.2.8.orig/src/msgsndwin.cpp (+18 lines)
Lines 24-29 Link Here
24
	QBoxLayout *l1 = new QVBoxLayout(this);
24
	QBoxLayout *l1 = new QVBoxLayout(this);
25
	msg = new QTextEdit(this);
25
	msg = new QTextEdit(this);
26
	msg->setTextFormat(PlainText);
26
	msg->setTextFormat(PlainText);
27
	msg->installEventFilter(this);
27
	l1->addWidget(msg);
28
	l1->addWidget(msg);
28
	
29
	
29
	QBoxLayout *bl = new QHBoxLayout(l1);
30
	QBoxLayout *bl = new QHBoxLayout(l1);
Lines 43-48 Link Here
43
{
44
{
44
}/*}}}*/
45
}/*}}}*/
45
46
47
48
bool MessageSndWindow::eventFilter(QObject *target, QEvent *event)
49
{
50
	if (target == msg) { 
51
		if (event->type() == QEvent::KeyPress) { 
52
			QKeyEvent *keyEvent = (QKeyEvent *)event; 
53
			if (((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return))
54
					&& (keyEvent->state() & Qt::ControlButton)) {
55
				sendPressed();
56
				return true; 
57
			}
58
		}
59
	}
60
	return QWidget::eventFilter(target, event);
61
}
62
63
46
/*-----------------------------------------------------------------------------------------------------
64
/*-----------------------------------------------------------------------------------------------------
47
 * 
65
 * 
48
 *                                            S L O T S
66
 *                                            S L O T S
(-)vyqchat-0.2.8.orig/src/msgsndwin.h (+1 lines)
Lines 36-41 Link Here
36
	public:
36
	public:
37
		MessageSndWindow(const QString &to);
37
		MessageSndWindow(const QString &to);
38
		virtual ~MessageSndWindow();
38
		virtual ~MessageSndWindow();
39
		bool eventFilter(QObject *target, QEvent *event);
39
};
40
};
40
41
41
#endif
42
#endif

Return to bug 8631