]> cloud.milkyroute.net Git - dolphin.git/log
dolphin.git
12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Thu, 20 Jun 2013 17:44:06 +0000 (19:44 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoAllow renaming multiple files without number if extensions are different
Frank Reininghaus [Thu, 20 Jun 2013 17:37:53 +0000 (19:37 +0200)]
Allow renaming multiple files without number if extensions are different

Normally, we only allow renaming multiple files if the new file name
contains a contiguous sequence of '#' placeholders, which are then
replaced by numbers.

However, if all extensions are different, we can also rename the files
without such a placeholder because the original extension is preserved
when renaming.

This had been possible some time ago already. That this "accidental
feature" was lost was a side effect of the fix for bug 318942.

BUG: 321234
FIXED-IN: 4.10.5
REVIEW: 111079

12 years agoMake it possible to select files like "a_b" using keyboard search
Frank Reininghaus [Thu, 20 Jun 2013 17:32:25 +0000 (19:32 +0200)]
Make it possible to select files like "a_b" using keyboard search

The problem was that pressing the Shift key would reset the keyboard
search.

BUG: 321286
FIXED-IN: 4.11.0
REVIEW: 111102

12 years agoHide the "drop" indicator when an item is not hovered any more
Frank Reininghaus [Thu, 20 Jun 2013 17:29:10 +0000 (19:29 +0200)]
Hide the "drop" indicator when an item is not hovered any more

This fixes the problem that the drop indicator might still be shown
after the drag&drop operation in the Places Panel is finished.

REVIEW: 111037

12 years agoSome simplifications in KFileItemModelRolesUpdater
Frank Reininghaus [Thu, 20 Jun 2013 17:23:43 +0000 (19:23 +0200)]
Some simplifications in KFileItemModelRolesUpdater

This removes some things that are obsolete after the recent commits:

(a) resolveNextPendingRoles() is not called any more when the preview
    job is running.

(b) In applyResolvedRoles(), we always load the icon if it isn't known
    yet. This ensures that every item has an icon.

REVIEW: 111012

12 years agoTry to do at least a "fast" icon loading for all items
Frank Reininghaus [Thu, 20 Jun 2013 17:18:22 +0000 (19:18 +0200)]
Try to do at least a "fast" icon loading for all items

If all icons for the visible items could be loaded in 200 ms, we
continue loading icons without mime type determination for all items
until the 200 ms are over. This reduces the risk that the user ever
sees "unknown" icons.

REVIEW: 111011

12 years agoAvoid a unnecessary resorting when items are changed, only resort the items when...
Emmanuel Pescosta [Thu, 20 Jun 2013 17:16:22 +0000 (19:16 +0200)]
Avoid a unnecessary resorting when items are changed, only resort the items when the sorting role value is changed.

BUG: 299565
FIXED-IN: 4.11
REVIEW: 111146

12 years agoMake sure that all visible items have an icon
Frank Reininghaus [Thu, 20 Jun 2013 17:13:35 +0000 (19:13 +0200)]
Make sure that all visible items have an icon

We try to determine "final" icons, i.e., icons with known mime type,
for 200 ms. If this does not succeed, we at least load "fast" icons,
i.e., load the icons without determining the mime type.

REVIEW: 111009

12 years agoPrevent the selection rectangle from being reduced to 0px
Emmanuel Pescosta [Thu, 20 Jun 2013 17:02:06 +0000 (19:02 +0200)]
Prevent the selection rectangle from being reduced to 0px
width or 0px height, so the selected items can not be accidently
unselected when the rectangle width/height becomes 0px.

BUG: 320897
REVIEW: 111144
FIXED-IN: 4.10.5

12 years agoSimplify handling of preview jobs
Frank Reininghaus [Thu, 20 Jun 2013 16:10:07 +0000 (18:10 +0200)]
Simplify handling of preview jobs

This patch changes two things about the way we handle the preview jobs:

(a) Rather than passing a KFileItemList to startPreviewJob(),
    remembering the leftovers in the member variable
    m_pendingPreviewItems and then starting a new preview job for
    these, we append items that need a preview to this member, and let
    startPreviewJob() take its input from there. This simplifies the
    code greatly.

(b) To prevent that we start preview jobs with just one item and also
    that the GUI is frozen too long by startPreviewJob(), we take the
    following approach:

    * If the mime type of the first pending item is known, the function
      has probably been called by startUpdating(), which has determined
      mime types for the visible items already. startUpdating() has
      also blocked the GUI, so we just take all items at the beginning
      of the list with known mime type, and do not do any expensive
      mime type determination in startPreviewJob().

    * If the mime type of the first pending item is unknown, the
      function has probably been called by slotPreviewJobFinished(). In
      that case, we can afford to block the GUI for a short while, so
      we determine mime types for 200 ms.

REVIEW: 111008

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Dawit Alemayehu [Thu, 20 Jun 2013 12:41:12 +0000 (08:41 -0400)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoDo not use fixed widths for the widgets in the status bar
Frank Reininghaus [Tue, 18 Jun 2013 15:46:51 +0000 (17:46 +0200)]
Do not use fixed widths for the widgets in the status bar

This fixes the problem that the Dolphin window has a rather large
minimum size. A side effect of this was that splitting the view could
resize the window (because twice the minimum status bar width was
needed then).

BUG: 319373
REVIEW: 110966
FIXED-IN: 4.10.5

12 years agoEnsure that the "Sort by Type" setting is respected
Frank Reininghaus [Tue, 18 Jun 2013 15:39:56 +0000 (17:39 +0200)]
Ensure that the "Sort by Type" setting is respected

Before this commit, switching from, e.g., "Sort by Name" to "Sort by
Type" sometimes had no effect until the view was refreshed. The problem
was that the re-sorting was triggered before the type information was
actually added to the model.

BUG: 310705
BUG: 312014
FIXED-IN: 4.10.5
REVIEW: 111004

12 years agoRemove trailing white space
Frank Reininghaus [Thu, 13 Jun 2013 21:34:39 +0000 (23:34 +0200)]
Remove trailing white space

12 years agoFix "unused parameter" warning
Frank Reininghaus [Thu, 13 Jun 2013 21:32:01 +0000 (23:32 +0200)]
Fix "unused parameter" warning

We don't need the parameter at all, so let's just remove it.

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Mon, 10 Jun 2013 19:40:41 +0000 (21:40 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoDo not rename files unexpectedly when changing the URL
Frank Reininghaus [Sun, 9 Jun 2013 10:14:26 +0000 (12:14 +0200)]
Do not rename files unexpectedly when changing the URL

This is the real fix now - note that the last commit
4de9a233642a62ee96bac6031340d3eea21f14f9 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

12 years agoDo not rename files unexpectedly when changing the URL
Frank Reininghaus [Mon, 10 Jun 2013 19:15:53 +0000 (21:15 +0200)]
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

12 years agoFix Bug 319119 - Dolphin doesn't notice when renaming failed
Emmanuel Pescosta [Mon, 10 Jun 2013 09:16:21 +0000 (11:16 +0200)]
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

12 years agoDo not delete files when Shift-clicking "Trash"
Frank Reininghaus [Sun, 9 Jun 2013 09:53:59 +0000 (11:53 +0200)]
Do not delete files when Shift-clicking "Trash"

Thanks to Dawit Alemayehu for making this fix possible with commit
8e023ae9e5051cb7b81af86a178e37c1f2c5da94 !

BUG: 307254
FIXED-IN: 4.11.0

12 years agoRemove unused argument
Frank Reininghaus [Fri, 7 Jun 2013 07:22:32 +0000 (09:22 +0200)]
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.

12 years agoIgnore a changed item if it cannot be found in the model
Frank Reininghaus [Thu, 6 Jun 2013 08:00:47 +0000 (10:00 +0200)]
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

12 years agoMake calls to resolveNextPendingRoles and resolveNextSortRole delayed
Frank Reininghaus [Thu, 6 Jun 2013 06:49:12 +0000 (08:49 +0200)]
Make calls to resolveNextPendingRoles and resolveNextSortRole delayed

This prevents that functions that call these indirectly call themselves
recursively and cause trouble.

BUG: 320791

12 years agostartPreviewJob: if items is empty, delay call to slotPreviewJobFinshed
Frank Reininghaus [Thu, 6 Jun 2013 06:38:58 +0000 (08:38 +0200)]
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

12 years agoKFileItemModelRolesUpdater: waste less ressources and fix some bugs
Frank Reininghaus [Wed, 5 Jun 2013 21:31:01 +0000 (23:31 +0200)]
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

12 years agoReduce KFileItemModel memory usage by making use of implicit sharing
Frank Reininghaus [Wed, 5 Jun 2013 21:18:26 +0000 (23:18 +0200)]
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

12 years agomove focus to another view upon drop
Weng Xuetian [Wed, 5 Jun 2013 21:07:31 +0000 (17:07 -0400)]
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

12 years agoBug 196035 - middle clicking on archive files in dolphin does not open them in a...
Emmanuel Pescosta [Tue, 28 May 2013 15:31:14 +0000 (17:31 +0200)]
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

12 years agoDolphin Search: Do not use Nepomuk for hidden folders
Vishesh Handa [Tue, 28 May 2013 16:33:36 +0000 (22:03 +0530)]
Dolphin Search: Do not use Nepomuk for hidden folders

Nepomuk does not index hidden folders

BUG: 318442
REVIEW: 110697
FIXED-IN: 4.11.0

12 years agoHide context menu plugins unless enabled by default or by the user
Frank Reininghaus [Wed, 29 May 2013 05:48:11 +0000 (07:48 +0200)]
Hide context menu plugins unless enabled by default or by the user

REVIEW: 110685

12 years agoPlacesModel: Only allow folders to be pinned
Vishesh Handa [Tue, 7 May 2013 10:01:11 +0000 (15:31 +0530)]
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

12 years agoPlacesPanel: Do not allow drop events into timeline or search folder
Vishesh Handa [Tue, 7 May 2013 10:07:27 +0000 (15:37 +0530)]
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

12 years agoset KItemListView palette from scenes first view
Thomas Lübking [Sat, 18 May 2013 13:51:27 +0000 (15:51 +0200)]
set KItemListView palette from scenes first view

REVIEW: 110505

12 years agoAdded the "Open in new Tabs" action to the Dolphin Context menu.
Emmanuel Pescosta [Wed, 22 May 2013 19:47:14 +0000 (21:47 +0200)]
Added the "Open in new Tabs" action to the Dolphin Context menu.

BUG: 312296
REVIEW: 110371
FIXED-IN: 4.11.0

12 years agoFilter bar: add a button that prevents clearing if the URL changes
Stuart Citrin [Wed, 22 May 2013 16:48:00 +0000 (18:48 +0200)]
Filter bar: add a button that prevents clearing if the URL changes

FEATURE: 256651
FIXED-IN: 4.11.0
REVIEW: 107392

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Wed, 22 May 2013 16:34:25 +0000 (18:34 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoKFileItemModel::insertItems(): guarantee O(N) run time complexity
Frank Reininghaus [Wed, 22 May 2013 16:27:05 +0000 (18:27 +0200)]
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

12 years agoDo not reset the 'isExpanded' state when an expanded folder is refreshed
Frank Reininghaus [Wed, 22 May 2013 16:14:21 +0000 (18:14 +0200)]
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

12 years agoKFileItemModelRolesUpdater: only update the size for changed folders
Frank Reininghaus [Wed, 22 May 2013 16:06:54 +0000 (18:06 +0200)]
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

12 years ago- Factored out the Delete/Move To Trash action into own class.
Dawit Alemayehu [Sat, 9 Feb 2013 20:56:51 +0000 (15:56 -0500)]
- 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

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Dawit Alemayehu [Tue, 14 May 2013 12:36:11 +0000 (08:36 -0400)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoDolphinSearchBox setReadOnly: Update if either of the parameters change
Vishesh Handa [Mon, 6 May 2013 13:48:11 +0000 (19:18 +0530)]
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

12 years agoDolphin Places: Make it easier to drag and drop items
Vishesh Handa [Tue, 7 May 2013 09:42:56 +0000 (15:12 +0530)]
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

12 years agoMake error message translatable
Frank Reininghaus [Sun, 12 May 2013 08:38:22 +0000 (10:38 +0200)]
Make error message translatable

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Sun, 12 May 2013 08:04:01 +0000 (10:04 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoHide the message widget when the URL changes
Frank Reininghaus [Sun, 12 May 2013 08:01:01 +0000 (10:01 +0200)]
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

12 years agoFix unit test failure
Frank Reininghaus [Sun, 12 May 2013 07:30:20 +0000 (09:30 +0200)]
Fix unit test failure

The recent commit 022b564831e2295ee3bb6e53ece53191b40d894a, 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

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Sat, 11 May 2013 16:47:58 +0000 (18:47 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
CMakeLists.txt

12 years agoUpdate copyright year
Frank Reininghaus [Sat, 11 May 2013 16:44:21 +0000 (18:44 +0200)]
Update copyright year

12 years agofix building tests under windows
Patrick Spendrin [Fri, 10 May 2013 21:03:23 +0000 (23:03 +0200)]
fix building tests under windows

12 years agoDon't try to change the icon of the "sort" action menu if it doesn't exist
Daniel Faust [Fri, 10 May 2013 20:27:22 +0000 (22:27 +0200)]
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

12 years agoDolphin Places: React to Nepomuk system changes
Vishesh Handa [Mon, 6 May 2013 13:11:21 +0000 (18:41 +0530)]
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

12 years agoReimplement handling of Shift while showing menu without KModifierKeyInfo
David Faure [Sat, 4 May 2013 18:31:02 +0000 (20:31 +0200)]
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

12 years agoRemove erroneous double-quotes around %c in Exec line
David Faure [Fri, 3 May 2013 11:22:12 +0000 (13:22 +0200)]
Remove erroneous double-quotes around %c in Exec line

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Thu, 2 May 2013 17:45:08 +0000 (19:45 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoDo not change the view URL if it is a symlink to the current directory
Frank Reininghaus [Thu, 2 May 2013 17:38:01 +0000 (19:38 +0200)]
Do not change the view URL if it is a symlink to the current directory

BUG: 302037
FIXED-IN: 4.10.3
REVIEW: 110233

12 years agoUse the same text color for selected hidden and non-hidden items
Frank Reininghaus [Thu, 2 May 2013 17:27:47 +0000 (19:27 +0200)]
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

12 years agoRename multiple files: Determine correctly if the name pattern is valid
Frank Reininghaus [Thu, 2 May 2013 17:23:19 +0000 (19:23 +0200)]
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

12 years agoReplace the button label "Less Options" by "Fewer Options"
Frank Reininghaus [Sat, 27 Apr 2013 17:09:42 +0000 (19:09 +0200)]
Replace the button label "Less Options" by "Fewer Options"

BUG: 318937

FIXED-IN: 4.11.0

12 years agoScroll to newly pasted files.
Emmanuel Pescosta [Tue, 23 Apr 2013 20:50:01 +0000 (22:50 +0200)]
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

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Tue, 23 Apr 2013 17:40:42 +0000 (19:40 +0200)]
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!

12 years agoDisable Find/Replace in the "rename inline" line edit
Frank Reininghaus [Tue, 23 Apr 2013 17:31:08 +0000 (19:31 +0200)]
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

12 years agoDo not dereference null pointer in KItemListViewAccessible
Frank Reininghaus [Tue, 23 Apr 2013 17:25:52 +0000 (19:25 +0200)]
Do not dereference null pointer in KItemListViewAccessible

BUG: 316285
FIXED-IN: 4.10.3

12 years agoComment out assertion to fix a crash when filtering in Icons/Compat View
Frank Reininghaus [Mon, 22 Apr 2013 19:36:57 +0000 (21:36 +0200)]
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

12 years agoAlways determine icons for the visible items first
Frank Reininghaus [Mon, 22 Apr 2013 19:21:31 +0000 (21:21 +0200)]
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

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sat, 20 Apr 2013 07:44:11 +0000 (09:44 +0200)]
SVN_SILENT made messages (.desktop file)

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Fri, 19 Apr 2013 11:27:40 +0000 (13:27 +0200)]
SVN_SILENT made messages (.desktop file)

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Aurélien Gâteau [Fri, 12 Apr 2013 14:31:03 +0000 (16:31 +0200)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoFix moving image while transitioning to hover pixmap
Aurélien Gâteau [Thu, 11 Apr 2013 09:26:16 +0000 (11:26 +0200)]
Fix moving image while transitioning to hover pixmap

See: http://youtu.be/OMYO0U0kSL0

REVIEW: 109960
FIXED-IN: 4.10.3

12 years agoMove Bluetooth places items to Device section of places list
Kai Uwe Broulik [Tue, 2 Apr 2013 14:07:29 +0000 (16:07 +0200)]
Move Bluetooth places items to Device section of places list

REVIEW: 109622
BUG: 301276

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Luca Beltrame [Wed, 27 Mar 2013 15:50:22 +0000 (16:50 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
plasma/applets/folderview/folderview.cpp

12 years agoUpdate icon if it couldn't be determined upfront (.desktop file on slow mount)
David Faure [Wed, 27 Mar 2013 13:32:08 +0000 (14:32 +0100)]
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

12 years agoImprove grouping by name for non-ASCII file names
Frank Reininghaus [Tue, 26 Mar 2013 00:21:00 +0000 (01:21 +0100)]
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

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Aurélien Gâteau [Thu, 21 Mar 2013 13:12:28 +0000 (14:12 +0100)]
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

12 years agoFix transition between m_pixmap and m_hoverPixmap
Aurélien Gâteau [Thu, 21 Mar 2013 13:06:07 +0000 (14:06 +0100)]
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

12 years agoRefresh all expanded directories too, when reloading a directory.
Emmanuel Pescosta [Sun, 17 Mar 2013 19:13:55 +0000 (20:13 +0100)]
Refresh all expanded directories too, when reloading a directory.

BUG: 295300
FIXED-IN: 4.10.2
REVIEW: 109488

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Weng Xuetian [Sat, 16 Mar 2013 04:47:11 +0000 (00:47 -0400)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agouse plain text for information panel
Weng Xuetian [Sat, 16 Mar 2013 04:43:22 +0000 (00:43 -0400)]
use plain text for information panel

REVIEW: 109129
BUG: 315693
CCBUG: 262464

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Albert Astals Cid [Fri, 15 Mar 2013 20:55:53 +0000 (21:55 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/dolphin.desktop
konq-plugins/searchbar/searchbar.desktop
konqueror/settings/kio/proxy.desktop
konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop
konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
konqueror/settings/kio/uasproviders/googlebot.desktop
konqueror/settings/kio/uasproviders/ie60oncurrent.desktop
konqueror/settings/kio/uasproviders/op90oncurrent.desktop
konqueror/settings/kio/uasproviders/safari20.desktop
konqueror/sidebar/default_entries/history.desktop
konqueror/sidebar/default_entries/root.desktop
konqueror/sidebar/history_module/kcmhistory.desktop

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Fri, 15 Mar 2013 13:57:44 +0000 (14:57 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Fri, 15 Mar 2013 09:09:23 +0000 (10:09 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Thu, 14 Mar 2013 23:28:40 +0000 (00:28 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoImprove handling of filtered items when folders are deleted/collapsed
Frank Reininghaus [Thu, 14 Mar 2013 23:23:44 +0000 (00:23 +0100)]
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

12 years agoPrevent accidental deletion of home directory in Terminal Panel
Frank Reininghaus [Thu, 14 Mar 2013 23:12:33 +0000 (00:12 +0100)]
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

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Thu, 14 Mar 2013 16:08:18 +0000 (17:08 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Thu, 14 Mar 2013 08:38:14 +0000 (09:38 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoFix recent regressions when "Sort by Type" is used
Frank Reininghaus [Tue, 12 Mar 2013 18:26:36 +0000 (19:26 +0100)]
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

12 years agoDo not skip rows in when clicking the empty area of the scroll bar
Frank Reininghaus [Mon, 11 Mar 2013 17:18:25 +0000 (18:18 +0100)]
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

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Sun, 10 Mar 2013 17:31:23 +0000 (18:31 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/kitemviews/kfileitemmodel.cpp

12 years agoRemove filtered children if the parent folder is collapsed
Frank Reininghaus [Sun, 10 Mar 2013 17:26:20 +0000 (18:26 +0100)]
Remove filtered children if the parent folder is collapsed

This is analogous to commit e053ecdcd57cc39fdcbc314fc8dd22c8b9dbdd4f,
which fixes the same problem for the case that the parent folder is
deleted.

BUG: 316335
FIXED-IN: 4.10.2
REVIEW: 109343

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Thu, 7 Mar 2013 22:00:22 +0000 (23:00 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

12 years agoRemove duplicated slot
Frank Reininghaus [Thu, 7 Mar 2013 21:56:52 +0000 (22:56 +0100)]
Remove duplicated slot

The slot DolphinViewContainer::focusView(), introduced in commit
2f0114730d1f5c3dfaee833300168b8e16b068f2, is actually unnecessary
because DolphinViewContainer::requestFocus() provides the same
functionality already.

12 years agoUse a consistent way to group files by "Date"
Daniel Kreuter [Sun, 3 Mar 2013 17:20:59 +0000 (18:20 +0100)]
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

12 years agoRemoved everything related to m_expandedParentsCountRoot ->
Emmanuel Pescosta [Wed, 27 Feb 2013 18:56:55 +0000 (19:56 +0100)]
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

12 years agoBig Thanks to Frank Reininghaus, who helped me a lot with these
Emmanuel Pescosta [Wed, 27 Feb 2013 12:35:20 +0000 (13:35 +0100)]
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

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Fri, 22 Feb 2013 16:54:48 +0000 (17:54 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Fri, 22 Feb 2013 05:41:23 +0000 (06:41 +0100)]
SVN_SILENT made messages (.desktop file)

12 years agoReturn the focus from the filter bar to the view if Enter is pressed
Jens Rutschmann [Tue, 19 Feb 2013 21:42:55 +0000 (22:42 +0100)]
Return the focus from the filter bar to the view if Enter is pressed

BUG: 297140
FIXED-IN: 4.11.0
REVIEW: 109020

12 years agoMerge remote-tracking branch 'origin/KDE/4.10'
Frank Reininghaus [Tue, 19 Feb 2013 14:45:44 +0000 (15:45 +0100)]
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp
lib/konq/konq_operations.cpp

12 years agoFix crash when clicking an action in context menu for a removed device
Frank Reininghaus [Mon, 18 Feb 2013 22:58:26 +0000 (23:58 +0100)]
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