summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-174-4/+16
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-163-3/+6
| |\ | | | | | | | | | 4.6-staging2
| | * Maemo4 fix Hildon input method for graphics viewRalf Engels2009-11-163-3/+6
| | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * | QMenu: do not crash if action is destroyed in the triggered signal.Olivier Goffart2009-11-161-1/+2
| |/ | | | | | | | | Task-number: QTBUG-4480 Reviewed-by: Thierry
| * Made widgets not clear their contents after losing edit focus.axis2009-11-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a behavior change from Qt 4.5. The motivation for the change is the following use case: A user types into a line or text edit, and gets interrupted by for example phone call or an SMS. This causes the active application to lose focus, which again causes edit focus to be lost. When resuming the application the focus gets set back, but the edit focus does not (nor should it). However, when the user types the next character, the line edit will erase *all* contents of the widget because it did not have edit focus. This is extremely destructive for a mobile phone user, especially since undo is not easily available. Another reason for doing that fix is that it seems that this is the mode of operation that most existing phones use. The fix is enabled for Symbian only at the moment, but will be followed by a patch for all platforms which will go into 4.7. Task: QTBUG-5698 RevBy: Jason Barron
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-171-2/+4
|\ \ | |/ |/|
| * doc: Fixed qdoc errors.Martin Smith2009-11-161-1/+1
| |
| * Doc: Adding explanation to QTextEditMorten Engvoldsen2009-11-161-1/+1
| | | | | | | | | | | | | | Specifying explanation on tabStopWidth : int QTBUG-5470 David Boddie
| * Doc: Added short explanation to textEdit->toPlainText()Morten Engvoldsen2009-11-161-1/+3
| | | | | | | | Explaining(nbsp) the exception in character conversion.
* | Fixed a regression in mainwindow that would not restore correctlyThierry Bastian2009-11-131-3/+2
| | | | | | | | | | | | The size of the dockwidgets would be ignored. Reviewed-by: ogoffart
* | Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-131-2/+2
|\ \ | |/
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1313-74/+78
| |\
| * | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-1/+8
| | |
| * | Doc: Fix warnings caused by deprecations.David Boddie2009-11-091-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Fixed: QCalendarWidget::showNextMonth() followed by a click on the ↵Olivier Goffart2009-11-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation button causes it to go to the first possible month QCalendarWidget::setCurrentPage did not set the current index on the model. This is required in order to get QCalendarWidgetPrivate::getCurrentDate working. (and this is used by the calendar widget to navigate) This intentionaly do not check if the date is inside the minimumDate or maximumDate range. This was possible before, and the autotests tests that behaviour. Task-number: QTBUG-4058 Reviewed-by: Prasanth Ullattil
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-122-9/+21
|\ \ \ | | | | | | | | | | | | 4.6-staging2
| * | | Fix for qmessagebox default softkey visibility + some tab/space fixes.Janne Anttila2009-11-111-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default actions get added after the QDialogButtonBox::event receives show event. That's why 'ok' softkey action will not get added to the widget. Changed implementation so that softkey actions are added to widget when they are created. This implementation is also more safe in a sence that if actions are changed when message box is visible, the softkeys will be updated. Task-number: QTBUG-5644 Task-number: QT-2211 Reviewed-by: Sami Merila
| * | | Long-press shortcuts for symbols on QWERTY keyboard don't workJouni Hiltunen2009-11-101-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt key event was not handled properly in the case of long key press. With long key press, QCoeFepInputContext::commitCurrentString gets called 3 times("q", "", "1"). (Normal key press is causing one call). This is how aknfep works, so commitCurrentString was modified to replace first character if long key press event detected. E.g. "q" is replaced with "1". qlinecontrol modified to keep cursor position correct. Signed-off-by: axis <qt-info@nokia.com>
* | | QLabel: Fixed text underlined when te label has a control and the text ↵Olivier Goffart2009-11-122-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contains & We need to search for '&' in the text each time the QTextControl's document is updated. Also make sure not to match && Task-number: QTBUG-4154 Reviewed-by: Thierry
* | | Fixa regression that could make a dockwidget disappear if unfloatableThierry Bastian2009-11-121-0/+3
| |/ |/| | | | | | | Task-number: QTBUG-5740 Reviewed-by: ogoffart
* | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1113-74/+78
|\ \ | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| * | Fixed: QFontComboBox emits the currentFontChanged() signal twiceOlivier Goffart2009-11-111-1/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-2438 Reviewed-by: Thierry
| * | QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal ↵Olivier Goffart2009-11-112-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar If the vertical scrollbar is hidden, scroll using the other scrollbar. Reviewed-by: Thierry Task-number: QTBUG-1760
| * | Fix Font combobox: one can set the current font without it being changedThierry Bastian2009-11-111-0/+7
| | | | | | | | | | | | | | | Task-number: QTBUG-5693 Reviewed-by: ogoffart
| * | QDockWidget also emits dockLocationChanged when the state is restoredThierry Bastian2009-11-101-2/+1
| | | | | | | | | | | | | | | | | | | | | ...on the main window. Task-number: QTBUG-1304 Reviewed-by: ogoffart
| * | Make it possible for QMainWindow to restore the geom of undocked widgetThierry Bastian2009-11-101-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-5663 Reviewed-by: ogoffart
| * | Menubars in dual screen mode now popup the menus on the correct screenThierry Bastian2009-11-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | If an item is split then its menu appears on the screen which contains most of it. Task-number: QTBUG-773 Reviewed-by: ogoffart
| * | Make sure the context menus also clear the status tip when neededThierry Bastian2009-11-102-26/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-2700 Reviewed-by: ogoffart
| * | Make sure that the toolbar is in the mainwinow rect for dockingThierry Bastian2009-11-101-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-2598 Reviewed-by: ogoffart
| * | Make the toolbar extension animated according to the main windowThierry Bastian2009-11-103-5/+4
| | | | | | | | | | | | | | | | | | | | | Previously it would be always animated. Task-number: QTBUG-5623 Reviewed-by: Gabriel
| * | Make sure the dock widget is updated when changing closable propertyThierry Bastian2009-11-091-0/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-1665 Reviewed-by: ogoffart
| * | Now looking for the closer dock area for toolbuttonThierry Bastian2009-11-092-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we were looking for the 1st one that fit or was not too far (ie 80px) away. Now we really take the closest one. Task-number: QTBUG-2598 Reviewed-by: ogoffart
* | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-2/+9
| |/ |/|
* | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-092-2/+2
|\ \ | |/ |/|
| * Fixed pan gesture handlers in standard Qt widgets.Denis Dzyubenko2009-11-092-2/+2
| | | | | | | | Reviewed-by: Richard
* | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-098-14/+94
|\ \ | |/ |/|
| * API review: Rename numPages() -> pageCount()Marius Storm-Olsen2009-11-092-1/+14
| | | | | | | | | | | | | | | | QPrintPreviewWidget wasn't following the Qt API naming convention of *Count()/set*Count(). Introduce proper function, and obsolete the old. Removed all usage of the old function in Qt. Reviewed-by: Andreas Aardal Hanssen
| * API review: Rename numDigits() and setNumDigits()Marius Storm-Olsen2009-11-092-13/+35
| | | | | | | | | | | | | | QLCDNumber doesn't follow the API convention of *Count and set*Count(). Introduce properly named functions, and obsolete the old ones. Reviewed-by: Andreas Aardal Hanssen
| * API review: Add convenience functions using QMarginsMarius Storm-Olsen2009-11-064-0/+45
| | | | | | | | | | | | | | We added the class QMargins, so we should use it wherever we deal with margins, as a convenience to the users. Reviewed-by: Andreas Aardal Hanssen
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-061-0/+2
|\ \ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | Fix QT_NO_MENUBARJørgen Lind2009-11-061-0/+2
| |/ | | | | | | Reviewed-by: tom
* | Compile on MacOlivier Goffart2009-11-061-1/+1
| | | | | | | | Reviewed-by: Thierry
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-054-54/+63
|\ \ | |/
| * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-043-53/+61
| |\ | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | * Gesture api review.Denis Dzyubenko2009-11-031-4/+4
| | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-033-53/+61
| | | | | | | | | | | | Reviewed-by: trustme
| * | Fixed an input method bug when erasing the last character.axis2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the editor contents if the new preedit string was empty. However, it could be empty because the user just erased it, so the bug was fixed by checking whether the preedit string in the event and in the editor are different. RevBy: Denis Dzyubenko
* | | Fix crash in QMenu when using QWidgetActionOlivier Goffart2009-11-042-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QWidgetAction is not the first in a menu, it crashed. This is because when the QEvent::ActionRemoved is sent, the event->before() is not set. We need to find another way to clean up the widgetItems list. This basically revert 4b6ab00e6d68c7 Reviewed-by: Thierry
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-048-10/+28
|\ \ \ | |/ /
| * | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-0214-74/+124
| |\ \