uim

Fork

Add pseudo table style.

* scm/tutcode-custom.scm
- (tutcode-use-pseudo-table-style?): New custom variable.
* scm/tutcode.scm
- (tutcode-stroke-help-make, tutcode-auto-help-make):
Support pseudo table style.
- (tutcode-table-in-vertical-candwin): New function.

Add shin joyo kanji to tutcode-rule with custom variable tutcode-rule-use-tutplus?

* scm/tutcode-rule-custom.scm
- (tutcode-rule-use-tutplus?): New custom variable.
* scm/tutcode-rule.scm
- (tutcode-rule-shin-joyo-kanji-plus): New additional rule.

Add tutcode-rule-custom.scm for customization about tutcode-rule.scm.

* scm/Makefile.am
- (SCM_FILES): Add tutcode-rule-custom.scm.
* scm/tutcode-rule-custom.scm
- New custom file.
- (tutcode-rule): New custom group.
- (tutcode-rule-uppercase-as-opposite-kana?,
tutcode-rule-exclude-uppercase-for-katakana?,
tutcode-rule-exclude-uppercase-for-kigou-in-katakana?):
New custom variable.
* scm/tutcode.scm
- Add require-custom "tutcode-rule-custom.scm".
* scm/tutcode-rule.scm
- Update comment.

Add check of tutcode-rule-uppercase-as-opposite-kana? for backward compatibility.

* scm/tutcode-rule.scm:
Use hiragana in tutcode-rule-uppercase-for-katakana for katakana mode
only when tutcode-rule-uppercase-as-opposite-kana? is set to #t.

Add hiragana to tutcode-rule-uppercase-for-katakana for katakana mode.

* scm/tutcode-rule.scm
- (tutcode-rule-uppercase-for-katakana):
Add hiragana for katakana mode.
- (tutcode-rule):
Remove needless katakana string (hiragana and katakana are same).

Add custom key sequences to change katakana/hiragana mode (not toggle).

* scm/tutcode-key-custom.scm
- (tutcode-katakana-sequence, tutcode-hiragana-sequence): New custom.
* scm/tutcode.scm
- (tutcode-custom-set-mazegaki/bushu-start-sequence!):
Change katakana/hiragana mode to katakana or hiragana by
tutcode-katakana-sequence or tutcode-hiragana-sequence respectively.

Support tutcode-verbose-stroke-key on prefix (interactive) bushu conversion.

* scm/tutcode.scm
- (tutcode-proc-state-bushu, tutcode-proc-state-interactive-bushu):
Use first key in pending sequence as bushu by tutcode-verbose-stroke-key.

Fix bug that key which is not in rule (ex. "5") is not entered on (interactive) bushu conversion.

* scm/tutcode.scm
- (tutcode-proc-state-bushu, tutcode-proc-state-interactive-bushu):
Fix scope error introduced at commit:effa429.

Add some files to EXTRA_DIST.

* qt4/candwin/Makefile.am
- (EXTRA_DIST): Add util.h, util.cpp,
ximcandidatewindow.h and ximcandidatewindow.cpp.
* qt4/immodule/Makefile.am
- (EXTRA_DIST): Add candidatewindowproxy.h and candidatewindowproxy.cpp.
* qt5/immodule/Makefile.am
- (EXTRA_DIST)
* Rename quiminputcontextplugin.pro.in.
* Add quimplatforminputcontextplugin.h
and quimplatforminputcontextplugin.cpp.

Delete *.pro on "make distclean".

* qt5/candwin/Makefile.am
* qt5/chardict/Makefile.am
* qt5/immodule/Makefile.am
* qt5/pref/Makefile.am
* qt5/switcher/Makefile.am
* qt5/toolbar/Makefile.am
- Delete *.pro on "make distclean".

Merge branch 'qt5'

Add qt4/immodule to INCLUDEPATH in Qt5 immodule.

* qt5/immodule/quimplatforminputcontext.cpp
- Change including.
* qt5/immodule/quimplatforminputcontextplugin.pro.in
- (INCLUDEPATH): Add "@srcdir@/../../qt4/immodule".

Implement QUimPlatformInputContext::reset.

* qt5/immodule/quimplatforminputcontext.cpp
(QUimPlatformInputContext::reset): Implement.

Rename QUimPlatformInputContext::m_isComposing.

* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::QUimPlatformInputContext,
QUimPlatformInputContext::commitString,
QUimPlatformInputContext::updatePreedit):
Rename QUimPlatformInputContext::m_isAnimating.
- (QUimPlatformInputContext::isAnimating): Don't define here.
* qt5/immodule/quimplatforminputcontext.h
- (QUimPlatformInputContext::m_isComposing): Rename to m_isAnimating.
- (QUimPlatformInputContext::isAnimating): Define here.

Add setFocus() and unsetFocus() to Qt5 immodule.

* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::QUimPlatformInputContext):
* Initialize member variables and a helper manager.
* Add connection to qApp->inputMethod()::inputItemChanged().
- (QUimPlatformInputContext::createUimContext)
Check helper connection.
- (QUimPlatformInputContext::slotInputItemChanged,
QUimPlatformInputContext::setFocus,
QUimPlatformInputContext::unsetFocus,
QUimPlatformInputContext::updateIndicator): New function.
* qt5/immodule/quimplatforminputcontext.h
- (QUimPlatformInputContext): Add slotInputItemChanged(),
setFocus(), unsetFocus() and m_helperManager.

Use uim-candwin-qt5 for Qt5 immodule.

* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::initializeProcess):
Use uim-candwin-qt5 instead of uim-candwin-qt4
in Qt5 immodule.

Begin to implement Qt5 immodule.

* qt5/immodule/quimplatforminputcontext.cpp
* qt5/immodule/quimplatforminputcontext.h
- Port codes from Qt4 immodule.

Apply cosmetic changes

* quimplatforminputcontext.cpp
* quimplatforminputcontext.h
- Apply cosmetic changes.

Ignore files in the qt5 directory.

* .gitignore
- Add generated files to ignore in the qt5 directory.

Ignore swp file.

* .gitignore
- Add '*.swp' to ignore swp files vi generates.

Create QUimPlatformInputContext for Qt5.

* configure.ac
- Change file name from quiminputcontextplugin.pro
to quimplatforminputcontextplugin.pro
* qt4/immodule/candidatewindowproxy.cpp
* qt4/immodule/candidatewindowproxy.h
* qt4/immodule/plugin.cpp
* qt4/immodule/qhelpermanager.cpp
* qt4/immodule/qtextutil.cpp
* qt4/immodule/qtextutil.h
* qt4/immodule/quiminputcontext_compose.cpp
* qt4/immodule/quiminputcontext_compose.h
* qt4/immodule/quiminputcontext_with_slave.h
- Use QUimPlatformInputContext for Qt5.
* qt4/immodule/quiminputcontext.cpp
* qt4/immodule/quiminputcontext.h
- Remove lines for Qt5.
* qt5/immodule/quimplatforminputcontext.cpp
* qt5/immodule/quimplatforminputcontext.h
- New files.
* qt5/immodule/quiminputcontextplugin.pro.in
- (HEADERS)
* Add quimplatforminputcontext.h.
* Remove quiminputcontext.h.
- (SOURCES)
* Add quimplatforminputcontext.cpp.
* Remove quiminputcontext.cpp.
- (TARGET): Rename to uimplatforminputcontextplugin.

Make candwin and immodule for Qt5 compilable.

* qt4/candwin/abstractcandidatewindow.cpp
* qt4/candwin/abstractcandidatewindow.h
* qt4/candwin/candidatewindow.cpp
- Use QtWidgets module for Qt5.
* qt4/candwin/qt4.cpp
- Don't include removed header file qt4.h.
* qt4/candwin/ximcandidatewindow.cpp
- Use QtWidgets module for Qt5.
* qt4/immodule/quiminputcontext.h
- Remove merge comflict message.
* qt5/candwin/uim-candwin-qt5.pro.in
- (HEADERS, SOURCES): Update.
* qt5/immodule/quiminputcontextplugin.pro.in
- (INCLUDEPATH): Add "@srcdir@/../../qt4/candwin" to include util.h.
- (HEADERS, SOURCES): Update.

Merge branch 'rpc' into qt5

Conflicts:
qt4/candwin/candidatetablewindow.cpp
qt4/candwin/qt4.cpp
qt4/immodule/candidatewindow.cpp
qt4/immodule/candidatewindowproxy.cpp
qt4/immodule/candidatewindowproxy.h
qt4/immodule/quiminputcontext.h

Simplify AbstractCandidateWindow::candidateData().

* qt4/candwin/abstractcandidatewindow.cpp
- (AbstractCandidateWindow::candidateData): Simplify

Add "setup_sub_window" command to uim-candwin-qt4.

* qt4/candwin/abstractcandidatewindow.cpp
- (AbstractCandidateWindow::activateCandwin,
AbstractCandidateWindow::setNrCandidates): Remove.
- (AbstractCandidateWindow::setupSubWindow): New.
- (AbstractCandidateWindow::slotStdinActivated):
* Add support for "setup_sub_window".
* Remove support for "activate_candwin".
* qt4/candwin/abstractcandidatewindow.h
- (AbstractCandidateWindow::activateCandwin,
AbstractCandidateWindow::setNrCandidates): Remove.
- (AbstractCandidateWindow::setupSubWindow): New.
* qt4/candwin/candidatewindow.cpp
- (CandidateWindow::activateCandwin,
CandidateWindow::setNrCandidates): Remove.
- (CandidateWindow::setupSubWindow): New.
* qt4/candwin/candidatewindow.h
- Ditto.
* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::activateCandwin):
Use "setup_sub_window" instead of "activate_candwin".
- (CandidateWindowProxy::setNrCandidates):
Use "setup_sub_window" instead of "set_nr_candidates".

Implement CandidateWindowProxy::isVisible().

* qt4/candwin/abstractcandidatewindow.cpp
- (AbstractCandidateWindow::showEvent,
AbstractCandidateWindow::hideEvent): New functions.
* qt4/candwin/abstractcandidatewindow.h
- Ditto.
* qt4/candwin/candidatewindow.cpp
- (CandidateWindow::hideEvent):
Call AbstractCandidateWindow::hideEvent(event)
instead of QFrame::hideEvent(event).
* qt4/candwin/util.h
- Define WORKAROUND_BROKEN_RESET_IN_QT4 here.
* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::CandidateWindowProxy):
Initialize m_isVisible.
- (CandidateWindowProxy::isVisible): Implement.
- (CandidateWindowProxy::slotReadyStandardOutput):
Support command "shown" and "hidden".
* qt4/immodule/candidatewindowproxy.h
- Add m_isVisible.
- Surround isVisible() with WORKAROUND_BROKEN_RESET_IN_QT4.
* qt4/immodule/quiminputcontext.h
- Don't define WORKAROUND_BROKEN_RESET_IN_QT4 here.

Move some functions to CandidateWindowProxy.

* qt4/candwin/abstractcandidatewindow.cpp
- (AbstractCandidateWindow::AbstractCandidateWindow):
Don't initialize removed member variables.
- (AbstractCandidateWindow::~AbstractCandidateWindow):
Don't operate on removed member variables.
- (AbstractCandidateWindow::deactivateCandwi,
AbstractCandidateWindow::clearCandidate,
AbstractCandidateWindow::candidateSelect,
AbstractCandidateWindow::candidateShiftPage,
AbstractCandidateWindow::stores,
AbstractCandidateWindow::nrCandidates,
AbstractCandidateWindow::displayLimit,
AbstractCandidateWindow::candidateIndex,
AbstractCandidateWindow::pageIndex,
AbstractCandidateWindow::pageFilled,
AbstractCandidateWindow::timerDone,
AbstractCandidateWindow::setCandidates,
AbstractCandidateWindow::setPage,
AbstractCandidateWindow::setPageCandidates,
AbstractCandidateWindow::preparePageCandidates,
AbstractCandidateWindow::nrPages,
Move to CandidateProxyWindow.
- (AbstractCandidateWindow::setCandidateData): Remove.
- (AbstractCandidateWindow::candidateData): New
- (AbstractCandidateWindow::activateCandwin,
- (AbstractCandidateWindow::activateCandwin,
AbstractCandidateWindow::shiftPage,
AbstractCandidateWindow::setIndex,
AbstractCandidateWindow::setNrCandidates,
AbstractCandidateWindow::updateView,
Change arguments.
* qt4/candwin/abstractcandidatewindow.h
- (AbstractCandidateWindow::deactivateCandwi,
AbstractCandidateWindow::clearCandidate,
AbstractCandidateWindow::candidateSelect,
AbstractCandidateWindow::candidateShiftPage,
AbstractCandidateWindow::stores,
AbstractCandidateWindow::nrCandidates,
AbstractCandidateWindow::displayLimit,
AbstractCandidateWindow::candidateIndex,
AbstractCandidateWindow::pageIndex,
AbstractCandidateWindow::pageFilled,
AbstractCandidateWindow::timerDone,
AbstractCandidateWindow::setCandidates,
AbstractCandidateWindow::setPage,
AbstractCandidateWindow::setPageCandidates,
AbstractCandidateWindow::preparePageCandidates,
AbstractCandidateWindow::nrPages,
Move to CandidateProxyWindow.
- (AbstractCandidateWindow::setCandidateData): Remove.
- (AbstractCandidateWindow::candidateData): New
- (AbstractCandidateWindow::activateCandwin,
- (AbstractCandidateWindow::activateCandwin,
AbstractCandidateWindow::shiftPage,
AbstractCandidateWindow::setIndex,
AbstractCandidateWindow::setNrCandidates,
AbstractCandidateWindow::updateView,
Change arguments.
* qt4/candwin/candidatetablewindow.cpp
- (CandidateTableWindow::slotCandidateClicked,
CandidateTableWindow::updateView,
CandidateTableWindow::setIndex)
* Move partial to CandidateWindowProxy.
* Change arugments.
* qt4/candwin/candidatetablewindow.h
- (CandidateTableWindow::updateView,
CandidateTableWindow::setIndex): Change arguments.
* qt4/candwin/candidatewindow.cpp
- (CandidateWindow::activateCandwin,
CandidateWindow::setNrCandidates,
CandidateWindow::updateView,
CandidateWindow::setIndex,
CandidateWindow::slotCandidateSelected,
CandidateWindow::shiftPage):
* Move partial to CandidateWindowProxy.
* Change arugments.
* qt4/candwin/candidatewindow.h
- (CandidateWindow::activateCandwin,
CandidateWindow::updateView,
CandidateWindow::shiftPage,
CandidateWindow::setIndex,
CandidateWindow::setNrCandidates): Change arguments.
* qt4/candwin/util.cpp
- (get_messages): Convert received message with QString::fromUtf8().
* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::CandidateWindowProxy):
Add nrCandidates, displayLimit, candidateIndex, pageIndex.
- (CandidateWindowProxy::~CandidateWindowProxy):
Free uim_candidate.
- (CandidateWindowProxy::deactivateCandwin,
CandidateWindowProxy::clearCandidates,
CandidateWindowProxy::candidateActivate,
CandidateWindowProxy::candidateSelect,
CandidateWindowProxy::candidateShiftPage,
CandidateWindowProxy::activateCandwin,
CandidateWindowProxy::shiftPage,
CandidateWindowProxy::setIndex,
CandidateWindowProxy::setNrCandidates,
CandidateWindowProxy::updateLabel,
CandidateWindowProxy::setCandidates,
CandidateWindowProxy::setPage,
CandidateWindowProxy::setPageCandidates,
CandidateWindowProxy::preparePageCandidates):
Move from AbstractCandidateWindow.
- (CandidateWindowProxy::layoutWindow,
CandidateWindowProxy::setFocusWidget)
Replace double quotes with single quotes.
- (CandidateWindowProxy::execute):
Use QString::toUtf8() to output messages.
* qt4/immodule/candidatewindowproxy.h
- (CandidateWindowProxy):

Fix error when bushu.help file does not exist.

* scm/tutcode-bushu.scm
- (tutcode-bushu-help-load): Add check of file-readable?

Move m_delayTimer to CandidateWindowProxy.

* qt4/candwin/abstractcandidatewindow.cpp
- (AbstractCandidateWindow::AbstractCandidateWindow,
AbstractCandidateWindow::deactivateCandwin,
AbstractCandidateWindow::candidateActivate):
Remove m_delayTimer.
- (AbstractCandidateWindow::candidateActivateWithDelay): Remove.
- (AbstractCandidateWindow::candidateSelect)
* Don't accept command "candidate_activate_with_delay".
* Accept command "timer_done".
* qt4/candwin/abstractcandidatewindow.h
- (AbstractCandidateWindow::candidateActivateWithDelay): Remove.
- (AbstractCandidateWindow::timerDone): make non-slot.
- (AbstractCandidateWindow::m_delayTimer): Remove.
* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::CandidateWindowProxy):
Add m_delayTimer.
- (CandidateWindowProxy::deactivateCandwin,
CandidateWindowProxy::candidateActivate,
CandidateWindowProxy::candidateActivateWithDelay,
CandidateWindowProxy::timerDone): Move from AbstractCandidateWindow.
* qt4/immodule/candidatewindowproxy.cpp
- Ditto.

Initialize variables in CandidateWindowProxy.

* qt4/immodule/candidatewindowproxy.cpp
- (CandidateWindowProxy::CandidateWindowProxy):
Initialize variables ic, isAlwaysLeft.
* qt4/immodule/candidatewindowproxy.h
- (CandidateWindowProxy): Sort variables.