summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-262-4/+37
|\ | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.Janne Anttila2010-02-261-2/+1
| | | | | | | | | | | | | | | | RVCT does not like static inline, and variables should not be defined in case statement without braces. In this case the temp variable was actually unnecessary. Reviewed-By: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-251-4/+37
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Crash in QGraphicsScenePrivate::setFocusItemHelper Improvements to itemview keypad navigation in S60. Fix SymbianMakefileGenerator::absolutizePath for clean builds Misc fixes to FLM files
| | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-251-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic used in this commit is partially taken from sliders. This commit makes it possible to interact (change row or column) in itemview even itemview does not have editFocus. Interacting without editFocus is enabled when it is not possible to keypad navigate to reuqested direction. In addition if keypad navigation to any direction is not possible (i.e there is only one listwidget on screen), there is no sense to add "done" softkey to get out of edit focus. Task-number: QTBUG-4802 Reviewed-by: Alessandro Portale
| * | Set the roleNames of proxy models to the roleNames of the source model.Stephen Kelly2010-02-251-0/+1
| |/ | | | | | | | | | | | | This simplifies the use of model view with qml and proxies. Merge-request: 2315 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | Expand indicator would not be displayed after removal of a collapsed item's ↵Gabriel de Dietrich2010-02-241-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | child While setting the hasChildren property of QTreeViewItem, "collapsed" and "not visible" were being mistaken. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7443
* | Fixed hypersensitive drag on QHeaderViewsGabriel de Dietrich2010-02-241-7/+2
| | | | | | | | | | | | | | | | | | | | | | The header section was in a moving state before the drag actually started. That is, before we moved more than QApplication::startDragDistance(). This could cause a click to be considered as a move in some cases. No auto-test as it would involve dragging. Task-number: QTBUG-7327 Reviewed-by: Olivier
* | QSortFilterProxyModel: Sorting occured unnecessarily when the ↵Olivier Goffart2010-02-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamicSortFilter is turned off We should not sort when inserting items if the dinamicSortFilter flag is set to false. Note that some of the test used to rely on the fact that it was sorted. Those test have been fixed. The patch has been contributed to us in the task. Task-number: QTBUG-7716 Reviewed-by: Thierry
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-191-4/+5
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| * QTreeView: Fix premature pessimizationJoão Abecasis2010-02-181-4/+5
| | | | | | | | Reviewed-by: Olivier Goffart
* | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-0/+5
|\ \ | |/ | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| * Support for dynamic localization in Symbian softkeys.Janne Anttila2010-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | This commit adds support for dynamic i.e. runtime localization of S60 softkeys. Note that translations are not provided yet with qt.sis (QTBUG-4919), meaning that localization does not actually happen unless application developer provides its own translation (including translation for softkeys). Task-number: QTBUG-6785 Reviewed-by: Jason Barron
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-1/+1
|\ \ | |/
| * QListView: fix crash when hiding many of the lasts item in a QListViewOlivier Goffart2010-02-091-1/+1
| | | | | | | | | | | | | | | | Since 6c1388ee5a3c4796d hidden items are not taken in account when counting the scrollbar position, and so the vector may be smaller. Reviewed-by: Gabriel Task-number: QTBUG-7929
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-041-5/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed wrong variable name QHeaderView: fixes sectionClicked() emitted with wrong section index
| * | QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2010-02-041-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The obvious fix is to use the previsously computed 'section' as paramatter. (It is even faster) But one might wonder why logicalIndexAt() does not return the same result before and after flipSortIndicator(). The reason is that while being sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden again. Leaving some pending computation. Task-number: QTBUG-7833 Reviewed-by: Gabriel
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-021-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-021-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel: Fix dynamic sorting when severals rows are added. QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.
| * | | QSortFilterProxyModel: Fix dynamic sorting when severals rows are added.Olivier Goffart2010-02-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to update the sorting column in clear_mapping. But the problem is that updating the source column create a mapping (because it uses mapToSource). So we need to clear that wrong mapping again In _q_sourceLayoutChanged there was an uneeded special case. The case where the source_sort_column might change was never triggered because of that. So now that the special case has been removed, we need to do as in clear_mapping. The test cover the change in clear_mapping and in _q_sourceLayoutChanged The problem was shown in the Kopete: https://bugs.kde.org/show_bug.cgi?id=199850 Reviewed-by: Thierry Task-number: QTBUG-7537
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-021-2/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix a problem with overlay icons in the fileiconproviderJens Bache-Wiig2010-02-011-2/+3
| |/ | | | | | | | | | | | | | | | | | | Adding SHGFI_OVERLAYINDEX will append a system overlay identifier to the hIcon member, giving us a unique cache id for overlayed icons. Without this we could end up with having random overlays on icons depending on which one we loaded first. Task-number: QTBUG-7663 Reviewed-by: prasanth
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Another ASSERT while deleting spansGabriel de Dietrich2010-01-251-1/+3
| | | | | | | | | | | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
* | Merge branch '4.6'Thiago Macieira2010-01-181-0/+7
|\ \ | |/
| * QListView in icon view mode, drop enabled items wouldn't receive anythingGabriel de Dietrich2010-01-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | QIconModeViewBase::filterDropEvent() was only moving the items around in the view without ever checking whether the cursor was over a drop enabled item. Now it does and returns false if it's the case. As a consequence, QAbstractItemView::dropEvent() gets called. No auto-test since it's a drag & drop related task. Reviewed-by: janarve Task-number: QTBUG-6848
* | Merge branch '4.6'Thiago Macieira2010-01-1366-80/+81
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Merge remote branch 'qt/4.6' into oslo-staging-2/4.6Paul Olav Tvete2010-01-1266-67/+67
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.6.1
| | * 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-0666-66/+66
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fix incorrect drawing of the hovered row on QTreeView with some styles.Olivier Goffart2010-01-112-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some styles such as oxygen, or gtk, require the whole row to be redrawn in case of mouse hover the items. There was special code that handle that in the MouseMove event of the QTreeView, but that did not covered all the case (such as scrolling with the mouse wheel) Reviewed-by: Gabriel
| * | | QTreeView::selectAll() wouldn't work when first column hiddenGabriel de Dietrich2010-01-111-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | QTreeView::selectAll() called QTreeView::select() on the first column, first and last rows, and rows selection flags. As the first row was hidden, this range spanned to void. We now pass the upper-left and lower-right indices to select(). Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-6450
* | | Merge branch '4.6'Thiago Macieira2010-01-121-0/+2
|\ \ \ | |/ /
| * | 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
* | Obsolete QDirModel and remove it from the doc.Alexis Menard2010-01-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileSystemModel provides the same features as QDirModel but in a efficient way so no need to keep QDirModel around. This commit mark as obsolete QDirModel. Examples has been ported to use QFileSystemModel instead. QCompleter also gain the support of QFileSystemModel to complete nicely a line edit. This commit also add a new signal in QFileSystemModel when the directory is loaded, i.e. the thread has finished to read the current dir. Task-number:QTBUG-3884 Reviewed-by:ogoffart Reviewed-by:gabi Reviewed-by:mbm
* | Merge branch '4.6'Thiago Macieira2010-01-081-2/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-041-2/+31
| |\
| * | doc: Added an explanatory \note about the table being sorted.Martin Smith2009-12-181-2/+12
| | | | | | | | | | | | Task-number: QTBUG-5046
* | | Don't call invalidate when resetting the QSortFilterProxyModel.Stephen Kelly2010-01-061-1/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The invalidate connection is made before connecting the source model, which means it gets called first. If a second proxy model is used with it, the sourceLayoutAboutToBeChanged of the second proxy is therefore called before its sourceReset slot, but after the persistent indexes of the first model have been invalidated. The invalidate call is not needed because clear_mappings is called when the source model is reset anyway. Merge-request: 416 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | 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>
* 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
generated by cgit v0.12 at 2025-01-02 17:11:06 (GMT)