┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2013-02-11Fix blinking when moving the mouse over an hidden itemAurélien Gâteau
The opacity of the unhovered pixmap must be gradually reduced while animating otherwise the alpha channel saturates. REVIEW: 108858 BUG: 299371 FIXED-IN: 4.10.1
2013-02-10Merge remote-tracking branch 'origin/KDE/4.10'Frank Reininghaus
2013-02-10Re-organize the code that compares expanded itemsFrank Reininghaus
The previous approach, which was based on comparing the URLs as strings, was not only very complex, but also could lead to inconsistencies in the model, namely, that not all children were removed from the model when the dir lister reported the parent as deleted. Later on, this could even lead to a crash. BUG: 311947 FIXED-IN: 4.11 REVIEW: 108766
2013-02-10Add benchmark for adding many child items in a tree structureFrank Reininghaus
2013-02-10Include parent-child relationships in KFileItemModel's consistency checkFrank Reininghaus
2013-02-06KFileItemModel::insertItems(): reserve sufficient space for m_itemsFrank Reininghaus
This prevents expensive and unnecessary repeated rehashing when many items are inserted into the model.
2013-02-05Add unit test for bug 313342Frank Reininghaus
2013-02-05Apply changes of the KGlobalSettings::singleClick() setting immediatelyAniket Anvit
Fixes a regression introduced by commit 7a364cbf489af25e123d18713523151a3a53f814. Patch reviewed and pushed by Frank Reininghaus. BUG: 313342 FIXED-IN: 4.10.1
2013-02-03Two small optimizations in KFileItemModel::removeItems()Frank Reininghaus
1. It seems that it really can happen that KFileItems that we get from the dir lister's itemsDeleted signal are not in the model any more, e.g., if a folder where hidden files are shown is left and a folder where hidden files are not shown is entered. There is no need to output warnings then. 2. Remove the emptiness-check for the KFileItemList at the beginning. Even in the unlikely event that we do get an empty list, we return just a few lines later in the code.
2013-02-03const QList<int> -> const QList<int>&Frank Reininghaus
2013-02-03Remove unneeded #includeFrank Reininghaus
2013-01-30Merge remote-tracking branch 'origin/KDE/4.10'Frank Reininghaus
Conflicts: dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-30Add unit test for bug 314046Frank Reininghaus
The regression happened in the master branch only, but I think it doesn't hurt to add the test to the stable branch. CCBUG: 314046
2013-01-29Update Dolphin version to 2.2 for KDE 4.10.0Frank Reininghaus
2013-01-29Fix crashes in KFileItemModel::removeItems()Frank Reininghaus
These crashes were caused by the recent commit ff3267c6dcd0f6d0621b3a96b5462a9581a03883. It introduced two problems: a) A logic error in the code that removes the ItemData pointers from m_itemData that could cause crashes if multiple item ranges are removed, and there were un-removed items behind the last one. b) The implicit assumption that any call of removeItems() will actually result in items being removed in the model. This is incorrect if the model is first cleared and then the hidden-files setting is modified, which happens if "Save view properties for each folder" is enabled, and a folder where hidden files are shown is left. In that case, the dir lister emits itemsDeleted for the hidden items after they have been removed from the model due to the folder change. I'll add a unit test covering these issues soon. Many thanks to Romário Rios and Hrvoje Senjan for testing! BUG: 314046
2013-01-27Merge branch 'KDE/4.10'Weng Xuetian
2013-01-27escape the existing text instead of set to plain textWeng Xuetian
@info indicates it's rich text and will be added <html> tag by kdelibs, so just escape the text that will be set to label for KDE/4.10 REVIEW: 108584 BUG: 313992
2013-01-27Merge remote-tracking branch 'origin/KDE/4.10'Frank Reininghaus
Conflicts: dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-27Move the consistency check for KFileItemModel from the test to the classFrank Reininghaus
This makes it possible to check the model's consistency also in other places, e.g., in KFileItemModel's benchmark.
2013-01-27Add a unit test for a recently fixed crashFrank Reininghaus
Before commit 90c7fd400c34e6d4d583c54c04631856c387d359, adding a KFileItem with an empty path caused a crash in KFileItemModel::expandedParentsCountCompare().
2013-01-27Performance improvements in KFileItemModel::removeItems()Frank Reininghaus
The performance of this method is improved by: a) Not removing items one by one, but doing it in a way that minimizes the number of moves to prevent O(N^2) worst-case complexity. b) Not sorting the removed items using the potentially extremely slow KFileItemModel::lessThan. We can get the indexes of the removed items very easily from the hash m_items, and sorting ints is a lot faster. c) Preventing repeated rehashing of m_items when removing the deleted URLs by replacing remove() by erase(). REVIEW: 108540
2013-01-27Add some benchmarks for KFileItemModelFrank Reininghaus
The benchmark executable must be run manually. It is not run automatically with the other unit tests to prevent waste of CPU cycles in the not-so-uncommon situation that only test failures attract attention.
2013-01-24Merge remote-tracking branch 'origin/KDE/4.10'Luca Beltrame
2013-01-24KFileItemModelRolesUpdater: Avoid multiple updates for Nepomuk dataVishesh Handa
The Nepomuk ResourceWatcher emits 3 signals - propertyChanged, propertyAdded and propertyRemoved. We should only listen to either the propertyChanged signal or the propertyAdded + Removed signals. There is no point in listening to all 3 signals. That will just result in unnecessary updates. Additionally, we do not need to listen to the resourceCreated signal. That is only emitted when we are watching for a specific types, which we are not. REVIEW: 108543
2013-01-24Merge remote-tracking branch 'origin/KDE/4.10'Frank Reininghaus
2013-01-22Make the "A folder cannot be dropped into itself" message less intrusiveFrank Reininghaus
Showing this message in the KMessageWidget above the view, which means that the view contents are moved down, can be extremely annoying according to user feedback. Just showing the message in the status bar is probably enough. BUG: 313466 REVIEW: 108483 FIXED-IN: 4.10.0
2013-01-18SVN_SILENT made messages (.desktop file)Script Kiddy
2013-01-17SVN_SILENT made messages (.desktop file)Script Kiddy
2013-01-16Merge remote-tracking branch 'origin/KDE/4.10'Luca Beltrame
2013-01-16Allow Timeline-URLs as homepageAndrea Scarpino
FEATURE: 313151 REVIEW: 108428
2013-01-16Allow Timeline-URLs as homepageAndrea Scarpino
FEATURE: 313151 REVIEW: 108428
2013-01-16Use proper IconSize for PlacesItemEditDialog's KIconButtonKai Uwe Broulik
REVIEW: 108443
2013-01-16SVN_SILENT made messages (.desktop file)Script Kiddy
2013-01-15Remove incorrect comments about the sorting functionsFrank Reininghaus
In fact, we could use the sorting functions provided by Qt or the STL. The reason why we have our own is that we want to support parallel sorting because sorting many items naturally by name can be expensive.
2013-01-15Update Dolphin version to 2.1.98 for KDE 4.10 RC 3Frank Reininghaus
2013-01-15Re-organise the sorting codeFrank Reininghaus
The KFileItemModel-specific parts are now separated from the generic ones, like the parallel sorting implementation. REVIEW: 108386
2013-01-15Change the sort and merge functions to a more generic form.Frank Reininghaus
This might make it easier to reuse the parallel sorting code. Moreover, some the upperBound/lowerBound functions have been removed because equivalents are provided by the STL.
2013-01-15Use std::rotate, rather than reversing three timesFrank Reininghaus
We need less code now, and moreover, the STL implementation of rotate should be more efficient than three reverse() calls.
2013-01-15The locking around the plugin access in actions doesn't seem to beSimeon Bird
necessary, as actions is only called from the main thread. Also it wasn't checked consistently; if the lock could not be taken, the plugin was accessed anyway.
2013-01-15We don't need the mutex guarding m_itemStates in theSimeon Bird
UpdateItemStatesThread, because m_itemStates is only accessed by the when the thread is done, and set before the thread starts. Also combine the setData function with the constructor.
2013-01-15Merge branch 'KDE/4.10'Simeon Bird
2013-01-15A crash occurs if updateItemStates runs between theSimeon Bird
UpdateItemStatesThread finishing and the finished() signal being delivered. In this case, a new thread was not created, because the old thread still existed. However, pendingItemStatesUpdate was not set, because the thread was not running. Instead, the old thread was restarted. This meant that the finished() signal from the first run could be delivered while the thread was running for a second time, causing the thread to be deleted while still running and thus a crash. Solution: set pendingItemStatesUpdate if the thread is non-null, even if it is not running, knowing that slotThreadFinished has not yet run, and will call updateItemStates itself. BUG: 302264 FIXED-IN: 4.10 REVIEW: 107656
2013-01-14Select right item as current item (first item after the deletion) after ↵Emmanuel Pescosta
deleting files BUG: 290736 REVIEW: 108356 FIXED-IN: 4.10
2013-01-14Don't delay popup menus of "Create New" and "Recently Closed Tabs" toolbar ↵Kai Uwe Broulik
buttons REVIEW: 108397
2013-01-13Update Dolphin's About dialogFrank Reininghaus
Emmanuel has contributed a lot of useful patches to Dolphin. Thank you very much for that! The Dolphin community is looking forward to further contributions from you. CCMAIL: [email protected]
2013-01-12Merge remote-tracking branch 'origin/KDE/4.10'Luca Beltrame
2013-01-11Show the file name as plain text in the file-metadata-tooltipEmmanuel Pescosta
FIXED-IN: 4.10 BUG: 262464 REVIEW: 108336
2013-01-11Merge remote-tracking branch 'origin/KDE/4.10'Frank Reininghaus
2013-01-11Slightly reduce the tinting for selected icons and previewsFrank Reininghaus
The intention of the tinting was to make it more obvious in icons view which icons are selected. However, some icons and previews look quite ugly with the current tinting value of 1.0 (i.e., the value passed to KIconEffect::colorize). A slight reduction of this value to 0.8 makes this a little less ugly. However, the real fix is to remove the tinting altogether and find something better to indicate which items are selected. CCBUG: 309722
2013-01-11Only use parallel sorting when sorting by nameFrank Reininghaus
The reentrant natural comparison of strings is the only really expensive operation. Other comparison functions are much cheaper and might not be reentrant at all. Therefore, we disable parallel sorting when not sorting by name to prevent crashes and other unpleasant behaviour. BUG: 312679 FIXED-IN: 4.10 REVIEW: 108309