summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.6'Olivier Goffart2009-12-1513-43/+103
|\ | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * Fixes cursor blinking in the QComboBox when it becomes editable while having ↵Olivier Goffart2009-12-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | the focus. The lineedit has the focus because it becomes focusproxy of the QComboBox. But the focusInEvent is not called because the combobox has already the focus when setFocusProxy is called. Workaround that in the show event. Task-number: QTBUG-1949 Reviewed-by: Thierry
| * Fix spinbox input when seecting the prefixThierry Bastian2009-12-101-1/+3
| | | | | | | | | | | | | | | | If you were selcting the prefix and entering a digit the cursor position would not be updated correctly Task-number: QTBUG-6670 Reviewed-by: ogoffart
| * Fixed a regression in dock widget resizingThierry Bastian2009-12-091-2/+2
| | | | | | | | | | | | | | It could happen that they grow much more than the movement of the mouse Task-number: QTBUG-6499 Reviewed-by: gabi
| * Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-092-1/+4
| | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
| * 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
* | | | | QPlainTextEdit scrolling issue with folded paragraphsmae2009-12-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Qt Creator, we could reproduce scrolling problems when paragraphs were folded away. Effectively the first "visible" block could be an invisible one, resulting in firstVisibleBlock() returning something bogus. The result were drawing errors. Reviewed-by: con
* | | | | Fix the int validator not handling the localeThierry Bastian2009-12-092-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3179 Reviewed-by: ogoffart
* | | | | Added QToolBar::visibilityChanged(bool) signal.J-P Nurmi2009-12-082-0/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Thierry
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-051-0/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | oslo-staging-1/4.6 into 4.6
| * | | | 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
* | | | Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-041-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | | Fix QPlainTextEdit cursorUp/Down in combination with non-visible blocksmae2009-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlainTextEdit uses QTextCursor::movePosition to reposition the cursor after pageUp/Down. If this cursor happens to be in non-visual mode (the default), it might end up on an invisible block. This results in magically unfolding sections in Qt Creator.
* | | | | Merge branch '4.6'Thiago Macieira2009-12-035-3/+59
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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 branch '4.6'Thiago Macieira2009-12-029-82/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | | 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
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | 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
* | | | | | | Adjust documentation on QCombobox::maxVisibleItems to mention that this does ↵Olivier Goffart2009-11-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work with gtk. Also fixed the fact that it would show one item to many. Task-number: QTBUG-760 Reviewed-by: jbache
* | | | | | | Merge branch '4.6'Thiago Macieira2009-11-2527-95/+310
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
generated by cgit v0.12 at 2024-11-28 06:21:59 (GMT)