Author: yamakenz
Date: Thu Sep 20 08:52:02 2007
New Revision: 4986
Modified:
trunk/qt/quiminputcontextplugin-qt4/candidatewindow.cpp
trunk/qt/quiminputcontextplugin-qt4/plugin.cpp
trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
trunk/qt/quiminputcontextplugin-qt4/quiminputcontextplugin.pro
Log:
* This commit make Qt4 immodule working. But some behaviors are still broken
* qt/quiminputcontextplugin-qt4/plugin.cpp
- (UimInputContextPlugin::createLanguageList): Fix empty list on the
key "uim"
* qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
- (QUimInputContext::commitString): Make commits regardless of
isComposing()
* qt/quiminputcontextplugin-qt4/candidatewindow.cpp
- (CandidateWindow::CandidateWindow): Replace withdrawn
QListWidget::clicked() signal with itemClicked()
* qt/quiminputcontextplugin-qt4/quiminputcontextplugin.pro
- (QT): Add 'qt3support' for Q3VBox
Modified: trunk/qt/quiminputcontextplugin-qt4/candidatewindow.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/candidatewindow.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/candidatewindow.cpp Thu Sep 20
08:52:02 2007
@@ -25,8 +25,8 @@
// setup CandidateList
cList = new QListWidget( this );
cList->setSelectionMode( QAbstractItemView::SingleSelection );
- QObject::connect( cList, SIGNAL( clicked( QListWidgetItem * item,
Qt::MouseButton button, Qt::KeyboardModifiers modifiers ) ),
- this, SLOT( slotCandidateSelected( QListWidgetItem *
item ) ) );
+ QObject::connect( cList, SIGNAL( itemClicked( QListWidgetItem * ) ),
+ this, SLOT( slotCandidateSelected( QListWidgetItem * ) )
);
// setup NumberLabel
numLabel = new QLabel( this );
Modified: trunk/qt/quiminputcontextplugin-qt4/plugin.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/plugin.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/plugin.cpp Thu Sep 20 08:52:02 2007
@@ -78,6 +78,7 @@
// default
lst.append( "uim" );
+ qDebug( "name = uim" );
uim_context tmp_uc = uim_create_context( NULL, "UTF-8",
NULL, NULL, uim_iconv, NULL );
@@ -126,7 +127,7 @@
}
uim_release_context( tmp_uc );
- return QStringList();
+ return QStringList( "" );
}
Q_EXPORT_PLUGIN2( uiminputcontextplugin, UimInputContextPlugin )
Modified: trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp Thu Sep 20
08:52:02 2007
@@ -393,28 +393,15 @@
void QUimInputContext::commitString( const QString& str )
{
- if ( isComposing() )
- {
- preeditString = QString::null;
- QInputMethodEvent e;
- e.setCommitString( str );
- sendEvent( e );
- m_isComposing = false;
- return ;
- }
+ preeditString = QString::null;
-#if 0
- // for hitting Space-Key when IM is On.
- // in this case, we should commit the string (Zenkaku-Space)
- // directly.
- if ( ! str.isEmpty() )
- {
- sendIMEvent( QEvent::InputMethodStart );
- sendIMEvent( QEvent::InputMethodEnd, str );
- }
-#endif
+ QInputMethodEvent e;
+ e.setCommitString( str );
+ sendEvent( e );
+ m_isComposing = false;
}
+
void QUimInputContext::clearPreedit()
{
// delete first
Modified: trunk/qt/quiminputcontextplugin-qt4/quiminputcontextplugin.pro
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/quiminputcontextplugin.pro
(original)
+++ trunk/qt/quiminputcontextplugin-qt4/quiminputcontextplugin.pro Thu Sep
20 08:52:02 2007
@@ -6,6 +6,7 @@
DEPENDPATH += .
INCLUDEPATH += . /usr/local/include/uim
CONFIG += qt plugin thread
+QT += qt3support
LIBS += -luim
# Input
