Commit graph

18598 commits

Author SHA1 Message Date
Script Kiddy
60a3b94c93 SVN_SILENT made messages (.desktop file) 2013-01-29 16:50:08 +01:00
Script Kiddy
cf4b84a8f6 SVN_SILENT made messages (.desktop file) 2013-01-28 08:44:17 +01:00
Weng Xuetian
be750f79dc Merge branch 'KDE/4.10' 2013-01-27 14:13:04 -05:00
Weng Xuetian
8a97ca66ad escape the existing text instead of set to plain text
@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-27 14:09:12 -05:00
Frank Reininghaus
cf8a08fcd2 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-27 15:25:47 +01:00
Frank Reininghaus
3c926c0673 Move the consistency check for KFileItemModel from the test to the class
This makes it possible to check the model's consistency also in other
places, e.g., in KFileItemModel's benchmark.
2013-01-27 15:19:39 +01:00
Frank Reininghaus
4113dd0198 Add a unit test for a recently fixed crash
Before commit 90c7fd400c, adding a
KFileItem with an empty path caused a crash in
KFileItemModel::expandedParentsCountCompare().
2013-01-27 14:09:39 +01:00
Frank Reininghaus
ff3267c6dc Performance improvements in KFileItemModel::removeItems()
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-27 13:07:46 +01:00
Script Kiddy
435bc19c0e SVN_SILENT made messages (.desktop file) 2013-01-27 12:59:07 +01:00
Frank Reininghaus
d18e6f0a12 Add some benchmarks for KFileItemModel
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-27 12:55:37 +01:00
Luca Beltrame
db89a99b7f Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-24 23:49:59 +01:00
Vishesh Handa
af280715ff KFileItemModelRolesUpdater: Avoid multiple updates for Nepomuk data
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-24 23:16:27 +05:30
Frank Reininghaus
787116a96f Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-24 09:39:33 +01:00
Yuri Chornoivan
148f17db88 Fix typo: diabled -> disabled 2013-01-24 07:44:38 +02:00
Burkhard Lück
38879704b3 dolphin doc update to 4.10 2013-01-23 23:17:34 +01:00
Frank Reininghaus
c10517314c Make the "A folder cannot be dropped into itself" message less intrusive
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-22 07:17:35 +01:00
Script Kiddy
a19d4cdd4f SVN_SILENT made messages (.desktop file) 2013-01-21 12:43:59 +01:00
Script Kiddy
d9c87da1eb SVN_SILENT made messages (.desktop file) 2013-01-21 08:16:28 +01:00
Script Kiddy
e62bf400b5 SVN_SILENT made messages (.desktop file) 2013-01-20 11:55:12 +01:00
Script Kiddy
c0784ee3f9 SVN_SILENT made messages (.desktop file) 2013-01-20 07:49:24 +01:00
Script Kiddy
3be00df4cb SVN_SILENT made messages (.desktop file) 2013-01-18 12:32:11 +01:00
Script Kiddy
e8260ebc81 SVN_SILENT made messages (.desktop file) 2013-01-18 08:05:47 +01:00
Script Kiddy
b273d42c4f SVN_SILENT made messages (.desktop file) 2013-01-17 12:48:56 +01:00
Script Kiddy
3c26839222 SVN_SILENT made messages (.desktop file) 2013-01-17 08:10:20 +01:00
Luca Beltrame
bd9de960b0 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-16 23:42:25 +01:00
Andrea Scarpino
26cf73dcac Allow Timeline-URLs as homepage
FEATURE: 313151
REVIEW: 108428
2013-01-16 23:16:10 +00:59
Andrea Scarpino
87a4eb9eaf Allow Timeline-URLs as homepage
FEATURE: 313151
REVIEW: 108428
2013-01-16 23:04:47 +00:59
Kai Uwe Broulik
99f200d21b Use proper IconSize for PlacesItemEditDialog's KIconButton
REVIEW: 108443
2013-01-16 22:54:32 +01:00
Script Kiddy
98bcd3af23 SVN_SILENT made messages (.desktop file) 2013-01-16 12:34:10 +01:00
André Marcelo Alvarenga
bd12613bac Remove extra spaces 2013-01-15 23:05:26 -02:00
Frank Reininghaus
53160d39ea Remove incorrect comments about the sorting functions
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-15 19:07:36 +01:00
Frank Reininghaus
643c96787c Update Dolphin version to 2.1.98 for KDE 4.10 RC 3 2013-01-15 18:56:14 +01:00
Frank Reininghaus
ccbc991635 Re-organise the sorting code
The KFileItemModel-specific parts are now separated from the generic
ones, like the parallel sorting implementation.

REVIEW: 108386
2013-01-15 18:50:37 +01:00
Frank Reininghaus
62adc5e4ca Change the sort and merge functions to a more generic form.
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-15 18:47:51 +01:00
Frank Reininghaus
0881c08326 Use std::rotate, rather than reversing three times
We need less code now, and moreover, the STL implementation of rotate
should be more efficient than three reverse() calls.
2013-01-15 18:44:42 +01:00
Simeon Bird
173efe0b1a The locking around the plugin access in actions doesn't seem to be
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-15 11:12:09 -05:00
Simeon Bird
cb6d10809a We don't need the mutex guarding m_itemStates in the
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-15 11:11:59 -05:00
Simeon Bird
2bc8f4f6ec Merge branch 'KDE/4.10' 2013-01-15 11:11:11 -05:00
Simeon Bird
a9d7ebbc8b A crash occurs if updateItemStates runs between the
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-15 11:10:58 -05:00
Script Kiddy
e914b384d4 SVN_SILENT made messages (.desktop file) 2013-01-15 16:08:59 +01:00
Emmanuel Pescosta
14e5ba5bfa Select right item as current item (first item after the deletion) after deleting files
BUG: 290736
REVIEW: 108356
FIXED-IN: 4.10
2013-01-14 20:01:03 +01:00
Kai Uwe Broulik
4d9af664e9 Don't delay popup menus of "Create New" and "Recently Closed Tabs" toolbar buttons
REVIEW: 108397
2013-01-14 10:42:03 +01:00
Script Kiddy
3d989309d2 SVN_SILENT made messages (.desktop file) 2013-01-14 08:25:57 +01:00
Patrick von Reth
8e6d6a0f2d fixed build on non x11 systems 2013-01-13 14:24:57 +01:00
Frank Reininghaus
98683c52fe Update Dolphin's About dialog
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: emmanuelpescosta099@gmail.com
2013-01-13 14:12:32 +01:00
Script Kiddy
4328fcd754 SVN_SILENT made messages (.desktop file) 2013-01-13 08:03:32 +01:00
Luca Beltrame
edcfb41ddd Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-12 10:19:44 +01:00
Emmanuel Pescosta
e27c4b3aa3 Show the file name as plain text in the file-metadata-tooltip
FIXED-IN: 4.10
BUG: 262464
REVIEW: 108336
2013-01-11 17:27:53 +01:00
Frank Reininghaus
11f6f45ae9 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-11 17:24:05 +01:00
Frank Reininghaus
6083215645 Slightly reduce the tinting for selected icons and previews
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-11 17:12:34 +01:00