Revision: 6273
Author: nogu.dev
Date: Mon Mar 22 07:41:15 2010
Log: * qt4/immodule/caretstateindicator.cpp
- (CaretStateIndicator::setup): New function.
- (CaretStateIndicator::update):
Call setVisible(true) not inside update() but inside setup().
* qt4/immodule/caretstateindicator.h
- Add CaretStateIndicator::setup().
- Make CaretStateIndicator::update() and CaretStateIndicator::setTimeout()
private.
* qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::setupIndicator):
Move its operation to CaretStateIndicator::setup().
http://code.google.com/p/uim/source/detail?r=6273
Modified:
/trunk/qt4/immodule/caretstateindicator.cpp
/trunk/qt4/immodule/caretstateindicator.h
/trunk/qt4/immodule/quiminputcontext.cpp
=======================================
--- /trunk/qt4/immodule/caretstateindicator.cpp Sun Mar 21 04:36:50 2010
+++ /trunk/qt4/immodule/caretstateindicator.cpp Mon Mar 22 07:41:15 2010
@@ -40,6 +40,8 @@
#include <QtGui/QLabel>
#include <QtGui/QMoveEvent>
+#include <uim/uim-scm.h>
+
const int CaretStateIndicator::SPACING = 3;
// caret state indicator is a state indicator nearby the caret.
@@ -60,6 +62,28 @@
while (!m_labelList.isEmpty())
delete m_labelList.takeFirst();
}
+
+void CaretStateIndicator::setup(const QString &str)
+{
+ bool isEnabled = uim_scm_symbol_value_bool("bridge-show-input-state?");
+ char *type =
uim_scm_c_symbol(uim_scm_symbol_value("bridge-show-with?"));
+ bool isMode = (qstrcmp(type, "mode") == 0);
+ free(type);
+ bool isModeOn
+ = uim_scm_symbol_value_bool("bridge-show-input-state-mode-on?");
+ if (isEnabled && !(isMode && !isModeOn)) {
+ update(str);
+ if (!isMode) {
+ int time = uim_scm_symbol_value_int(
+ "bridge-show-input-state-time-length");
+ if (time != 0)
+ setTimeout(time);
+ }
+ setVisible(true);
+ } else if (isMode && !isModeOn) {
+ setVisible(false);
+ }
+}
void CaretStateIndicator::update(const QString &str)
{
@@ -97,7 +121,6 @@
m_window = widget->window();
m_window->installEventFilter(this);
}
- setVisible(true);
}
void CaretStateIndicator::setTimeout(int second)
=======================================
--- /trunk/qt4/immodule/caretstateindicator.h Sun Mar 21 04:36:50 2010
+++ /trunk/qt4/immodule/caretstateindicator.h Mon Mar 22 07:41:15 2010
@@ -44,13 +44,14 @@
explicit CaretStateIndicator(QWidget *parent = 0);
~CaretStateIndicator();
- void update(const QString &str);
- void setTimeout(int second);
+ void setup(const QString &str);
// space between this indicator and a caret
static const int SPACING;
private:
+ void update(const QString &str);
+ void setTimeout(int second);
bool eventFilter(QObject *obj, QEvent *event);
QList<QLabel *> m_labelList;
QTimer *m_timer;
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Mon Mar 22 06:53:58 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Mon Mar 22 07:41:15 2010
@@ -942,24 +942,7 @@
void QUimInputContext::setupIndicator( const QString &str )
{
- bool isEnabled = uim_scm_symbol_value_bool( "bridge-show-input-state?"
);
- char *type
- = uim_scm_c_symbol( uim_scm_symbol_value( "bridge-show-with?" ) );
- bool isMode = ( strcmp( type, "mode" ) == 0 );
- free( type );
- bool isModeOn
- = uim_scm_symbol_value_bool( "bridge-show-input-state-mode-on?" );
- if ( isEnabled && !( isMode && !isModeOn ) ) {
- m_indicator->update( str );
- if ( !isMode ) {
- int time = uim_scm_symbol_value_int(
- "bridge-show-input-state-time-length" );
- if ( time != 0 )
- m_indicator->setTimeout( time );
- }
- } else if ( isMode && !isModeOn ) {
- m_indicator->setVisible( false );
- }
+ m_indicator->setup( str );
}
static int unicodeToUKey (ushort c) {
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
