Commit graph

4542 commits

Author SHA1 Message Date
Frank Reininghaus b47d582d35 Update Dolphin version to 2.1.98 for KDE 4.10 RC 3 2013-01-15 18:56:14 +01:00
Frank Reininghaus d9680ead80 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 87ac18f031 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 c652807a19 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 cad45e4150 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 7fe1278b1e 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 72de114a94 Merge branch 'KDE/4.10' 2013-01-15 11:11:11 -05:00
Simeon Bird e7fe50bd3d 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
Emmanuel Pescosta 256792355d 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 dde672ac94 Don't delay popup menus of "Create New" and "Recently Closed Tabs" toolbar buttons
REVIEW: 108397
2013-01-14 10:42:03 +01:00
Frank Reininghaus 4f0cd0b447 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
Luca Beltrame 74143ee656 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-12 10:19:44 +01:00
Emmanuel Pescosta e7c4b060ad 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 1e2481c974 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-11 17:24:05 +01:00
Frank Reininghaus d3b92d2d67 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
Frank Reininghaus 2a7e8b41d3 Only use parallel sorting when sorting by name
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
2013-01-11 16:57:43 +01:00
Kai Uwe Broulik d7373195f0 Fix information panel interpreting html tags
Only fixes the most obvious file name, the other entries in the table
probably have to be fixed in the FileMetaDataWidget.
REVIEW: 108307
BUG: 262464
(cherry picked from commit 3d7d900d28)
2013-01-09 22:15:56 +01:00
Kai Uwe Broulik 1877eb74e8 Fix information panel interpreting html tags
Only fixes the most obvious file name, the other entries in the table
probably have to be fixed in the FileMetaDataWidget.
REVIEW: 108307
BUG: 262464
2013-01-09 22:10:04 +01:00
Emmanuel Pescosta 4fd99ef4a3 Show the real audio file duration in additional informations
Big Thanks to Frank Reininghaus and Vishesh Handa!

BUG: 311794
REVIEW: 108281
FIXED-IN: 4.10
2013-01-09 16:24:15 +01:00
Emmanuel Pescosta f7216ca591 Show the file name as plain text in the rename dialog
BUG: 312812
BUG: 262464
FIXED-IN: 4.10
REVIEW: 108291
2013-01-09 16:17:55 +01:00
Emmanuel Pescosta 804d8119b3 Fix Bug 233335 - Wrong icons selected after pasting files and renaming them (because there exists items with it's names
Fixed the "same" buggy behavior when dropping files/folders

Select also putted files (PUT operation - SimpleJob) - e.g. Paste content from clipboard

BUG: 233335
REVIEW: 107351
2013-01-09 15:16:30 +01:00
Script Kiddy 17136c5da5 SVN_SILENT made messages (.desktop file) 2013-01-08 22:33:48 +01:00
Script Kiddy 9f9cd60d1c SVN_SILENT made messages (.desktop file) 2013-01-08 17:15:07 +01:00
Christophe Giboudeaux feae9f9dfc Merge branch 'KDE/4.10'
Conflicts:
	dolphin/src/CMakeLists.txt
2013-01-07 18:22:28 +01:00
Christophe Giboudeaux 6b351820a3 Fix build if one of the missing Nepomuk dependencies is missing 2013-01-07 18:11:07 +01:00
Vishesh Handa 24c9bc6ce7 Dolphin: Make Nepomuk Support Optional
Use the KFileMetadataWidget if Nepomuk is not present.

REVIEW: 108236
2013-01-07 19:59:23 +05:30
David Faure 2e88d73423 autoupdate is on by default, remove unnecessary calls 2013-01-04 22:11:31 +01:00
Script Kiddy 863a80dbd0 SVN_SILENT made messages (.desktop file) 2013-01-04 07:40:18 +01:00
Michael Jansen fe1e3f240a Fix crash when browsing bluetooth device.
When trying to browse a N900 it crashed here because pathA was empty. Which
lead to index = maxIndex beeing -1 and pathA.at(index) crashing.

Reorder the while condition to prevent that courtesy of tsdgeos.

(cherry picked from commit f0c90a47de)
2013-01-03 17:14:30 +01:00
Christophe Giboudeaux 56f1c0371c Merge branch 'KDE/4.10'
Conflicts:
	dolphin/src/CMakeLists.txt
2013-01-02 15:28:43 +01:00
Vishesh Handa bf202f3931 Dolphin Information Panel: Use Nepomuk2::FileMetadataWidget
Instead of the KFileMetadataWidget. The Nepomuk widget is just a copy of
the KFileMetadataWidget which utilizes Nepomuk2.
2013-01-02 16:35:37 +05:30
Michael Jansen ed4644bd87 Fix crash when browsing bluetooth device.
When trying to browse a N900 it crashed here because pathA was empty. Which
lead to index = maxIndex beeing -1 and pathA.at(index) crashing.

Reorder the while condition to prevent that courtesy of tsdgeos.
2012-12-30 20:57:48 +01:00
Christophe Giboudeaux c473003fca Port to feature_summary. 2012-12-30 11:59:35 +01:00
Weng Xuetian 2af331b42c Automatically set url location bar to non-editable when focus out
BUG: 157593
REVIEW: 107748
2012-12-29 12:49:51 -05:00
Frank Reininghaus 73af993dbf Merge remote-tracking branch 'origin/KDE/4.10' 2012-12-27 22:21:45 +01:00
Frank Reininghaus eae273ad6e Increase Dolphin version to 2.1.97 for the 2nd release candidate 2012-12-27 22:20:03 +01:00
Frank Reininghaus 36a816d7a6 Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10 2012-12-27 22:08:16 +01:00
Script Kiddy 33c5fb301b SVN_SILENT made messages (.desktop file) 2012-12-24 08:54:15 +01:00
Script Kiddy bf3d164d60 SVN_SILENT made messages (.desktop file) 2012-12-23 07:50:02 +01:00
Script Kiddy 6d74810799 SVN_SILENT made messages (.desktop file) 2012-12-22 12:09:08 +01:00
Script Kiddy 752d5f22ac SVN_SILENT made messages (.desktop file) 2012-12-22 08:05:56 +01:00
Dawit Alemayehu 6285f4b9df KIO::SlaveConfig::configData -> KProtocolManager::charsetFor for KF5. 2012-12-21 08:14:39 -05:00
Emmanuel Pescosta 13d5441c69 Fix Bug 311782 - Directory loading has been cancelled sometimes falsly triggered which was introduced by commit 9dbc24fd64
BUG: 311782
REVIEW: 107787
FIXED-IN: 4.10
2012-12-19 17:31:08 +01:00
Emmanuel Pescosta c5491a8d20 Fix Bug 311782 - Directory loading has been cancelled sometimes falsly triggered which was introduced by commit 9dbc24fd64
BUG: 311782
REVIEW: 107787
FIXED-IN: 4.10
2012-12-19 14:03:59 +01:00
Emmanuel Pescosta c304ca1bb0 Fix Bug 287829 - inline rename multiple files does not honour
sort order

BUG: 287829
FIXED-IN: 4.9.5
REVIEW: 107718
2012-12-17 14:02:22 +01:00
Emmanuel Pescosta 3535a20207 Fix Bug 304299 - Dolphin launches multiple instances of a program when multiple files are selected
BUG: 304299
REVIEW: 107305
2012-12-13 22:54:09 +01:00
Frank Reininghaus e348bc5826 Merge remote-tracking branch 'origin/KDE/4.9' 2012-12-13 22:34:38 +01:00
Frank Reininghaus bf39cc3808 Add i18 call to untranslated string
The string was added in ecb2715ead.
According to the soft message freeze policy on techbase, it's OK to fix
previously untranslated strings. Translators, please tell me if I'm
wrong, then I'll remove the string and the surrounding code and re-add
it to master later for KDE 4.11. Sorry for the trouble.

Thanks to David Faure for pointing out this mistake!

CCMAIL: kde-i18n-doc@kde.org
2012-12-13 22:30:07 +01:00
Emmanuel Pescosta fe5c03fb58 Fix Bug 240820 - [Usability Bug] Handling Bad Filenames, dolphin gives unclear error message
Fix Bug 308597 - Regression: Renaming a file/folder to something that contains a "/" will result in several message boxes

Uses the same solution as Dolphin-Rename-Dialog does. (KIO::encodeFileName)

BUG: 240820
BUG: 308597
REVIEW: 107681
FIXED-IN: 4.9.5
2012-12-12 22:57:20 +01:00
Script Kiddy c52d57d872 SVN_SILENT made messages (.desktop file) 2012-12-10 11:27:21 +01:00