summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Slow spinbox on N95 when using keys Up/DownAleksandar Sasha Babic2009-12-112-12/+58
| | | | | | | | | | | | | | | In the style demo, spinbox widget, we noticed that to go from 0 to 99 , with key Up, takes 35 seconds. This was too slow. It turned out that no acceleration has been implementd when using keyboard, although acceleration works when mouse used. We fixed this by using timer events, as it is the case for mouse events. We also needed to get what is the keyboard repat rate interval from system. This value is used to set timer intervals in more natural way. Task-number: QT-927 Reviewed-by: janarve
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-098-39/+84
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-081-0/+1
| |\ | | | | | | | | | 4.6-staging2
| | * Minor fixes to softkey dimming support (commit 245c9cc0).Janne Anttila2009-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt invisible actions are disabled by default, and our "Options" softkey is set to invisible in order that it is not show in context menu. Thus we need don't want to dim in softkey even it is disabled. Additionally, QDialogButtonEnabledProxy need to set the initial enabled state for proxy action from button. Fixes bugs in commit: 245c9cc0 Reviewed-by: TrustMe
| * | Compilation fixThierry Bastian2009-12-071-0/+1
| | |
| * | Fix the toolbars dockingThierry Bastian2009-12-071-5/+10
| |/ | | | | | | | | | | | | | | | | The gap could be inserted even if the toolbar is very far away. This is due to the fact that we were only considering the distance as 1-directional. Now we also check that mouse position is inside the main window. Reviewed-by: gabi
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-071-1/+27
| |\ | | | | | | | | | 4.6-staging2
| | * Added dimming support for disabled softkeys in Symbian.Janne Anttila2009-12-071-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QAction::setEnabled(false) is called, the CBA buttons are dimmed to have visual indication about disabled state. Since enabled/disabled state of buttons in QDialogButtonBox is controlled via QPushButton::setEnabled API, and because button box content in Symbian is mapped to sofkkeys we also need to have proxy for button enabled state to forward the information for underlying QAction. Reviewed-by: Sami Merila
| * | Fixes problem with QMenu when it's populated on the aboutToShowPierre Rossi2009-12-044-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the menu is populated that late, if the menu is to go off-screen, then it is moved and ends up covering its originating button. Includes some code cleanup thanks to Thierry's tips. Reviewed-by: Gabriel Reviewed-by: Thierry
| * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-046-7/+63
| |\ \
| * | | Fix toolbar animation when restoring from expanded stateThierry Bastian2009-12-042-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6529 Reviewed-by: Gabi
* | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-051-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | oslo-staging-1/4.6 into 4.6
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1Denis Dzyubenko2009-12-033-7/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoawindow_mac.mm
| * | | | Do not enabled Pan gesture by default on Mac.Denis Dzyubenko2009-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled Pan gesture makes your widget receive mouse release events while doing system gestures like two-finger scroll. Reviewed-by: Richard
* | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | QCompleter wouldn't emit highlighted() and activated() signalsGabriel de Dietrich2009-12-031-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Completion was checked before sending the textEdited() signal from QLineEdit. The behaviour has been reverted as in 4.5. Reviewed-by: aalpert Task-number: QTBUG-6386
* | | | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing and releasing the finger/stylus on an editable text widget should only trigger the input method if the release position is still within the widget's boundaries. Reviewed-by: axis
* | | | Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please note: Qt for Maemo5 will already use it in 4.6, while the other platforms will be enabled in 4.7 (otherwise be would break BIC there) This commit adds a so-called placeholder text for line edits. If the widget doesn't have focus and the text() is empty, this placeholder will be shown. (*) also known as hint, click-message or descriptive text Reviewed-by: jasplin
* | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-023-7/+12
|\ \ \ | |/ / | | / | |/ |/|
| * Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-023-7/+12
| |\
| | * Fixed a potential crash in QDockWidgetThierry Bastian2009-12-011-2/+5
| | | | | | | | | | | | | | | | | | | | | This happened when inserting the gap over a place holder item. Task-number: QTBUG-6107 Reviewed-by: Gabi
| | * Fix QFontCombobox autotest on X11Olivier Goffart2009-12-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, Font might have a foundry within bracket. This foundry is set by the font combobox, and makes the font comparison fail. Make sure the other attributes (size, bold, ...) are preserved when the font is changed. Reviewed-by: Gabriel
| | * Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-272-4/+10
| | |\
| | * | state wasn't being correctly reloaded on mac with unified toolbarThierry Bastian2009-11-271-2/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-5932
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-295-71/+49
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-271-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Improved and optimized the WaveUnderlineThorbjørn Lindeijer2009-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WaveUnderline used to be a series of 180 degree arcs, that didn't always align very well between different text items and that could be clipped at the bottom since the font height got reduced. Now it uses quad beziers so that it is more like a sinus curve, and the alignment and clipping issues have been fixed. The painting of the WaveUnderline has been optimized using QPixmapCache. A 100 pixels wide sample of the wave is now cached as a pixmap and repeated to draw the WaveUnderline. This is an order of magnitude faster than rasterizing a QPainterPath. The QPlainTextEdit needs to set the brush origin since it draws the text items in local widget coordinates, rather than relying on a painter translation like the QTextEdit. Done with mae.
| * | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-274-71/+46
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-262-6/+7
| | |\ \ | | | | | | | | | | | | | | | 4.6-staging2
| | | * | Fixed context menu placement partially outside screen bug in Symbian.Janne Anttila2009-11-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In style demo example when spinbox was long tapped, the context menu was placed partially outside screen. The preconditions for bug were: 1. Tap position is near screen right edge 2. Minimum space width requested by context menu is > sreen width The new (simplified) logic is as follows: 1. If menus right edge in requested position is outside screen right edge, the menu is moved to left enough to fit on screen. i.e. if (tap position + menu width > screen right ) x = screen right - menu width 2. As a result of above statement the x position might go outside left boundary of screen. This is fixed by next statements if( x < screen left ) x = screen left Task-number: QTBUG-6164 Reviewed-by: Alessandro Portale
| | | * | Fixed context menu not to have "Options" action.Janne Anttila2009-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling QMainWindow::setMenuBar(), menuBarAction ("Options") gets added to widget actions list. This actions will be shown in widget context menu if visible. That's why we set the action invisible. Visibility property does not have impact to softkey contruction, i.e. also invisble softkeys are added. Task-number: QTBUG-6220 Reviewed-by: Jason Barron
| | * | | Make the spinbox and doublespinbox better accept intermediate inputThierry Bastian2009-11-251-65/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5008 Reviewed-by: ogoffart
| | * | | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-251-0/+24
| | |\ \ \
| | * | | | Make sure the cursor of the lineedit doesn't blink when a key is pressedThierry Bastian2009-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression against 4.5 Task-number: QTBUG-4944 Reviewed-by: ogoffart
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-274-4/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-254-4/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-11-254-4/+14
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Make paste + undo behave in QLineEdit as it does in QTextEditThierry Bastian2009-11-241-1/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | On the undo/redo stack, it needs to be treated as a separate command Task-number: QTBUG-5786 Reviewed-by: ogoffart
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2axis2009-11-242-2/+7
| | | |\
| | | * | Make the menubar filter out EScape only if there is a current actionThierry Bastian2009-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4965 Reviewed-by: gabi
| | | * | Make the buttons react on mouse release only if it was pressedThierry Bastian2009-11-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3521 Reviewed-by: prasanth
* | | | | On Mac OS X, QLineEdit should handle MoveToStart/EndOfBlockBenjamin Poulain2009-11-261-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, with a QLineEdit, QKeySequence::MoveToStartOfBlock should move the cursor to the beginning of the input, and QKeySequence::MoveToEndOfBlock to the end of the block Same for selection. The shortcuts also had to be updated. Task-number: QTBUG-4679 Reviewed-by: Olivier Goffart
* | | | Mac: deleting a menu item might clear items in other menusRichard Moe Gustavsen2009-11-251-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reson is that some menu items are reused across all menu bars. So we need to check that a menu actually still owns the item before clearing or hiding its data. Reviewed-by: Prasanth
* | | | Cocoa: 'Quit' in menu bar does not workRichard Moe Gustavsen2009-11-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have two window, each with its own menu bar that has a 'Quit' action, we reuse the quit menu item when switching between the windows. Now, it we deleteLater one of the menu bars, the new menubar will update the 'Quit' item just before deleteLater will come along and remote the update again. This patch will fix this. Task-number: QTBUG-4684 Reviewed-by: Prasanth
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-252-2/+28
|\ \ \ \ | |/ / /
| * | | Fix softkeys for QDialogButtonBoxes created without a parent.Jason Barron2009-11-241-0/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inthe case where a QDialogButtonBox was created without a parent, for example in the FTP example, the softkeys that are automatically created inside the button box were not being added to the right widget when the button box was given a parent (or added to a layout) later. This patch resolves that issue by handling the ParentChange event and then adding the softkeys at this point. Task-number: QTBUG-6086 Reviewed-by: axis
| * | Docs : Add details to QMdiArea::removeSubWindow()Dean Dettman2009-11-241-2/+4
| | | | | | | | | | | | | | | | | | | | | Clarifying that the behaviour is different depending on what is passed in. Reviewed-by: Morten Engvoldsen
* | | QLineEdit fix for macDenis Dzyubenko2009-11-241-2/+6
|/ / | | | | | | | | | | | | | | On the Mac Up/Down arrow keys move the cursor to the beginning/end of the lineedit. The fix is to make sure the corresponding keyevent will be accepted by the QLineEdit and not propagated to parent widgets (resulting in a beep). Reviewed-by: Prasanth
* | Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-233-3/+6
|\ \ | |/
| * Revert "Do not extend the last toolbar in a line when moving it"Thierry Bastian2009-11-202-8/+6
| | | | | | | | | | | | make a real fix for the problem is defaulting to sizehint when there is no preferred size set (ie the toolbar hasn't been moved) This reverts commit a2c247ed521d88f99a21b4207cdff8ea03e949be.