summaryrefslogtreecommitdiff
path: root/src/gui/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* typo fixRitt Konstantin2010-01-111-1/+1
| | | | | Merge-request: 2077 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0866-66/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| * Update copyright year to 2010Jason McDonald2010-01-0766-66/+66
| | | | | | | | Reviewed-by: Trust Me
* | Fix a painter warningPierre Rossi2010-01-071-0/+2
|/ | | | | | | | when using a treewidget with animations in a splitter and the tree is collapsed, and then select an item in the tree that requires expanding, it might end up trying to paint to an invalid pixmap Reviewed-by: Gabi
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-041-2/+31
|\
| * Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel ↵Stephen Kelly2009-12-181-2/+4
| | | | | | | | | | | | | | match its source. Merge-request: 2266 Reviewed-by: Olivier Goffart
| * Make sure mappings are created for columns when indexes newly become parents.Stephen Kelly2009-12-181-0/+27
| | | | | | | | | | | | | | Also move the modeltest related tests to the modeltest subdirectory Merge-request: 2262 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | doc: Added an explanatory \note about the table being sorted.Martin Smith2009-12-181-2/+12
|/ | | | Task-number: QTBUG-5046
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-161-2/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits) Fixed qstylesheetstyle benchmark for Symbian Fixed qdiriterator benchmark for Symbian Fixed events benchmark postEvent function Fix for QTBUG-4908 SVG transparency rendering problem. Long informative texts causes messagebox to grow outside of screen area qreal-ization qreal-ization qreal-ization QS60Style: Remove layouts with mirrored information Fixed qgraphicsview autotest build for winscw. Enabled input method update code for all platforms. (ODBC) Fixes segfault when error string is larger than 256 chars. Fixed QGraphicsView benchmark for Symbian. FEP indicator shown in status pane when it should not Skipped the most memory intensive tests in QByteArray benchmark. qreal-ization qreal-ization QS60Style: Theme graphics for QSlider in 3.1 QS60Style: Groove changes caused build break of S60 3.1 Slow spinbox on N95 when using keys Up/Down ...
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-163-1/+6
| |\ | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * | FEP indicator shown in status pane when it should notSami Merila2009-12-141-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FEP indicator is shown in few cases in statusbar when it should not be. Case a) Application contains item view. QAbstractItemView is initialized as having WA_InputMethodEnabled on, irregardless of functionality of each separate cell. So we need to check the model for the itemview cell about to receive focus, is it editable. If it isn't then, we'll set the WA_InputMethodEnabled as false. This will fix the FEP indicators in a lot of cases: lists with cells, empty lists, combobox lists, ... Case b) Combobox also initializes itself with WA_InputMethodEnabled active. Even if the fix a) fixed the list inside combobox, the widget itself when receiving focus needs also fixing. If we check the editable flag of combobox when initializing the comment, we can set the flag off. Task-number: QTBUG-5705 Reviewed-by: axis
* | | Clicking on a selected item wouldn't reset the selection anymore.Gabriel de Dietrich2009-12-152-3/+7
| |/ |/| | | | | | | | | | | | | | | | | | | Before commit 88ecc8c8250505129ccff2660c60412996e2fd85, this case was handled during the mouse release event, but was responsible for selections being made twice sometimes. We now check whether a selection actually happened during the mouse press event. If not, we will try to select again during the mouse release event. Auto-test included. Reviewed-by: Thierry Task-number: QTBUG-6753
* | Itemviews: we needed to call ensurePolishedwhen asking for sizehintsThierry Bastian2009-12-112-0/+5
| | | | | | | | Reviewed-by: Pierre Rossi
* | Fixes internal drag and drop in QListWidget while dropping to the endOlivier Goffart2009-12-101-1/+1
|/ | | | | Task-number: QTBUG-6565 Reviewed-by: Gabriel
* Assert in designer while drag & dropping items from a QListWidgetGabriel de Dietrich2009-12-071-1/+2
| | | | | | | Did not honour returned value from beginMoveRows(). Auto-test included. Reviewed-by: leo Task-number: QTBUG-6532
* Fixes broken selection with Shift and extended selectionOlivier Goffart2009-12-031-2/+2
| | | | | | | | | | ItemAt() is in viewport coordinate. Pressed index is in coordinate relative to the whole view (regression since Qt 4.5) Reviewed-by: thierry Task-number: QTBUG-6407
* In QListViews, items were being hovered even when mouse was on the scrollbarsGabriel de Dietrich2009-12-011-2/+6
| | | | | Reviewed-by: Olivier Task-number: QTBUG-6284
* QSortProxyModel: Crash when changing model with 2-level proxy and selected itemsGabriel de Dietrich2009-11-261-1/+5
| | | | | | | | The index mapping to the base model was being cleared before the persistant model indices. Reviewed-by: Olivier Task-number: QTBUG-6237
* Fix QTreeWidgetItem::setChildIndicatorPolicy not updating.Olivier Goffart2009-11-241-1/+1
| | | | | | | | | The problem is that the ChildIndicatorPolicy change the hasChildren in the model. But this is cached in the QTreeView layout. We must do a relayout to clear the cache. Reviewed-by: Thierry Task-number: QTBUG-3071
* Itemview: Fixes statustip not clearedOlivier Goffart2009-11-242-2/+13
| | | | | Task-number: QTBUG-1717 Reviewed-by: Thierry
* Fix QHeaderView when the model is reset and section have moved.Olivier Goffart2009-11-231-6/+19
| | | | | | | | The logicalIndices and visualIndices array where not clean of the old sections, resulting in corrupted header. Task-number: QTBUG-6058 Reviewed-by: Thierry
* Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-201-1/+1
| | | | | Reviewed-by: Olivier Task-number: QTBUG-6004
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
|\
| * Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | | | | | | | Reviewed-by: ogoffart
| * Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| | | | | | | | Reviewed-by: leo
* | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-2/+6
|/ | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl
* Ran the script utils/normalizeOlivier Goffart2009-11-182-14/+14
| | | | Over src/ tools/ examples/ and demos/
* QListView: fixes skipping one item in pageDown(Up)Leonardo Sobral Cunha2009-11-181-2/+6
| | | | | | | | | | | | The previous implementation was scrolling down (number of visible items in viewport) + 1 and this was leading to one item being skipped while doing page down (the same also happened for page up). Now we are scrolling (number of visible items in viewport) - 1 for each page down(up) (the '-1' is for keeping the context, so the last item will turn into the first in case of a page down, for example). Task-number: QTBUG-5877 Reviewed-by: thierry
* QListView: cleaning up whitespacesLeonardo Sobral Cunha2009-11-181-7/+7
|
* Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-171-1/+1
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-171-2/+2
| |\
| * \ Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-171-1/+1
| |\ \
| | * | Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | | | | | | | | | | | | | | | Fixes: QTBUG-5146
* | | | Mouse wheel wouldn't scroll the itemview when over header viewsGabriel de Dietrich2009-11-171-1/+6
| |_|/ |/| | | | | | | | | | | | | | | | | The mouse wheel event was not being relayed to the parent (supposedly QAbstractScrollArea) widget. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-5237
* | | Fix long text regression in listview that does not fits into the viewport.Olivier Goffart2009-11-171-2/+2
|/ / | | | | | | | | | | | | | | In commit f44fe888ee82b9e04, we adjusted the item size to the size of the viewport. It should really be adjusted to the size of the content. Task-number: QTBUG-5854 Reviewed-by: Gabi
* | QItemSelectionModel: fixed selection not kept when layout change and ↵Olivier Goffart2009-11-131-2/+3
| | | | | | | | | | | | | | | | | | | | everything is selected The arbitrary number in commit 8a7700ffb5e4959e78 was not big enough. People still complains Task-number: QTBUG-5671 Reviewed-by: Thierry
* | QTreeWidget visualRect now returns the rect for all columnsThierry Bastian2009-11-121-1/+8
|/ | | | | | | The autotest will follow Task-number: QTBUG-2844 Reviewed-by: ogoffart
* Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
|\
| * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-051-0/+1
|\ \ | |/
| * Merge branch '4.6-s60' into 4.6axis2009-11-041-0/+1
| |\
| | * Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | | | | | | | | | RevBy: Trust me
* | | Result API review with JasminThierry Bastian2009-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractAnimation: currentTime returns the "complete" current time currentLoopTime() returns the time inside the current loop add setPaused(bool) for consistency with QTimeLine stateChanged: newState passed as first paramater (before oldState) for consistency with the reset of Qt QAnimationGroup: rename clearAnimations to clear rename insertAnimationAt to insertAnimation rename takeAnimationAt to takeAnimation QSequentialAnimationGroup: rename insertPauseAt to insertPause
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-042-13/+13
|\ \ \ | |/ /
| * | QGtkStyle refactoringRobert Griebl2009-11-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-031-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-031-1/+1
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
* | | Fixed spacing display in QListView with wrapped text.Gabriel de Dietrich2009-11-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The spacing was not being substracted from the viewport width when calculating the available space for items. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-2678
* | | QTreeView navigation now inverts left and right in RTLThierry Bastian2009-10-301-0/+6
|/ / | | | | | | | | Task-number: QTBUG-5007 Reviewed-by: ogoffart
* | QTreeView: fix drawing branches of model that adds or remove rows dynamicallyOlivier Goffart2009-10-302-4/+37
| | | | | | | | | | | | | | | | The lasts commits in the treeview did put the flags weither item has child or is the last in cache in the viewItem vector. But the cache was not updated while the model is modified. Reviewed-by: Thierry