Attachment #49780 for bug #116778

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




#include <stdlib.h>

QMultiInputContext::QMultiInputContext()
    : QInputContext(),  current(-1)
{
    QStringList keys = QInputContextFactory::keys();
    for (int i = keys.size()-1; i >= 0; --i)


void QMultiInputContext::setFocusWidget(QWidget *w)
{
    QInputContext::setFocusWidget(w);
    if (slave())
	slave()->setFocusWidget(w);
}

QWidget *QMultiInputContext::focusWidget() const
{
    return fw;
}

void QMultiInputContext::widgetDestroyed(QWidget *w)
{
    if (slave())

Lines 71-77 Link Here

(-)src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h.old (-2 lines)
71		71
72	QList<QAction *> actions();	72	QList<QAction *> actions();
73		73
74	QWidget *focusWidget() const;
75	void setFocusWidget(QWidget *w);	74	void setFocusWidget(QWidget *w);
76		75
77	void widgetDestroyed( QWidget *w );	76	void widgetDestroyed( QWidget *w );
Lines 82-88 Link Here
82	protected slots:	81	protected slots:
83	void changeSlave(QAction *);	82	void changeSlave(QAction *);
84	private:	83	private:
85	QWidget *fw;
86	int current;	84	int current;
87	QList<QInputContext *> slaves;	85	QList<QInputContext *> slaves;
88	QMenu *menu;	86	QMenu *menu;

Lines 10-14 Link Here

(-)src/plugins/inputmethods/imsw-multi/imsw-multi.pro.old (-1 / +1 lines)
10	SOURCES += qmultiinputcontext.cpp \	10	SOURCES += qmultiinputcontext.cpp \
11	qmultiinputcontextplugin.cpp	11	qmultiinputcontextplugin.cpp
12		12
13	target.path += $$plugins.path/inputmethods	13	target.path += $$[QT_INSTALL_PLUGINS]/inputmethods
14	INSTALLS += target	14	INSTALLS += target

Lines 1-7 Link Here

(-)src/plugins/plugins.pro.old (-2 / +1 lines)
1	TEMPLATE = subdirs	1	TEMPLATE = subdirs
2		2
3	dll\|shared {	3	dll\|shared {
4	SUBDIRS *= accessible codecs imageformats sqldrivers	4	SUBDIRS *= accessible codecs imageformats sqldrivers inputmethods
5	embedded:SUBDIRS *= gfxdrivers decorations	5	embedded:SUBDIRS *= gfxdrivers decorations
6	x11:SUBDIRS *= inputmethods
7	}	6	}

Return to bug 116778

Lines 45-51 Link Here

(-)src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp.old (-7 / +2 lines)
45	#include <stdlib.h>	45	#include <stdlib.h>
46		46
47	QMultiInputContext::QMultiInputContext()	47	QMultiInputContext::QMultiInputContext()
48	: QInputContext(), fw(0), current(-1)	48	: QInputContext(), current(-1)
49	{	49	{
50	QStringList keys = QInputContextFactory::keys();	50	QStringList keys = QInputContextFactory::keys();
51	for (int i = keys.size()-1; i >= 0; --i)	51	for (int i = keys.size()-1; i >= 0; --i)
Lines 133-148 Link Here
133		133
134	void QMultiInputContext::setFocusWidget(QWidget *w)	134	void QMultiInputContext::setFocusWidget(QWidget *w)
135	{	135	{
136	fw = w;	136	QInputContext::setFocusWidget(w);
137	if (slave())	137	if (slave())
138	slave()->setFocusWidget(w);	138	slave()->setFocusWidget(w);
139	}	139	}
140		140
141	QWidget *QMultiInputContext::focusWidget() const
142	{
143	return fw;
144	}
145
146	void QMultiInputContext::widgetDestroyed(QWidget *w)	141	void QMultiInputContext::widgetDestroyed(QWidget *w)
147	{	142	{
148	if (slave())	143	if (slave())