diff options
| -rw-r--r-- | ChangeLog.immodule | 12 | ||||
| -rw-r--r-- | README.immodule | 16 | ||||
| -rw-r--r-- | changes.immodule | 2 | ||||
| -rw-r--r-- | plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp | 4 | ||||
| -rw-r--r-- | plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp | 4 | ||||
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 6 |
6 files changed, 22 insertions, 22 deletions
diff --git a/ChangeLog.immodule b/ChangeLog.immodule index 4bf083aa2..31b3cc8f1 100644 --- a/ChangeLog.immodule +++ b/ChangeLog.immodule @@ -633,7 +633,7 @@ - New file - (QNoneInputContextPlugin, ~QNoneInputContextPlugin, keys, languages, displayName, description): New function - - (create): New function. Read key from QT_IM_MODULE or + - (create): New function. Read key from TQT_IM_MODULE or /qt/DefaultInputMethod of qtrc and creates input context with the key @@ -850,8 +850,8 @@ * src/kernel/qapplication_x11.cpp - (defaultIM): Replace "xim" with "imsw-multi" - (x11_apply_settings): - * Replace the environment variable name QT_IM_MODULE with - QT_IM_SWITCHER + * Replace the environment variable name TQT_IM_MODULE with + TQT_IM_SWITCHER * Replace the qtrc variable name /qt/DefaultInputMethod with /qt/DefaultInputMethodSwitcher * Replace "xim" with "imsw-multi" for default plugin @@ -860,12 +860,12 @@ - (lastCreatedIMKey): Remove to rename to currentIMKey - (currentIMKey): New member variable. Renamed from lastCreatedIMKey because the semantics of the variable has been changed by - introduction of QT_IM_SWITCHER + introduction of TQT_IM_SWITCHER * src/input/qmultiinputcontext.cpp - Replace lastCreatedIMKey with currentIMKey - (QMultiInputContext): Add default input method specification - feature using QT_IM_MODULE and /qt/DefaultInputMethod + feature using TQT_IM_MODULE and /qt/DefaultInputMethod - (createImSelPopup): * Add IM-switcher plugin elimination feature using "imsw-" prefix * Add dispName.isNull() checking @@ -896,7 +896,7 @@ 2004-07-31 LiuCougar <[email protected]> - new environment variable QT_IM_MODULE to overwrite the default inputmethod plugin + new environment variable TQT_IM_MODULE to overwrite the default inputmethod plugin 2004-07-31 LiuCougar <[email protected]> "deleteLater" is safer then "delete" QObject directly diff --git a/README.immodule b/README.immodule index 49f69d7df..43a35e969 100644 --- a/README.immodule +++ b/README.immodule @@ -75,26 +75,26 @@ immodule for Qt - set "xim" input method as default - export QT_IM_MODULE=xim + export TQT_IM_MODULE=xim - set "simple" composing input method as default - export QT_IM_MODULE=simple + export TQT_IM_MODULE=simple - set "xim" input method as default, and disable input method selection menu in the context menu - export QT_IM_SWITCHER=imsw-none - export QT_IM_MODULE=xim + export TQT_IM_SWITCHER=imsw-none + export TQT_IM_MODULE=xim - set "xim" input method as default, and enable input method selection menu in the context menu (default configuration) - export QT_IM_SWITCHER=imsw-multi - export QT_IM_MODULE=xim + export TQT_IM_SWITCHER=imsw-multi + export TQT_IM_MODULE=xim - set "iiimqcf" that has its own input method switching framework as @@ -103,5 +103,5 @@ immodule for Qt provide unified user interface for global input method switching over the desktop - export QT_IM_SWITCHER=imsw-none - export QT_IM_MODULE=iiimqcf + export TQT_IM_SWITCHER=imsw-none + export TQT_IM_MODULE=iiimqcf diff --git a/changes.immodule b/changes.immodule index 0484cffce..634c12809 100644 --- a/changes.immodule +++ b/changes.immodule @@ -41,7 +41,7 @@ Configuration http://freedesktop.org/pipermail/immodule-qt/2004-August/000416.html -- Added new environment variables QT_IM_SWITCHER and QT_IM_MODULE to +- Added new environment variables TQT_IM_SWITCHER and TQT_IM_MODULE to set user's favorite input method as default. See README.immodule for examples. diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index 24259bd09..2d971691e 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -61,8 +61,8 @@ TQMultiInputContext::TQMultiInputContext() keyDict.setAutoDelete( true ); keyDict.clear(); - if ( getenv( "QT_IM_MODULE" ) ) { - currentIMKey = getenv( "QT_IM_MODULE" ); + if ( getenv( "TQT_IM_MODULE" ) ) { + currentIMKey = getenv( "TQT_IM_MODULE" ); } else { #ifndef TQT_NO_IM_EXTENSIONS TQSettings settings; diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index f4d8e59ff..b42f126e0 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -70,8 +70,8 @@ TQInputContext *TQNoneInputContextPlugin::create( const TQString &key ) if ( ! isIMSwitcher ) return 0; - if ( getenv( "QT_IM_MODULE" ) ) { - actuallySpecifiedKey = getenv( "QT_IM_MODULE" ); + if ( getenv( "TQT_IM_MODULE" ) ) { + actuallySpecifiedKey = getenv( "TQT_IM_MODULE" ); } else { TQSettings settings; actuallySpecifiedKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" ); diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 23d5969a1..401230f74 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1128,12 +1128,12 @@ bool TQApplication::x11_apply_settings() /* The identifier name of an input method is acquired from the configuration file as a default. If a environment variable - "QT_IM_SWITCHER" is not empty it will overwrite the + "TQT_IM_SWITCHER" is not empty it will overwrite the configuration file. The "imsw-multi" becomes the default if the entry is not configured. */ - if ( getenv( "QT_IM_SWITCHER" ) ) - defaultIM = getenv( "QT_IM_SWITCHER" ); + if ( getenv( "TQT_IM_SWITCHER" ) ) + defaultIM = getenv( "TQT_IM_SWITCHER" ); #ifndef TQT_NO_IM_EXTENSIONS else defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" ); |