summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-062-4/+13
|\
| * Support partial input modeSami Merila2011-07-052-4/+13
| | | | | | | | | | | | | | | | | | Connect the internal private API to the QApplication public attribute. This allows the enabling/disabling of the splitview functionality from apps without any hacks. Task-number: QTBUG-16572 Reviewed-by: Tomi Vihria
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-041-18/+41
|\ \ | |/ | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| * Do not try to open VKB if it is already open in SymbianMiikka Heikkinen2011-06-301-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | If QEvent::RequestSoftwareInputPanel was handled when there was already an active virtual keyboard that had a child dialog open such as symbol or writing language selection dialog, the VKB would be brought to foreground on top of the child dialog, causing several problems, such as options menu and letter keys no longer working in VKB. Fixed by checking if VKB is already open before opening it again. Task-number: QT-5133 Reviewed-by: Sami Merila
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-19/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| * Use numeric virtual keyboard for all number entry modes.Miikka Heikkinen2011-06-231-7/+0
| | | | | | | | | | | | | | | | | | Qt::DialableCharactersOnly and Qt::ImhFormattedNumbersOnly now use numeric mode virtual keyboard as they are supposed to. '*' and '#' keys can be used to enter the non-digit characters allowed in these modes. Task-number: QT-5085 Reviewed-by: Sami Merila
| * Splitview - Auto-translation rules changedSami Merila2011-06-231-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using "splitview" (virtual keyboard with non-fullscreen editing mode), it is currently auto-translating the cursor to the center of the screen if possible. It would be preferable, if the translation would only be minimal, just enough for cursor to be visible. This makes scrolling of input widget (i.e. large editor) easier to use, as text flows naturally (row-by-row) and not in "jumps" like it used to do. Additionally, limit the translation to the end of input widget boundary. Task-number: QTBUG-20034 Reviewed-by: Miikka Heikkinen
| * Ensure visibility of input widget in QML app when doing layout switchSami Merila2011-06-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QML application changes orientation, it usually switches to a new layout that lays out widgets differently (ie. in portrait, one vertical column; in landscape, horizontal multi-column layout). This easily breaks splitview translation logic, since it tries to ensure the visibility of the input widget before the new layout has been applied. Additionally, the logic failed, when connected signal was fired, since it assumed that the new translation would have translated the view above from where it started from (i.e. window below the translated view would have been exposed) and thus, it didn't do anything. As a fix, when translation logic seems to indicate that the translation would fail (and thus previously wouldn't do anything), reset the existing translation and try again. Task-number: QTBUG-16785 Reviewed-by: Miikka Heikkinen
| * Resizable graphicsview's background is drawn incorrectly in splitviewSami Merila2011-06-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the fact that native side re-opens keyboard before sending rotation event, the original size of graphicsview before auto-translate, is stored incorrectly. We store the height of graphicsview in previous orientation. Now, if the window was maximized, graphicsview was drawn correctly, since closing vkb would change the window state back to maximized and thus force a resizing of the view. With fullscreen gv this didn't happen. Fullscreen graphicsview thus needs a forced resize back to fullscreen. Task-number: QTBUG-19856 Reviewed-by: Miikka Heikkinen
| * Add inputcontext reset to orientation switch in SymbianMiikka Heikkinen2011-06-151-1/+2
| | | | | | | | | | | | | | | | | | Switching orientation double-committed any preedit string in progress, so added inputcontext reset to KEikDynamicLayoutVariantSwitch handling, ensuring the string will get only committed once. Task-number: QTBUG-19864 Reviewed-by: Sami Merila
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/opengl/qgl.cpp src/opengl/qpixmapdata_symbiangl.cpp src/opengl/qwindowsurface_gl.cpp
| * Last word inputted was duplicated after input method hints changedSami Merila2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | If input hints change call reset() to avoid duplication of predicted text into input widget. Otherwise input widget will commit the predicted word AND whatever the user has so far typed. Task-number: QTBUG-19689 Reviewed-by: Miikka Heikkinen
* | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-081-7/+0
|\ \ | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| * | Horizontal lines appearing under entered charactersSami Merila2011-06-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here, input context uses text formatting from S60 side, unless native side is indicating that it won't make any changes to the text (i.e. no special formatting). In that case, the input context fetches pre-edit text format from Qt side (dashed underline). Unfortunately, it is only applied to a single character at most and therefore, really easily gets mixed up with "underlined text", which in most cases is the S60 uncommitted predictive text. Task-number: QT-5046 Reviewed-by: Miikka Heikkinen
* | | Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-081-0/+5
|\ \ \ | | |/ | |/|
| * | Reset input context in Symbian when another window is opened.Miikka Heikkinen2011-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | When symbol menu is opened, input context needs to be reset or preedit string duplication may occur after symbol menu is closed. Task-number: QTBUG-19528 Reviewed-by: Sami Merila
* | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-071-0/+2
|\ \ \ | |/ /
| * | KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()Sami Merila2011-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | There is no check if graphics view pointer is null in the SLOT function translateInputWidget(). Task-number: QTBUG-19734 Reviewed-by: Miikka Heikkinen
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-2/+31
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Predictive text is not committed when writing in a QLineEditSami Merila2011-05-262-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QCoeFepInputContext is very aggressive committing its preedit string. When AVKON FEP opens any of its subwindows, it steals the focus from editable widget, which causes preedit string to get committed. This makes the input context almost unusable with T9 word prediction. As it is rather difficult to prevent focus loss in these types of use scenarios, replace the committed string with user selected word when suggested word list is closed. Task-number: QTBUG-15031 Reviewed-by: Miikka Heikkinen
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-1717-295/+295
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | * Update licenseheader text in source filesJyri Tahtela2011-05-1317-295/+295
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-23/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-162-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-141-23/+24
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Support word selection list with predictive text from splitviewSami Merila2011-05-131-23/+24
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When splitview is active and user taps a predicted word, mouse button should be forwarded to m_pointerHandler, which opens a suggested word list. When splitview is not active, but there are HW QWERTY keys in the device, tapping a word, should only move the cursor. Without HW QWERTY and no splitview, native editing state handles the functionality. Task-number: QTBUG-19062 Reviewed-by: Miikka Heikkinen
* | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1317-295/+295
| |_|/ |/| | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Provide internal API to avoid automatic translation of input widgetSami Merila2011-05-092-2/+9
|/ / | | | | | | | | | | | | | | | | | | | | There will be cases when client will want to disable splitview automatic view translation, so that keyboard is just brought on top of the application and no other actions happen. There will be no new public Qt GUI API to cover the cases (the public API will come from QML Components), but the implementation is done with new private API. Task-number: QTBUG-18716 Reviewed-by: Miikka Heikkinen
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-4/+9
|\ \ | |/ | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp src/s60installs/eabi/QtGuiu.def
| * Input method hints are not correct if using proxy widgetSami Merila2011-04-261-4/+9
| | | | | | | | | | | | | | Input context should prefer focus proxy over regular focus widget. Task-number: QTBUG-18873 Reviewed-by: Miikka Heikkinen
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-201-1/+1
|\ \ | |/
| * Symbol table is very limited in numeric input modeSami Merila2011-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt uses number mode keymap as a default in input context. If Special Character Table is not assigned into FEP state, the default keymap will be used. This will contain only few symbols ('*', '#', ...). As a fix, use alpha numeric keymap as a default keymap, using this will keep the symbol table same irregardless of current input mode (numbers, characters). Task-number: QT-4878 Reviewed-by: Miikka Heikkinen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-13/+41
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Splitview flag should also be updated to inputcontextSami Merila2011-04-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently splitview support is defined in exported global private method. There is no guarantee that input context is created, or updated when the API is called. This is problematic, since the client need to find a correct place and time when to call the API. As a change, update existing input context when the API is called. Also, take into account the splitview flag when updating input context. This ensures that client can enforce the flag use correctly. Task-number: QTBUG-18715 Reviewed-by: Guoqing Zhang
| * QGraphicsView with vertical scrollbar flickers when splitview opensSami Merila2011-04-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do windowstate change to fullscreen inside updateEnabled(false) - updateEnabled(true) guard block to avoid flickering of screen area, when keyboard opens in splitview. In worst case, screen is drawn three times: - resize the content area to fit into splitview - change windowstate to fullscreen - ensure visibility of the focusitem by scrolling the view Now, all these happen inside one "update". Task-number: QTBUG-18737 Reviewed-by: Guoqing Zhang
| * Splitview: opening a context menu should not re-position of focusItemSami Merila2011-04-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When splitview is open and user long taps an text input item, a context menu is opened. This leads to some drawing operations on splitview implementation, even though these should be skipped. The focusItem might even be re-positioned into incorrect position due to the failure. As a fix, check if the focusItem is already positioned correctly and avoid doing anything when it already is. Task-number: QTBUG-18738 Reviewed-by: Guoqing Zhang
| * Predictive Text causing app to crash after repeated edit attemptsSami Merila2011-04-131-1/+1
| | | | | | | | | | | | | | | | | | Splitview changes cause application to crash, since the cancellation of FEP transaction is not notified to the native side. This leads the native side and Qt to be not in sync. Task-number: QT-4879 Reviewed-by: Guoqing Zhang
| * GraphicsView is not reset if focusItem is not set when keyboard closesSami Merila2011-04-081-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | When splitview closes (i.e. keyboard is dismissed), application's graphicsview containing the input widget (focus item) is reset back to original graphicsview transformation. As a fix, resetTransform is always called, when rootItem is found from graphicsView. Task-number: QT-4858 Reviewed-by: Guoqing Zhang
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+2
|\ \ | |/ | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Not possible to enter negative values to widgets with numeric fieldsSami Merila2011-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it is not possible to enter negative number to QSpinBox (or to any other QWidget which is handling numeric input only) in touch devices. This is due to that AVKON virtual keyboards have negative sign (-) in special character table(s) and it is not accessible by default from QWidgets, unless you define widget's input hints as ImhFormattedNumbersOnly AND ImhDialableCharactersOnly (or non-numeric). With this fix, default special character table is added for widgets with numeric input mode AND either ImhFormattedNumbersOnly or ImhDialableCharactersOnly. By default user is still unable to enter nagative values to QSpinBox, but developer can set inputMethodHint to work around the issue: widget->setInputMethodHints(Qt::ImhFormattedNumbersOnly); Task-number: QTBUG-17461 Reviewed-by: Miikka Heikkinen
| * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into ↵Sami Merila2011-03-291-3/+4
| |\ | | | | | | | | | merge-requests/2584
* | \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-281-2/+3
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Show softkeys when opening a dialog that has a fullscreen parent. Fixed autotests on Windows. QS60Style: draw QComboBox menu correctly Remove two compilation warnings for ARM QTabWidget tabs are resized in wrong way when device rotates Symbian: QComboBox popup Listbox size is not adjusted Switched back to using symlinks for all mkspecs on Linux. QS60Style: Support for Menu separators Native image handle provider support in QGLPixmapData Fix an issue with VGImage readback in openvg. QSysInfo support for next generation Symbian devices. Call FixNativeOrientation on Symbian for certain fullscreen qml views.
| | * Remove two compilation warnings for ARMSami Merila2011-03-251-2/+3
| | | | | | | | | | | | | | | | | | Initialize the rootItem variable to avoid compilation warning. Reviewed-by: Guoqing Zhang
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-271-3/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-222-9/+253
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| | * | Doc: Work on QInputContext::reset() docsGeir Vattekar2011-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17858 Reviewed-by: axis
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-9/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * | | Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no focusitem when connecting a signal, splitview crashes. This is caused by null pointer use. Prevent the crash by checking the pointer. Task-number: QTBUG-16572 Reviewed-by: Guoqing Zhang
| * | | GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up previous fix a little bit, by merging if-statements. Task-number: QTBUG-17576 Reviewed-by: Guoqing Zhang
generated by cgit v0.12 at 2024-10-30 09:23:18 (GMT)