summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: popup hides behind window Cocoa: combobox does not hightlight when mouse re-hovers the first item Cocoa: Fix addChildWindow bug where we connect a grandparent to a child Cocoa: cannot use staysOnTop flag for native file dialogs Cocoa: make sure stays on top child windows are not levelled down Cocoa: native child filedialogs sometimes shows non-native on screen
| * Cocoa: combobox does not hightlight when mouse re-hovers the first itemRichard Moe Gustavsen2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | The reason is that on Mac, the highlight is supposed to switch off when the mouse moves out of the drop down menu. On X11, it stays. So there is a separate code path for this in qcombobox.cpp. But it fails to clear the index set in the view when the mouse leaves, which stops the item from re-highligh when the mouse re-enters. Reviewed-by: ogoffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| | * | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-062-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A function resetCursorBlinkerTimer was introduced to QLineControl. Each time the cursor position in a textInput is updated, the blinker timer is reset. Task-number: QTBUG-15815 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-091-0/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Remove whitespace and leading tab from documentation change Updating merge request 2512 QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache Fix integer overflow in bitfield Fix documentation for QML extended types Removes the reseting of the QMenu offset. Adding warning to QMenu documentation Fix filtering of columns in QSFPM.
| * | Remove whitespace and leading tab from documentation changeSami Merila2010-12-081-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-12119 Reviewed-by: TrustMe
| * | Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integrationSami Merila2010-12-081-0/+3
| |\ \
| | * | Adding warning to QMenu documentationKarim Pinter2010-11-261-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | If the QMenu is made visible using show() it causes problems because the scrolling and layout is not set properly. The warning suggests to use exec() or popup() instead. Task-number: QTBUG-12119
| * | Updating merge request 2512Karim Pinter2010-12-071-3/+1
| | | | | | | | | | | | | | | | | | Removing unnecessary comments and changing define to Q_OS_SYMBIAN. Task-number: QTBUG_9505
| * | Removes the reseting of the QMenu offset.Karim Pinter2010-11-291-0/+4
| |/ | | | | | | | | | | | | | | On s60 when the qmenu is opened on the second time, it restores the position of the last activated menu, so there is no need to reset the offset when the popup() is called again. Task-number: QTBUG-9505
* | QLabel wordwrap to respect maximumSizeJanne Koskinen2010-12-091-1/+1
|/ | | | | | | | 80 characters width can be longer than maximum size of QLabel. Restrict to max size. Task-number: QT-4354 Reviewed-by: Sami Merila
* doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
| | | | | | | | | | QTextEdit::setDocument() has failed to delete its current document since June 2006 despite its claims of the otherwise. Since most Qt versions now exhibit this behavior, the only safe way to fix the problem is to change the documentation to reflect what actually happens. Task-number: QTBUG-14049 Reviewed-by: Lars
* With some locales, QDoubleValidator would not accept "C" locale valid numbersGabriel de Dietrich2010-11-021-18/+27
| | | | | | | | | | | | Locales using dot as thousands delimiter and comma as decimal separator are prone to this error. This is a regression introduced by commit b81b8e43ad57183ed66. Auto-tests included. Reviewed-by: Olivier Task-number: QTBUG_14935
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-231-1/+1
| |\
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-201-1/+1
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-202-2/+3
| |\ \ \
| * | | | Doc: Fixed minor documentation issues.David Boddie2010-10-121-2/+2
| | | | |
* | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |_|_|/ |/| | |
* | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | If native side uses "bottom softkeys" with landscape orientation, QComboBox's popup should be shown above softkeys and centered. Currently it is shown above softkeys and on right border. Task-number: QT-4174 Reviewed-by: mread
* | | Fix autotest failure with experimental client decoHarald Fernengel2010-10-201-1/+1
| |/ |/| | | | | The menu bar is in the outer layout, not the inner one
* | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
| | | | | | | | | | | | | | | | | | This reverts commit 9e378145294da33495d48b2c0742461ae6c2a3ba. QWorkspace is obsolete. And it does not pass the tests. TESTFUNCTION_FAIL tst_qaccessibility::workspaceTest (macx-g++_cocoa) TESTFUNCTION_FAIL tst_qaccessibility::workspaceTest (macx-g++_cocoa_osx106)
* | Disable the unified toolbar before enteringFabien Freling2010-10-152-2/+3
| | | | | | | | | | | | | | | | | | | | fullscreen on Mac OS X. We are just enforcing what the documentation recommended. Task-number: QTBUG-13772 Reviewed-by: Samuel
* | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
|/ | | | | | | | | | The setMinimumSize call was having precedence over the minimumSizeHint, so when having a sizegrip enabled it was possible to resize a MDI window to a much smaller size than its min size (actually it would flicker between the two sizes, on each resize). Fixed by moving that min size (for the titlebar contents) to the calculations in minimumSizeHint(). Reviewed-by: mariusso
* Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | | | | Task-number: QTBUG-14026 Reviewed-by: David Boddie
* Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
|\
| * Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into ↵Jerome Pasion2010-09-1611-48/+124
| |\ | | | | | | | | | 13092010doc
| * | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Bug:QTBUG-11324
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-242-11/+17
|\ \ \
| * | | Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll
* | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
|/ / / | | | | | | | | | | | | Task-number: QTBUG-13734 Reviewed-by: Jerome Pasion
* | | Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-201-4/+4
| |/ |/| | | | | | | Task-number: QTBUG-13437 Reviewed-by: Janne Koskinen
* | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-158-46/+117
|\ \ | | | | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * | Implement a private API for setting title widgetsHarald Fernengel2010-09-108-46/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | Meego and Orbit use client side decorations, so implement a top-level layout in QMainWindow that allows us to set title widgets. To prevent regressions on other platforms, the API is disabled by default. Rev-By: Robert Griebl Rev-By: Thierry Bastian
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-093-2/+7
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-092-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | * Editable QComboBox popup immediately closes itself after a clickSami Merila2010-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that timer that blocks for while mouse release events (blockMouseReleaseTimer) is not started. There is an optimization in QComboBox that tries to avoid calling d->viewContainer() since that method creates the viewContainter if it doesn't exist. Unfortunately this optimization does not take into account if the container is already created. In this particular case, viewContainer is already created, but since QComboBox creates a QLineEdit, it skips the timer start, which leads to situation where combobox's popup menu receiving mouse release event and thus closes itself. As a fix, blockMouseReleaseTimer is started if the viewContainer is already created. Task-number: QTBUG-13231 Reviewed-by: axis
| | * Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit, cursor is still visible. QLineControl (text control widget inside QLineEdit) handles the internal state of cursor visibility correctly and then promptly ignores the state when drawing the text. Issue is corrected by checking the cursor visibility state when drawing the cursor into widget. Task-number: QT-3670 Reviewed-by: axis
| * | Fixed the scrolling of text in QLineEdit with right alignmentThierry Bastian2010-09-091-0/+4
| |/ | | | | | | | | | | | | | | The scrolling internal member was not changed in cas the text was bigger than the lineedit. Task-number: QTBUG-13520 Reviewed-by: gabi
* | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-4/+2
|\ \ | |/
| * Revert "QLineEdit cursor is shown when asked to be non-visible"axis2010-09-021-3/+1
| | | | | | | | This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
| * Merge branch 'variousFixes' into 4.7-s60axis2010-09-011-1/+1
| |\
| | * Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642. Conflicts: src/gui/inputmethod/qcoefepinputcontext_p.h src/gui/inputmethod/qcoefepinputcontext_s60.cpp
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-2/+2
|\ \ \ | |/ / |/| |
| * | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-2/+2
| | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-301-16/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix #pragma message(), the message must be enclosed in parentheses preserve non-standard source references QSslConfiguration: fix crash when accessing null pointer properly parse ts contexts in obsolete messages move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler Fix static build on Windows with MinGW. Reenable the reporting of CPU features. make qdoc3 boot-strappable again fix MinGW cross compilation with -debug-and-release Updated and new Slovenian translations for Qt 4.7 Designer: Fix crash on unsupported Language/Country combination. Doc: Fixed qdoc warnings and generalized the date and time descriptions. Doc: Whitespace fixes. Doc: Fixed snippets in QML introduction broken in an earlier commit. doc: Fixed numerous qdoc warnings.
| * | Doc: Fixed qdoc warnings and generalized the date and time descriptions.David Boddie2010-08-271-16/+2
| |/
* | QLineEdit cursor is shown when asked to be non-visibleSami Merila2010-08-271-1/+3
|/ | | | | | | | | | | | | If QLineEdit is sent a QInputMethodEvent::Cursor event with value zero, widget still shows blinking cursor. This is due to that QLineControl ignores its internal state variable m_hideCursor value. As a fix, m_hideCursor is now considered when drawing the cursor. Additionally, the cursor blinking timer is stopped when cursor is hidden. Task-number: QT-3670 Reviewed-by: axis
* QDateEdit/QTimeEdit: remove duplicate properties.Olivier Goffart2010-08-191-2/+0
| | | | | | | They were hidding QDateTimeEdit properties. (And their NOTIFY signal did not work correctly) Reviewed-by: Joao