Commit graph

4389 commits

Author SHA1 Message Date
Frank Reininghaus
9cf54dcc02 Do not rename files unexpectedly when changing the URL
This is the real fix now - note that the last commit
4de9a23364 was actually the fix for bug
320823. Somehow, I have messed up the local branches in my git
respository clone - sorry for the confusion!

BUG: 319912
FIXED-IN: 4.10.5
REVIEW: 110908
2013-06-10 21:32:31 +02:00
Frank Reininghaus
15b34a0d05 Do not rename files unexpectedly when changing the URL
If the role editor loses focus, it considers the current renaming
operation finished, and tells DolphinView to rename the file. This is a
problem when changing the directory, because the URL change happens
before DolphinView receives the signal, which results in a file in the
new directory being renamed unexpectedly.

The solution is to establish the connection to the
slotRoleEditingFinished signal only when the "rename inline" editor is
opened, and disconnect it when renaming is finished or canceled or the
URL changes.

BUG: 319912
FIXED-IN: 4.10.5
REVIEW: 110908
2013-06-10 21:19:56 +02:00
Emmanuel Pescosta
7c4d91c465 Fix Bug 319119 - Dolphin doesn't notice when renaming failed
Change the data in the model before the real renaming is done by KonqOperations::rename(),
but when the rename operation fails, revert the data changes in the model.

BUG: 319119
REVIEW: 110922
2013-06-10 11:16:21 +02:00
Frank Reininghaus
ca6e6a342e Do not delete files when Shift-clicking "Trash"
Thanks to Dawit Alemayehu for making this fix possible with commit
8e023ae9e5 !

BUG: 307254
FIXED-IN: 4.11.0
2013-06-09 11:53:59 +02:00
Frank Reininghaus
bd88f237b1 Remove unused argument
I saw a runtime warning from QMetaObject::invokeMethod() that KJob* is
not a registered type. Since we don't use that argument in
slotPreviewJobFinished(KJob*) anyway, it's best to remove it.
2013-06-07 09:24:24 +02:00
Frank Reininghaus
39c7c343cf Ignore a changed item if it cannot be found in the model
This prevents repeated attempts to reload the data for the non-existing
item. This was the root cause of bug 320791.

Thanks to Hrvoje Senjan and Jekyll Wu for testing the new code and
finding this bug!

BUG: 320791
2013-06-06 10:00:47 +02:00
Frank Reininghaus
f114564523 Make calls to resolveNextPendingRoles and resolveNextSortRole delayed
This prevents that functions that call these indirectly call themselves
recursively and cause trouble.

BUG: 320791
2013-06-06 08:49:12 +02:00
Frank Reininghaus
e7a9d5590b startPreviewJob: if items is empty, delay call to slotPreviewJobFinshed
This should prevent that other functions, which start preview jobs,
eventually call themselves and thus cause trouble.

CCBUG: 320791
2013-06-06 08:38:58 +02:00
Frank Reininghaus
2bdc5eff54 KFileItemModelRolesUpdater: waste less ressources and fix some bugs
The main change in this commit is that we do not determine expensive
roles (like previews, mime types, etc) for all items, but only for the
visible ones and those close to the visible area or on the first and
the last page of the view.

This prevents that the CPU and hard drive are kept busy for quite some
time after entering a folder while all items are handled asynchronously.

There is one known problem at the moment: when sorting by "Type" or
another role that can be resolved by KFileItemModelRolesUpdater, the
icons of the visible items are sometimes not loaded while the sorting is
still in progress. I will try to fix this issue during the next few
days.

REVIEW: 110839
2013-06-05 23:31:01 +02:00
Frank Reininghaus
c6494823c8 Reduce KFileItemModel memory usage by making use of implicit sharing
The idea is based on
http://milianw.de/blog/katekdevelop-sprint-vienna-2012-take-1

REVIEW: 110686
2013-06-05 23:18:26 +02:00
Weng Xuetian
9ec8c3b790 move focus to another view upon drop
When user drag and drop to another splitted view, the view will be activated,
thus if user close the split view, the view will be closed, while this is
usually the case when user copy file to remote/removable media.

REVIEW: 110167
CCBUG: 312834
2013-06-05 17:07:31 -04:00
Emmanuel Pescosta
616294bc80 Bug 196035 - middle clicking on archive files in dolphin does not open them in a new tab
When 'browse through archives' is enabled, open archive files
like folders on middle clicking, context menu -> new tab action
and context menu -> new window action.

BUG: 196035
REVIEW: 110487
2013-06-04 15:27:45 +02:00
Vishesh Handa
780327f7d3 Dolphin Search: Do not use Nepomuk for hidden folders
Nepomuk does not index hidden folders

BUG: 318442
REVIEW: 110697
FIXED-IN: 4.11.0
2013-05-29 20:13:10 +05:30
Frank Reininghaus
ae415dcebd Hide context menu plugins unless enabled by default or by the user
REVIEW: 110685
2013-05-29 07:48:11 +02:00
Vishesh Handa
844738fb91 PlacesModel: Only allow folders to be pinned
It makes no sense to pin files. Plus the old
PlacesModel from kdelibs had the same behaviour.

REVIEW: 110347
2013-05-28 21:52:01 +05:30
Vishesh Handa
c69ebd1e0c PlacesPanel: Do not allow drop events into timeline or search folder
They are read only. You cannot modify them, so it makes no point showing
the "Move/Copy Into" context menu.

REVIEW: 110348
2013-05-28 21:21:27 +05:30
Thomas Lübking
c756bc6c89 set KItemListView palette from scenes first view
REVIEW: 110505
2013-05-25 14:20:43 +02:00
Emmanuel Pescosta
45c659b440 Added the "Open in new Tabs" action to the Dolphin Context menu.
BUG: 312296
REVIEW: 110371
FIXED-IN: 4.11.0
2013-05-22 21:47:14 +02:00
Stuart Citrin
7c9808ef5d Filter bar: add a button that prevents clearing if the URL changes
FEATURE: 256651
FIXED-IN: 4.11.0
REVIEW: 107392
2013-05-22 18:48:00 +02:00
Frank Reininghaus
04e825d022 Merge remote-tracking branch 'origin/KDE/4.10' 2013-05-22 18:34:25 +02:00
Frank Reininghaus
bf85483c99 KFileItemModel::insertItems(): guarantee O(N) run time complexity
This commit prevents repeated insertions of single items into the list
m_itemData, which shift all following items by one position and result
in O(N^2) worst case complexity for the entire function.

Moreover, the hash m_items is updated only for the items starting from
the first inserted/removed item to save some superfluous calculations
of hash values.

REVIEW: 110355
2013-05-22 18:27:44 +02:00
Frank Reininghaus
2f51debbea Do not reset the 'isExpanded' state when an expanded folder is refreshed
If an item is moved out of an expanded folder, the model receives the
dir lister's refreshItems signal for the folder. The method
retrieveData() then updates the folder's properties. This commit makes
sure that the 'isExpanded' state is not touched by retrieveData(). A
side-effect is that the 'isExpanded' role is not initialized to 'false',
but this does not matter because trying to read a non-existing role from
the QHash<QByteArray, QVariant> yields a default-constructed QVariant,
which evaluates to 'false'.

BUG: 299675
FIXED-IN: 4.10.4
REVIEW: 110401
2013-05-22 18:14:38 +02:00
Frank Reininghaus
e66c3221ce KFileItemModelRolesUpdater: only update the size for changed folders
When using inotify, we also receive signals for modified files, even if
we only ask KDirWatch to watch the directory containing them. In that
case, we must not set the size to -1 (which means "unknown number of
items" for folders) temporarily, or we end up with an apparent file size
of 2^64 - 1 bytes.

BUG: 309740
FIXED-IN: 4.10.4
REVIEW: 110428
2013-05-22 18:09:42 +02:00
Dawit Alemayehu
01761798a9 - Factored out the Delete/Move To Trash action into own class.
- Updated both the Dolphin KPart and context menu to use the new
  DolphinRemoveAction class to manage "Delete/Move to Trash" actions.

See also https://git.reviewboard.kde.org/r/107509/.

REVIEW: 108802
2013-05-14 08:37:21 -04:00
Dawit Alemayehu
799641859e Merge remote-tracking branch 'origin/KDE/4.10' 2013-05-14 08:36:11 -04:00
Vishesh Handa
fffbb5b583 DolphinSearchBox setReadOnly: Update if either of the parameters change
This way when another read only query is added, the internal state is
changed and the search label gets updated.

REVIEW: 110324
BUG: 315796
FIXED-IN: 4.10.4
2013-05-13 14:40:39 +05:30
Vishesh Handa
cc4947d1ac Dolphin Places: Make it easier to drag and drop items
When doing a drop, a check is performed to see if it is within x pixels
from the top or x pixel from the bottom of the rect. If it is, then the
drop is considered a drop between items.

This x was fixed to qMax( 4, myStyleOption.padding ) which would
generally be 4. This is fine for some cases, but when the rectangle size
increases then this 4 pixels is not enough. Hence this 'x' is now being
set to 30% of the rectangle height.

By default the rectangle height is 20 pixels, so x is now 6 instead of 4
in the default case, which does make it slightly easier.

Also, this in-between-items check is only performed when moving from one
item to another. This is not good since if you enter the item and the
bottom, the indicator is shown, and then as to start moving it up it
stops showing, and then it should start showing again as you approach
the top edge.

Modified the code to run the check on every mouse drag event even if the
hovered item has not changed.

Both these changes combined make it much easier to drag and drop items.

REVIEW: 110342
2013-05-13 14:39:23 +05:30
Frank Reininghaus
10857727ec Make error message translatable 2013-05-12 10:38:22 +02:00
Frank Reininghaus
600166152d Merge remote-tracking branch 'origin/KDE/4.10' 2013-05-12 10:04:01 +02:00
Frank Reininghaus
63e2513abe Hide the message widget when the URL changes
Most error messages are only relevant when trying to open a URL, e.g.,
they inform the user that opening the URL failed. After the next
successful URL change, these errors are not relevant any more.
Therefore, it makes sense to hide the message widget automatically to
prevent that the user is forced to close it manually.

BUG: 312872
FIXED-IN: 4.11.0
REVIEW: 110369
2013-05-12 10:01:01 +02:00
Frank Reininghaus
3924b10b62 Fix unit test failure
The recent commit 022b564831, which added
a few source files to kitemlistcontrollertest, caused a crash in that
test - an assert was hit because now a different virtual method was
called in one place (KStandardItemListView::initializeItemListWidget()),
and qobject_cast could not cast the 'item', which is of type
KFileItemListWidget, to its base class KStandardItemListWidget. Adding
the source file kfileitemlistwidget.cpp fixes this.

CCMAIL: ps_ml@gmx.de
2013-05-12 09:34:05 +02:00
Frank Reininghaus
cad78cdfcf Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	CMakeLists.txt
2013-05-11 18:47:58 +02:00
Frank Reininghaus
f9990aff6a Update copyright year 2013-05-11 18:44:21 +02:00
Patrick Spendrin
f6fcf4be85 fix building tests under windows 2013-05-10 23:03:23 +02:00
Daniel Faust
3f108bd7fa Don't try to change the icon of the "sort" action menu if it doesn't exist
BUG: 255819
FIXED-IN: 4.10.4
REVIEW: 109966
2013-05-10 22:27:22 +02:00
Vishesh Handa
38bb5f1547 Dolphin Places: React to Nepomuk system changes
Reload the places panel when Nepomuk starts up and shutsdown. This way
the user does not need to restart Dolphin to see the custom searches and
places after Nepomuk switches on.

BUG: 304918
REVIEW: 110323
2013-05-07 01:36:37 +05:30
David Faure
57e65aab7f Reimplement handling of Shift while showing menu without KModifierKeyInfo
Finding out whether shift is pressed initially can be done
with qApp->keyboardModifiers(), and finding out that the user is pressing
or release shift can be done with keyPressEvent/keyReleaseEvent.

This required to inherit from KMenu rather than having the KMenu
as a member.

KModifierKeyInfo is only implemented on X11, so this makes the code
more portable. If similar solutions can be found for other users of
KModifierKeyInfo, it will be deprecated in KF5.

REVIEW: 110303
2013-05-05 22:42:49 +02:00
David Faure
926ed302d6 Remove erroneous double-quotes around %c in Exec line 2013-05-03 13:22:33 +02:00
Frank Reininghaus
692e7d4d32 Merge remote-tracking branch 'origin/KDE/4.10' 2013-05-02 19:45:08 +02:00
Frank Reininghaus
ff3b009e68 Do not change the view URL if it is a symlink to the current directory
BUG: 302037
FIXED-IN: 4.10.3
REVIEW: 110233
2013-05-02 19:40:01 +02:00
Frank Reininghaus
9480a1ee44 Use the same text color for selected hidden and non-hidden items
This fixes the problem that the names of selected hidden items are
unreadable with some color schemes.

BUG: 305734
FIXED-IN: 4.10.3
REVIEW: 110164
2013-05-02 19:28:10 +02:00
Frank Reininghaus
a70fd06124 Rename multiple files: Determine correctly if the name pattern is valid
The "Rename" button in the dialog should be enabled if and only if the
"new name" pattern is valid. This is the case if the pattern contains
exactly one sequence of '#', which will be replaced by digits.

This patch fixes the problem that
(a) A pattern that contains a single '#' is not considered valid, and
(b) A pattern without any '#' at all is not recognized as invalid.

BUG: 318942
FIXED-IN: 4.10.3
REVIEW: 110223
2013-05-02 19:23:38 +02:00
Frank Reininghaus
dbc00fa190 Replace the button label "Less Options" by "Fewer Options"
BUG: 318937

FIXED-IN: 4.11.0
2013-04-27 19:09:42 +02:00
Emmanuel Pescosta
d167699932 Scroll to newly pasted files.
If multiple files are pasted, scroll to the first pasted file.

BUG: 315722
REVIEW: 109950
FIXED-IN: 4.11.0
2013-04-23 22:50:01 +02:00
Frank Reininghaus
7f381a34cb Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	plasma/applets/folderview/folderview.cpp

CCMAIL: ignat.semenov@blue-systems.com

@Ignat: We've been following a merge-based approach in kde-baseapps
for quite some time now, see

http://lists.kde.org/?t=134744909400005&r=1&w=1

It would be nice if you could merge KDE/4.10 into master after any
non-trivial changes in folderview to prevent that others have to
figure out how to resolve the merge conflicts. Thanks!
2013-04-23 19:40:42 +02:00
Frank Reininghaus
8f4d13dab8 Disable Find/Replace in the "rename inline" line edit
These actions do not work correctly because renaming is considered
finished as soon as the line edit loses focus, which happens when the
"Replace" dialog pops up.

BUG: 317772
FIXED-IN: 4.10.3
2013-04-23 19:31:08 +02:00
Frank Reininghaus
8a40b0ee4a Do not dereference null pointer in KItemListViewAccessible
BUG: 316285
FIXED-IN: 4.10.3
2013-04-23 19:25:52 +02:00
Frank Reininghaus
37e796522b Comment out assertion to fix a crash when filtering in Icons/Compat View
I'm not sure yet if there is a problem somewhere else in the code. For
the time being, I think it's better to replace the assert by a TODO
comment to prevent that users find out the hard way that there is
something that we're not quite sure about.

BUG: 317827
FIXED-IN: 4.10.3
2013-04-22 21:36:57 +02:00
Frank Reininghaus
151c8d8c42 Always determine icons for the visible items first
When entering a folder, KFileItemModelRolesUpdater has not yet been
informed about the visible index range by the view when it tries to
determine icons synchronously. This resulted in the problem that it
tried to determine icons for all items in random order, and some visible
icons were somtimes still unknown after the "synchronous icon loading"
timeout of 200 ms.

This commit tries to improve the situation by loading icons starting
with the first item in increasing order. This should make it less likely
that some visible items still have unknown icons after 200 ms.

BUG: 316129
FIXED-IN: 4.10.3
REVIEW: 109843
2013-04-22 21:21:31 +02:00
Script Kiddy
9b30145ac3 SVN_SILENT made messages (.desktop file) 2013-04-20 09:44:11 +02:00
Script Kiddy
ee2d453f1f SVN_SILENT made messages (.desktop file) 2013-04-19 13:27:40 +02:00
Aurélien Gâteau
1cd7bfb991 Merge remote-tracking branch 'origin/KDE/4.10' 2013-04-12 16:31:03 +02:00
Aurélien Gâteau
bf1b4b4881 Fix moving image while transitioning to hover pixmap
See: http://youtu.be/OMYO0U0kSL0

REVIEW: 109960
FIXED-IN: 4.10.3
2013-04-12 16:28:52 +02:00
Kai Uwe Broulik
d8fede7cc6 Move Bluetooth places items to Device section of places list
REVIEW: 109622
BUG: 301276
2013-04-02 16:07:29 +02:00
Luca Beltrame
8cc479518b Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	plasma/applets/folderview/folderview.cpp
2013-03-27 16:50:22 +01:00
David Faure
df8d439c55 Update icon if it couldn't be determined upfront (.desktop file on slow mount)
This requires an up-to-date kdelibs >= 4.10.

CCBUG: 290666
2013-03-27 15:19:09 +01:00
Frank Reininghaus
f28ab78825 Improve grouping by name for non-ASCII file names
This commit prevents that all non-ASCII letters which are not umlauts
are grouped in a single group "Others", and that the joint group of
an ASCII letter and the associated umlaut in some locales is called
"Others" if there is only the umlaut in the group.

BUG: 315569
REVIEW: 109457
FIXED-IN: 4.10.2
2013-03-26 01:21:34 +01:00
Aurélien Gâteau
6dfcd7afd9 Merge remote-tracking branch 'origin/KDE/4.10'
@emmanuel: this merge includes your fix from
https://git.reviewboard.kde.org/r/109488/ . I assume this is not a
problem.

CCMAIL: emmanuelpescosta099@gmail.com
2013-03-21 14:14:55 +01:00
Aurélien Gâteau
e2a89fc2e0 Fix transition between m_pixmap and m_hoverPixmap
The default SourceOver composition mode of QPainter cannot be used
to interpolate between two images, we must use intermediate buffers
to perform the interpolation and blend the result on the widget.

More details are available in the review request.

REVIEW: 109614
FIXED-IN: 4.10.2
2013-03-21 14:06:07 +01:00
Emmanuel Pescosta
7198437118 Refresh all expanded directories too, when reloading a directory.
BUG: 295300
FIXED-IN: 4.10.2
REVIEW: 109488
2013-03-17 20:13:55 +01:00
Weng Xuetian
5d75c7afc5 Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-16 00:47:11 -04:00
Weng Xuetian
61ea42b353 use plain text for information panel
REVIEW: 109129
BUG: 315693
CCBUG: 262464
2013-03-16 00:43:22 -04:00
Script Kiddy
34f1ffd668 SVN_SILENT made messages (.desktop file) 2013-03-15 14:57:44 +01:00
Script Kiddy
382834e0fb SVN_SILENT made messages (.desktop file) 2013-03-15 10:09:23 +01:00
Frank Reininghaus
31b0b565fe Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-15 00:28:40 +01:00
Frank Reininghaus
90dd897752 Improve handling of filtered items when folders are deleted/collapsed
If an expanded folder with filtered children is collapsed or removed,
and the parent-child relationship cannot be determined by parsing the
URLs, this patch makes sure that the filtered children do not reappear
when the filter bar is cleared.

REVIEW: 109455
2013-03-15 00:23:57 +01:00
Frank Reininghaus
4bcda6c7e7 Prevent accidental deletion of home directory in Terminal Panel
The protection against unwanted execution of "rm -rf" when changing the
directory while entering the command did not work if there was never any
automatic "cd" command sent to the terminal before.

This patch ensures that Terminal Panel's member m_clearTerminal is
false after the initialization of the panel, such that the protection is
effective after that.

BUG: 316300
FIXED-IN: 4.10.2
REVIEW: 109431
2013-03-15 00:12:49 +01:00
Script Kiddy
11e2974a9f SVN_SILENT made messages (.desktop file) 2013-03-14 17:08:18 +01:00
Script Kiddy
2fc248faed SVN_SILENT made messages (.desktop file) 2013-03-14 09:38:14 +01:00
Frank Reininghaus
a97fe0c7ff Fix recent regressions when "Sort by Type" is used
This commit ensures that the mime types and icons are determined
synchronously for 200 ms when "Sort by Type" is enabled.

REVIEW: 109344
2013-03-12 19:26:36 +01:00
Frank Reininghaus
9ea5eb2164 Do not skip rows in when clicking the empty area of the scroll bar
The height of the header widget must be subtracted from the view's
height in Details View to determine the "pageStep" for the scroll bar.

BUG: 315619
FIXED-IN: 4.10.2
REVIEW: 109210
2013-03-11 18:18:44 +01:00
Frank Reininghaus
f71e0881d2 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/kitemviews/kfileitemmodel.cpp
2013-03-10 18:31:23 +01:00
Frank Reininghaus
9dd728cb98 Remove filtered children if the parent folder is collapsed
This is analogous to commit e053ecdcd5,
which fixes the same problem for the case that the parent folder is
deleted.

BUG: 316335
FIXED-IN: 4.10.2
REVIEW: 109343
2013-03-10 18:26:37 +01:00
Frank Reininghaus
a3b5656a16 Remove duplicated slot
The slot DolphinViewContainer::focusView(), introduced in commit
2f0114730d, is actually unnecessary
because DolphinViewContainer::requestFocus() provides the same
functionality already.
2013-03-07 22:58:48 +01:00
Daniel Kreuter
0ae259e098 Use a consistent way to group files by "Date"
Before this change, files were grouped by calendar weeks if they were
modified in the current month and ignoring the "first week day setting",
but by the actual distance measured in multiples of seven days if the
were modified last month.

This not only fixes the "ignores first week day" bug, but also the
problem that the inconsistencies in the algorithm could lead to a broken
grouping in the first days of a month (see screenshot in the review
request).

BUG: 181337
FIXED-IN: 4.11
REVIEW: 108667
2013-03-03 18:27:00 +01:00
Emmanuel Pescosta
4e4078c66a Removed everything related to m_expandedParentsCountRoot ->
This concept is not needed anymore because of the new "determine parents and
expansion levels" approach

Side effect:
Enables treeview for trash, ...

REVIEW: 109191
2013-02-27 19:56:55 +01:00
Emmanuel Pescosta
f2d70693db Big Thanks to Frank Reininghaus, who helped me a lot with these
changes! :)

* Fixed the "Network browser" and "timeline" issues, by using the
KDirLister's itemsAdded(KUrl,KFileItemList) signal -> Use the
given Url to define the parent-child relationship.

* Changed the name of the slot "slotNewItems" to "slotItemsAdded"
for consistency with the signal.

* Use a QHash<KFileItem, ItemData*> instead of a QSet<KFileItem> to
store the filtered data (needed to keep the O(1) lookup for filtered
KFileItems in slotItemsDeleted + needed to fix bug 311912 "After
erasing a filter, some thumbnails randomly disappear")

* Made the determination of the "expandedParentsCount" slightly
simpler - just adding 1 to the parent's level (Also needed to fix the
"Network browser" and "timeline" issues)

FIXED-IN: 4.11.0
REVIEW: 109180
BUG: 304565
BUG: 311912
BUG: 312890
BUG: 315593
2013-02-27 13:35:20 +01:00
Script Kiddy
6b91e4e6b8 SVN_SILENT made messages (.desktop file) 2013-02-22 17:54:48 +01:00
Script Kiddy
36510e16f7 SVN_SILENT made messages (.desktop file) 2013-02-22 06:41:23 +01:00
Jens Rutschmann
0fee7ff266 Return the focus from the filter bar to the view if Enter is pressed
BUG: 297140
FIXED-IN: 4.11.0
REVIEW: 109020
2013-02-19 22:43:55 +01:00
Frank Reininghaus
cc1455c0e6 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
	lib/konq/konq_operations.cpp
2013-02-19 15:45:44 +01:00
Frank Reininghaus
518b53feb4 Fix crash when clicking an action in context menu for a removed device
Devices can be added and removed while the context menu is open.
Sfter an action has clicked that needs to access a device, we therefore
have to check if its position in the model has changed, and more
importantly, if it is still there at all in order to prevent a crash.

BUG: 315298
FIXED-IN: 4.10.1
REVIEW: 108989
2013-02-18 23:58:31 +01:00
Frank Reininghaus
6938241ebc Remove items from m_filteredItems if their parent is deleted
Fixes the problem that filtered children of expanded deleted folders
reappear if the filter is cleared.

BUG: 315210
FIXED-IN: 4.10.1
REVIEW: 108976
2013-02-18 23:50:38 +01:00
Frank Reininghaus
e6ef1eec3a Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-17 12:17:01 +01:00
Frank Reininghaus
ba31457911 Another fix for KItemListControllerTest::testMouseClickActivation()
One one machine, I see that changing the global "single click" setting
fails. I don't know why that is the case, but I think we should better
just skip the test in that case and not hang forever.
2013-02-17 12:12:52 +01:00
Frank Reininghaus
eb88968baf Update Dolphin version to 2.2.60 2013-02-17 11:36:03 +01:00
Frank Reininghaus
fc0c3f9d4e Prevent repeated re-layouting of all items while previews are generated
There was some code in KStandardItemListView::itemSizeHintUpdateRequired
already that was supposed to prevent an expensive re-layouting of all
items when a preview is received. However, it didn't quite work as
intended because also the "iconOverlays" role changed.

The new approach is to only re-layout if text of a visible role changes,
because this is the only way how the space needed by an item might
change (see KStandardItemListWidgetInformant::itemSizeHint()).

BUG: 315315
FIXED-IN: 4.10.1
REVIEW: 108984
2013-02-17 11:30:38 +01:00
Frank Reininghaus
d82d92d7dd Improve the recently added test testMouseClickActivation
The method to make sure that the first item is visible turned out to be
less reliable than I thought. This could make the test hang forever.
Moreover, this commit removes some trailing whitespace that had been
added accidentally.
2013-02-13 17:56:03 +01:00
Aurélien Gâteau
a7705b04dd Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-11 10:53:52 +01:00
Aurélien Gâteau
66af7c390c Fix blinking when moving the mouse over an hidden item
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-11 10:38:28 +01:00
Frank Reininghaus
ced9de5b82 Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-10 19:27:21 +01:00
Frank Reininghaus
dc6322dc09 Re-organize the code that compares expanded items
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-10 18:09:07 +01:00
Frank Reininghaus
45450959ea Add benchmark for adding many child items in a tree structure 2013-02-10 18:07:55 +01:00
Frank Reininghaus
4f5a2eb943 Include parent-child relationships in KFileItemModel's consistency check 2013-02-10 18:06:07 +01:00
Frank Reininghaus
ac6d3d8250 KFileItemModel::insertItems(): reserve sufficient space for m_items
This prevents expensive and unnecessary repeated rehashing when many
items are inserted into the model.
2013-02-06 18:58:54 +01:00
Frank Reininghaus
ec628cfa09 Add unit test for bug 313342 2013-02-05 20:07:05 +01:00
Aniket Anvit
85ed71eb30 Apply changes of the KGlobalSettings::singleClick() setting immediately
Fixes a regression introduced by commit
7a364cbf48.

Patch reviewed and pushed by Frank Reininghaus.

BUG: 313342
FIXED-IN: 4.10.1
2013-02-05 19:58:06 +01:00
Frank Reininghaus
687d5145a2 Two small optimizations in KFileItemModel::removeItems()
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-03 23:28:57 +01:00
Frank Reininghaus
01dc86f0df const QList<int> -> const QList<int>& 2013-02-03 23:19:58 +01:00
Frank Reininghaus
5f6f77d481 Remove unneeded #include 2013-02-03 23:12:55 +01:00
Frank Reininghaus
5d4d73ff08 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-30 21:06:34 +01:00
Frank Reininghaus
89134d62c7 Add unit test for bug 314046
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-30 21:02:43 +01:00
Frank Reininghaus
4396233d21 Update Dolphin version to 2.2 for KDE 4.10.0 2013-01-29 19:13:49 +01:00
Frank Reininghaus
8371fb6d75 Fix crashes in KFileItemModel::removeItems()
These crashes were caused by the recent commit
ff3267c6dc. 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-29 19:08:28 +01:00
Weng Xuetian
ef248162d0 Merge branch 'KDE/4.10' 2013-01-27 14:13:04 -05:00
Weng Xuetian
2045a64ec6 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
1bd91417db Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
2013-01-27 15:25:47 +01:00
Frank Reininghaus
f76f3a1654 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
891ee0c41a 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
d1b75d1d64 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
Frank Reininghaus
71be8f2bee 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
dfa170cb49 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-24 23:49:59 +01:00
Vishesh Handa
d27c16d751 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
6501092421 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-24 09:39:33 +01:00
Frank Reininghaus
20c3b45449 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
17cb90c470 SVN_SILENT made messages (.desktop file) 2013-01-18 08:05:47 +01:00
Script Kiddy
c652cdc531 SVN_SILENT made messages (.desktop file) 2013-01-17 12:48:56 +01:00
Luca Beltrame
ee2742f889 Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-16 23:42:25 +01:00
Andrea Scarpino
ce4498ea06 Allow Timeline-URLs as homepage
FEATURE: 313151
REVIEW: 108428
2013-01-16 23:16:10 +00:59
Andrea Scarpino
550da74b54 Allow Timeline-URLs as homepage
FEATURE: 313151
REVIEW: 108428
2013-01-16 23:04:47 +00:59
Kai Uwe Broulik
7c43fce8bf Use proper IconSize for PlacesItemEditDialog's KIconButton
REVIEW: 108443
2013-01-16 22:54:32 +01:00
Script Kiddy
b8584c8c8b SVN_SILENT made messages (.desktop file) 2013-01-16 12:34:10 +01:00
Frank Reininghaus
48231488bd 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
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
Script Kiddy
b5000b871d SVN_SILENT made messages (.desktop file) 2012-12-10 07:32:47 +01:00
Frank Reininghaus
99f2840038 Correct value for autostart setting of Service-nepomukfileindexer, part2
After 530c743a89, this fixes the other
places where the incorrect default value 'false' was used.

Thanks to Luc Menut for noticing this problem!

CCBUG: lmenut@free.fr
2012-12-07 22:38:57 +01:00
Frank Reininghaus
b2a580c2b9 Merge remote-tracking branch 'origin/KDE/4.9' 2012-12-07 22:31:24 +01:00
Frank Reininghaus
46f2c2ef3c Update Dolphin version to 2.1.95 for KDE 4.10 RC 1 2012-12-07 22:30:22 +01:00
Frank Reininghaus
e97c050157 Fix keyboard focus handling after renaming items inline
This reverts 951cb9c35d and
3143acc084, and fixes the crash caused by
nested event loops by delaying the deletion of the KItemListRoleEditor
until the next item is renamed inline.

BUG: 311206
FIXED-IN: 4.9.5
REVIEW: 107606
2012-12-07 22:15:32 +01:00
Frank Reininghaus
a1353a9d48 Fix incorrect usage of list iterators
The problem was that we erased an iterator from the list and then
incremented it. This can lead to problems (namely, random crashes) if
the iterator pointed to the last list element.

Thanks to Sandro Mani for testing the patch!

BUG: 311246
FIXED-IN: 4.9.5
2012-12-06 19:48:59 +01:00
Hugo Pereira Da Costa
f19811517a Added curly brackets around DolphinApplication creation and execution, to make sure it is deleted before "return 0;" is
called. This might prevent random crashes due to the de-allocation chain in Qt at exit.
CCBUG: 311092
2012-12-05 21:44:06 +01:00
David Faure
6a3f8086a3 Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-28 16:40:07 +01:00
Luc Menut
a39ba0acd8 Use correct value for autostart setting of Service-nepomukfileindexer
Fixes the problem that the "Recently accessed" entries in the Places
Panel might not be shown when using the default setup.

BUG: 310770
FIXED-IN: 4.10 Beta 2
REVIEW: 107464
2012-11-27 17:32:00 +01:00
Emmanuel Pescosta
b2719884b9 Fix Bug 310465 - Can't switch view mode for non-writable paths
BUG: 310465
FIXED-IN: 4.9.4
REVIEW: 107458
2012-11-25 21:44:01 +01:00
Frank Reininghaus
ffe179ad51 Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-25 12:05:53 +01:00
Frank Reininghaus
c570c62036 Fix regression caused by 4120805872
Copied items should not be shown in gray. Thanks to Christoph Feck for
testing and reporting this regression!

CCBUG: 304615
CCMAIL: christoph@maxiom.de
2012-11-25 11:45:06 +01:00
Frank Reininghaus
06e5202c47 Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-24 17:28:43 +01:00
Frank Reininghaus
03d0ebe469 Update Dolphin version to 2.1.85 for KDE 4.10 Beta 2 2012-11-24 17:27:48 +01:00
Frank Reininghaus
ba3e70ffe0 Clear the previous selection when selecting pasted or dropped items
This fixes a recent regression in the 4.9 branch caused by
b25059e803.

BUG: 310365
FIXED-IN: 4.9.4
REVIEW: 107389
2012-11-24 16:04:43 +01:00
Frank Reininghaus
2099f4a0c5 Update the 'isCut' state of items when cutting non-files, e.g., text
BUG: 304615
FIXED-IN: 4.9.4
REVIEW: 107390
2012-11-24 16:00:42 +01:00
Frank Reininghaus
4220612684 Delete FileMetaDataToolTip using deleteLater() to prevent crashes
The problem was that Qt tried to deliver an 'Enter' event to the
dangling pointer that once pointed to the tool tip.

Many thanks to G. Christ for finding a way to reproduce this crash!

BUG: 282257
BUG: 310579
FIXED-IN: 4.9.4
2012-11-24 05:10:56 +01:00
Luca Beltrame
59e8f22cd5 Merge branch 'KDE/4.9'
Conflicts:
	konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
	konqueror/settings/kio/kcookiespolicies.h [ditto]
2012-11-20 07:44:59 +01:00
Frank Reininghaus
96672c166f Only select a created item and make it 'current' in the active view
The 'make the new item the current one in all views' issue has been
around for quite some time, the unexpected selection was a recent
regression caused by commit b25059e803.

Thanks to Jaime Torres for finding the regression early and for testing
this patch!

BUG: 310219
FIXED-IN: 4.9.4
2012-11-18 16:22:52 +01:00
Frank Reininghaus
c73bf691c6 Update Dolphin version to 2.1.80 2012-11-12 21:32:04 +01:00
Dawit Alemayehu
b85d46b838 Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-10 16:28:36 -05:00
Emmanuel Pescosta
ce1bdf40cf Fix Bug 217575 - Auto select pasted files doesn't select all files if some have been skipped
BUG: 217575
REVIEW: 107237
FIXED-IN: 4.9.4
2012-11-09 14:52:32 +01:00
Emmanuel Pescosta
9aacd610a3 Fix Bug 309760 - Crash while inline-renaming a file and apply change with return-key
BUG: 309760
FIXED-IN: 4.9.4
2012-11-09 12:10:36 +01:00
Frank Reininghaus
15faff457d Merge remote-tracking branch 'origin/KDE/4.9' 2012-11-05 22:12:45 +01:00
Frank Reininghaus
c0559a2a1d Prevent crashes caused by nested event loops run when renaming inline
When renaming inline and starting a drag or invoking the context menu,
a nested event loop will be run. If the role editor loses focus and
emits roleEditingFinished(), we must prevent that deleteLater() is
called because this would delete the role editor inside a nested event
loop which is run from one of its own functions. We would get a crash
when returning from that event loop otherwise.

BUG: 308018
BUG: 309421
FIXED-IN: 4.9.4
2012-11-05 22:03:52 +01:00
Frank Reininghaus
07721cf764 Do not use a hardcoded size for the buttons in the Information panel
Thanks to Kai Uwe Broulok and Jekyll Wu for the investigation!

BUG: 309498
FIXED-IN: 4.9.4
2012-11-04 14:39:49 +01:00
Frank Reininghaus
c6eb4866d8 Use the standard sizes from KIconLoader, rather than hardcoded sizes. 2012-11-04 10:33:49 +01:00
Frank Reininghaus
6f8060fc6d Add an "Icon Size" submenu to the context menu of the Places Panel
FEATURE: 307475
FIXED-IN: 4.10.0
CCBUG: 301959
2012-11-01 00:58:32 +01:00
Alex Fiestas
951dbd6d67 Removed customm setText for mtp devices and check for kio_mtp
We are already checking if kio_mtp is installed when we build the
predicate so we don't need to check if it is installed again.

Also, the fix for "Showing the product as a name for some kind of
massive storage" will have to be delayed to 4.9.4, so removing this.
2012-11-01 00:28:18 +01:00
Frank Reininghaus
9d6feb556d Do not show an incorrect file name after a failed rename operation
BUG: 303742
FIXED-IN: 4.9.3
2012-10-31 23:06:39 +01:00
Frank Reininghaus
bc72aeeb8f Only store the HomeUrl in dolphinrc if it is not the user's home folder
This fixes the problem that copying the dolphinrc from another user
results in Dolphin starting up in a folder that might wither not be
accessible or not exist at all.

BUG: 308569
FIXED-IN: 4.9.3
2012-10-31 22:48:59 +01:00
Emmanuel Pescosta
32569ebedf Fix Bug 309338 - flood of error boxes while renaming a folder in the folder panel
BUG: 309338
FIXED-IN: 4.9.3
REVIEW: 107070
2012-10-31 22:43:21 +01:00
Emmanuel Pescosta
b4998a7cd4 Fix Bug 279333 - Panels can be moved even if locked
BUG: 279333
FIXED-IN: 4.9.3
REVIEW: 107135
2012-10-30 23:10:43 +01:00
Frank Reininghaus
1353c92cce Fix some indentation issues 2012-10-30 08:25:21 +01:00
Frank Reininghaus
70aac0f1e6 Remove workaround for bug 304986 which is not needed in master
Commit ea6a7c09a0 added a workaround for
bug 304986 (high CPU usage because KFileItemModelRolesUpdater requests
previews for the same files over and over again after, e.g., a rename
operation). The KDE/4.10 branch of kdelibs contains the real fix for
this issue (b8f64ca3f4b6311519c21046031d66d9d0a570c6), so the workaround
can be removed.
2012-10-30 07:29:44 +01:00
Frank Reininghaus
1d9d83b434 Merge remote-tracking branch 'origin/KDE/4.9' 2012-10-30 07:26:30 +01:00
Emmanuel Pescosta
c503452d56 Fix Bug 153984 - Clicking cancel on the authentication dialog for fish/sftp/ftp kioslave gets dolphin stuck on "Loading folder"
BUG: 153984
REVIEW: 107116
2012-10-29 20:54:53 +01:00
Emmanuel Pescosta
726cd768c9 Fix wrong function call in KFileItemModelSortAlgorithm::sequentialSort (Bug introduced in commit 429218eaf2) 2012-10-28 20:59:55 +01:00
Emmanuel Pescosta
ecdb0c3f58 Extended/Completed Frank's commit 7ca682fe90.
* Implemented Rename-Inline-Option in Settings Dialog
* Re-enable renaming items with the rename dialog in Folderview-Panel

BUG: 306705
REVIEW: 107072
2012-10-28 20:12:04 +01:00
Emmanuel Pescosta
b4800d794c Implemented multithreading in KFileItemModelSortAlgorithm. Use as many threads as possible.
Thanks to Frank Reininghaus for all his suggestions.

REVIEW: 107025
2012-10-28 17:58:06 +01:00
Frank Reininghaus
37a54c053e Workaround for failed comparison of items in KFileItemModelRolesUpdater
The real fix is in the KDE/4.10 branch of kdelibs
(commit b8f64ca3f4b6311519c21046031d66d9d0a570c6). We work around the
problem that the KFileItem that a preview has been requested for is
different from the KFileItems in the sets m_pendingVisibleItems and
m_pendingInvisibleItems by refreshing those sets when we detect that
the bug has been triggered.

BUG: 304986
FIXED-IN: 4.9.3
2012-10-27 09:48:51 +02:00
Christoph Feck
c1bc83dfdb Merge remote-tracking branch 'origin/KDE/4.9' 2012-10-26 01:58:50 +02:00
Christoph Feck
282f5cb869 Fix color role of tree view arrows
BUG: 307734
FIXED-IN: 4.9.3
REVIEW: 107031
2012-10-26 01:52:20 +02:00
Emmanuel Pescosta
b6396ca721 Use QPixmapCache for KStandardItemListWidget::pixmapForIcon(const QString& name, int size) -> Avoid KIcon loading and rescaleing
REVIEW: 107039
2012-10-25 19:53:53 +02:00
Alex Fiestas
996fe25208 Show MTP devices in case support for it is installed
Basically adds a conditional that in case that mtp kioslave is installed
devices with MTP are added to the predicated.
REVIEW: 106651
(cherry picked from commit a09a237950)
2012-10-24 01:22:31 +02:00
Alex Fiestas
434a6cf0a7 Show MTP devices in case support for it is installed
Basically adds a conditional that in case that mtp kioslave is installed
devices with MTP are added to the predicated.
REVIEW: 106651
2012-10-24 01:21:02 +02:00
Simeon Bird
04dabe84b2 Fix race condition and deadlock in the version plugin
when listing directories is slow.

BUG: 302264
FIXED-IN: 4.9.3
2012-10-19 21:06:49 -04:00
Simeon Bird
4f6a2780ee Fix race condition and deadlock in the version plugin
when listing directories is slow.

BUG: 302264
FIXED-IN: 4.9.3
2012-10-19 21:05:54 -04:00
Weng Xuetian
1c6d0c316a use better icon for timeline:/ in places
REVIEW: 106874
2012-10-16 07:55:00 -04:00
Pino Toscano
e428f431bb look also for soprano 2012-10-16 10:14:56 +02:00
Emmanuel Pescosta
a9b04801db Port Dolphin from Nepomuk to Nepomuk2 according to the Nepomuk2Port mini guide on techbase - http://techbase.kde.org/Projects/Nepomuk/Nepomuk2Port
REVIEW: 106825
2012-10-15 21:46:59 +02:00
Pino Toscano
c239ae19de Merge remote-tracking branch 'origin/KDE/4.9' 2012-10-13 09:27:54 +02:00
Amol Godbole
67cae55f9d Use not only Alt+Return, but also Alt+Enter as shortcut for "Properties"
BUG: 307603
REVIEW: 106753
FIXED-IN: 4.9.3
2012-10-07 19:39:59 +02:00
Dawit Alemayehu
bc66254304 Merge branch '4.9' 2012-10-03 15:09:58 -04:00
Frank Reininghaus
2277ccaf23 Fix the hidden "EnlargeSmallPreviews" option
This option, introduced in 99e4eb0f3a, did
not work any more since 2069c20021.

CCBUG: 307522
2012-10-03 10:14:20 +02:00
Frank Reininghaus
0e49df9214 Find out the main window by calling the parent widget's window() member
KFileItemModel calls the dir lister's setMainWindow() method to make
sure that the dir lister caches authentication data. However, the method
used to determine the main window (qApp->activeWindow()) is not
guaranteed to yield the DolphinMainWindow or the KonqMainWindow. In
particular, if "Split View" is enabled in Dolphin's settings dialog, the
active window is the dialog, and when it is closed, any later access to
the stored pointer leads to a crash.

A better method is to verify that the model's parent is a QWidget and
then use this widget's window(). I had to make a small modification in
DolphinMainWindow to make sure that it also works correctly when the
view is split (the new view container had been created with a 0 parent
previously).

I tested it in Dolphin and Konqueror and verified that the "main window"
passed to the dir lister is really the application's main window.

BUG: 306459
FIXED-IN: 4.9.3
2012-09-29 19:53:14 +02:00
Dawit Alemayehu
65b7e3b785 Redo the fix for CTRL+Tab not working when using Dolphin's filemanagement part
in Konqueror. The original fix, commit 4f7ed2b, prevents drag and drop from
working correctly.

CCBUG: 302329
REVIEW: 106569
2012-09-28 14:01:21 -04:00
Dawit Alemayehu
b7a8327c30 Merge branch '4.9' 2012-09-27 17:48:56 -04:00
Vishesh Handa
9b01d1bcc1 Dolphin Places: Only show file results in Nepomuk Queries
Dolphin is a file manager, and shouldn't be concerned with non-file
resources like notes, contacts and other stuff.

Use FileQuery instead of Query.

This also results in a faster queries. With File Queries Nepomuk can
perform some internal optimizations.

BUG: 306029
REVIEW: 106274

Cherry-picked from 6892d39d29
2012-09-28 02:37:35 +05:30
Emmanuel Pescosta
814611ca36 Some speed improvements in KFileItemModelRolesUpdater:
- Use QSet.erase() instead of QSet.remove() => no expensive Rehashing
- Get rid of += in sortAndResolvePendingRoles()
- Some other small changes

REVIEW: 106577
2012-09-27 18:47:55 +02:00
Frank Reininghaus
831251d0f3 Add a new config option for the icon size in the Places Panel
To change the icon size in the Places Panel to, e.g., 60 pixels, add
the following lines to $KDEHOME/share/config/dolphinrc :

[PlacesPanel]
IconSize=60

A value of -1 means that the standard "Small" size should be used
(which has been the default before this commit).

It is planned to add an "Icon Size" submenu to the context menu of the
Places Panel in KDE 4.10, but we cannot do this in the 4.9 branch
because of the string freeze.

FIXED-IN: 4.9.2
BUG: 301959
2012-09-27 08:12:02 +02:00
Emmanuel Pescosta
63561edb45 Fix a Bug in KFileItemModelRolesUpdate::setEnabledPlugins.
Changes were never overtaken because of a wrong comparison.

FIXED-IN: 4.9.2
2012-09-26 17:36:51 +02:00
Dawit Alemayehu
7cef34939d Fixed CTRL+Tab not working when using Dolphin's filemanagement part in Konqueror.
BUG: 302329
FIXED-IN: 4.9.2
REVIEW: 106569
2012-09-26 10:16:44 -04:00
Amandeep Singh
509464cce9 Adding license header in kitemlistviewaccessible
Added the license header in kitemlistviewaccessible.*
Accessibility headers not included when QT_NO_ACCESSIBILITY defined
Removed unnecessary debug statement
2012-09-26 04:36:31 +05:30
Frank Reininghaus
a5d8edb8c2 Fix coding style and unnecessary complexity in KItemListViewAccessible
CCMAIL: aman.dedman@gmail.com
CCMAIL: gladhorn@kde.org
2012-09-25 22:01:03 +02:00
Emmanuel Pescosta
c330be5f5c Fixes Bug 305783 - dragging a file over a directory #c4
does not expand the dir => Bug discovered: When you drag a
     item onto a folder-view-item and then move it away
     instantly before the autoactivation event is triggered
     (After 750ms), the folder will be opened anyway.

BUG: 305783
REVIEW: 106381
FIXED-IN: 4.9.2
(cherry picked from commit 9ab8bcd6aa)
2012-09-25 17:06:34 +02:00
Frederik Gladhorn
c914273feb Do not include role name in acc name, add desc.
The role is already known. Including it in the
accName means a screen reader will read
"zoom slider slider".
2012-09-25 12:50:06 +02:00
Amandeep Singh
c08a4794ff Removing layouter from public, adding TableModelChanged update
REVIEW : 106555
2012-09-25 04:01:48 +05:30
Frank Reininghaus
631f97a6d9 Revert part of 20b0cb68bf
That commit, which disregarded roles with empty text for the row number
calculation in Icons View, caused the problem that icons might jump
around while information was retrieved asynchronously because previously
empty roles could get a non-empty value, and the corresponding items
would need an additional row in the view.

Thanks to Hrvoje Senjan for testing this feature in master and reporting
this issue early, such that we could fix it quickly and prevent that
other users suffer from this bug!

CCBUG: 304752
2012-09-24 23:32:51 +02:00
Frank Reininghaus
a740120fe1 Fix crash when receiving Nepomuk info for a recently deleted file.
BUG: 306036
FIXED-IN: 4.9.2
2012-09-24 22:59:59 +02:00
Amandeep Singh
2fafb33240 Removing unneccessary case for Sibling in navigate 2012-09-23 02:15:24 +05:30
Frederik Gladhorn
8f816c8d95 Make cell indices work. 2012-09-22 22:41:54 +02:00
Frederik Gladhorn
174749c349 Accessibility: Fix cellAt
Row and column are 0 based, the cell function
uses 1 based indices.
2012-09-22 21:41:36 +02:00
José Millán Soto
e6fd6f32b4 Set accessible name to selectHomeUrlButton 2012-09-22 20:35:58 +02:00
Amandeep Singh
1b5b731621 Merge branch for accessibility 2012-09-22 23:49:15 +05:30
Amandeep Singh
990c7d260f Returning correct rowCount. 2012-09-22 23:47:18 +05:30
Amandeep Singh
4196026cd8 Making code confirm to policy 2012-09-22 23:47:18 +05:30