Commit graph

4115 commits

Author SHA1 Message Date
Amandeep Singh 28239e6ca8 Removing in-class functions and unnecessary destructor 2012-09-22 23:47:18 +05:30
Amandeep Singh 0ae031a4e6 Modify code according to dolphin policy 2012-09-22 23:47:17 +05:30
Luca Beltrame f1b822d926 Merge branch 'KDE/4.9'
Conflicts:
	konq-plugins/dirfilter/dirfilterplugin.cpp
	konq-plugins/dirfilter/dirfilterplugin.h
2012-09-21 10:55:08 +02:00
Emmanuel Pescosta c824340147 Fix Bug 297355 - Dolphin leaves file preview tooltips open even when is not visible
BUG: 297355
FIXED-IN: 4.9.2
REVIEW: 106499
2012-09-20 17:57:10 +02:00
Emmanuel Pescosta 904d7b0701 Restore old behavior: Navigating by double-clicking in folder panel (Double-Click - show folder content and expand folder)
BUG: 295573
REVIEW: 106497
FIXED-IN: 4.9.2
2012-09-20 17:56:32 +02:00
Emmanuel Pescosta 4855b582b4 Fixes Bug 304878 - Dolphin shows "ghost" folders in places after autofs umount nfs shares
BUG: 304878
REVIEW: 106456
FIXED-IN: 4.9.2
2012-09-20 17:56:00 +02:00
Emmanuel Pescosta 580bcae62c Fixes Bug 293200 - Drag&drop files in dolphin doesnt preserve origin
Patch 106381 Comment #3:
When "Open folders during drag operations" is enabled, two things happen, both in the DolphinView and in the Folders Panel:

1) When hovering a folder that can be expanded (this is the case for folders with sub-folders in the Folders Panel and in the DolphinView if in Details View mode), toggle its "expanded" state.
2) When hovering a folder that can not be expanded (i.e., a folder without sub-folders or any folder in Icons or Compact View), open this folder in the DolphinView via the KItemListController's itemActivated(int) signal.

The bug described in bug 293200 comment 3 is that 1) is always wanted, but 2) is not wanted for the Folders Panel.

BUG: 293200
FIXED-IN: 4.9.2
2012-09-19 19:00:52 +02:00
Frank Reininghaus 40c513d477 Prevent unwanted URL changes when using the Terminal Panel
The root cause of the problem was that TerminalPanel's member
m_konsolePartCurrentDirectory, which is used to determine in
TerminalPanel::sendCdToTerminal(QString& dir) if the Konsole part's
directory is aleady 'dir', such that issuing the 'cd' command is not
needed, was updated too late, namely when the part's
currentDirectoryChanged(QString) signal was received, which may be up
to one second after the 'cd' command.

When changing the directory from "dir1" to "dir2" and going back to
the "dir1" in less than one second (either by using the 'Back' action
or by activating a tab which still had "dir1" open), the 'cd dir1'
command was therefore suppressed because the Terminal Panel still
thought that "dir1" was the current directory in the part. However,
the directory of the part was actually "dir2", and when the
currentDirectoryChanged(QString) signal was received from the part, the
view's URL was set to "dir2" as well.

BUG: 306349
BUG: 304838
FIXED-IN: 4.9.2
2012-09-19 09:28:35 +02:00
Dawit Alemayehu 399c4b22ea Corrected the compile fix commit, rev 965fc6b3.
(cherry picked from commit 1e45cb9019)
2012-09-15 14:41:06 -04:00
Dawit Alemayehu 0b918c3f82 Corrected the compile fix commit, rev 965fc6b3. 2012-09-15 13:44:54 -04:00
Frank Reininghaus fa255857a0 Re-enable renaming items with the rename dialog
User feedback has shown that many users used the dialog for renaming
files. Since the dialog is still used when renaming multiple files, I
think there is no good reason not to use it for renaming single files
as well if the user wants.

Note that we cannot add an option in the settings dialog due to string
freeze issues. For the time being, you will have to add the line
"RenameInline=false" to the [General] section of
$KDEHOME/share/config/dolphinrc.

BUG: 304627
FIXED-IN: 4.9.2
2012-09-12 21:19:41 +02:00
Emmanuel Pescosta 186141f4d3 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
2012-09-12 19:33:28 +02:00
Dawit Alemayehu fa36040a9a Fix compile against the minimum required kdelibs version (v4.7.97)
(cherry picked from commit f0d5e062bf)
2012-09-11 16:57:51 -04:00
Dawit Alemayehu 7bccdf85f7 Fix compile against the minimum required kdelibs version (v4.7.97) 2012-09-11 16:57:18 -04:00
Emmanuel Pescosta 5fbc010179 Mount unmounted devices, when a file is dropped upon it in places-panel.
BUG: 176277
REVIEW: 106072
FIXED-IN: 4.9.2

(cherry picked from commit 824fa6a437)
2012-09-11 20:23:28 +02:00
Emmanuel Pescosta bdfd49e7e7 Mount unmounted devices, when a file is dropped upon it in places-panel.
BUG: 176277
REVIEW: 106072
2012-09-11 20:17:56 +02:00
Emmanuel Pescosta e280e7f68c Fixes Bug 242007 - "Open Folder during Drag operation" cannot go into different partition using "Places Panel"
BUG: 242007
REVIEW: 106380
2012-09-11 20:09:01 +02:00
Frank Reininghaus 42dad0a948 Fix possible crash when refreshing the view while renaming inline
It is not reproducible on every machine for me, but it seems that it can
happen that DolphinView's slot slotRoleEditingFinished() is invoked
after the items have already been removed from the model. In that case,
we have to return from the slot immediately to prevent a crash.

BUG: 306147
FIXED-IN: 4.9.2
2012-09-11 19:43:53 +02:00
Frank Reininghaus 7de641316a Fix possible crash in KStandardItemListWidget::paint()
According to the backtrace in the bug report, it is possible that
KStandardItemListWidget::paint() is called if the hash m_textInfo has
not been initialised. The widget's index must be -1 in this case, see
KStandardItemListWidget::triggerCacheRefreshing(). It looks like this
can only happen if the item is about to be removed from the view, see
KItemListView::slotItemsRemoved().

I could not reproduce the crash, so I'm not sure why exactly this
happens, but this commit should at least prevent the crash.

BUG: 306167
FIXED-IN: 4.9.2
2012-09-11 19:34:23 +02:00
Frank Reininghaus f9ba9a7236 Use a better icon for recently accessed items, part 2
I had missed one places where the incorrect icon was used in my
previous commit d7e7ca53bb.

BUG: 304323
FIXED-IN: 4.9.2
2012-09-11 19:25:20 +02:00
Frank Reininghaus eb54d5b348 Simplify boolean expression
Thanks to André Wöbbeking for noticing that this was unnecessarily
complex!
2012-09-11 19:17:40 +02:00
Dawit Alemayehu 2da3823b74 Implemented the new KParts extension, KParts::ListingiNotificationExtension.
REVIEW: 106333
(cherry picked from commit acef4b1c28)
2012-09-07 08:54:14 -04:00
Dawit Alemayehu 8b11c747a0 Implemented the new KParts extension, KParts::ListingiNotificationExtension.
REVIEW: 106333
2012-09-07 08:52:53 -04:00
Frank Reininghaus 7b64f58a6c Make the button that enables additional search options more obvious
This is achieved by adding some descriptive text and by using a more
appropriate icon.

Thanks to Panos Kanavos for the patch!

BUG: 300248
FIXED-IN: 4.10.0
REVIEW: 106325
2012-09-06 08:03:56 +02:00
Frank Reininghaus 85dfec046f Do not show '-' for additional info which is not available for an item
I'm only backporting the removal of the '-', not the update for the
line number calculation in Icons View, because this is the safest part
of the patch and also the one that fixes the most annoying part of the
bug.

Thanks to Todd Jennings for the patch!
BUG: 304752
REVIEW: 106304
(cherry picked from commit 20b0cb68bf)
2012-09-06 07:57:48 +02:00
Frank Reininghaus cad870df3b Do not show '-' for additional info which is not available for an item
Thanks to Todd Jennings for the patch!
CCBUG: 304752
REVIEW: 106304
2012-09-06 07:51:22 +02:00
Dawit Alemayehu 055ad286aa Implemented the new KParts' listing filter extension, KParts::ListingFilterExtension.
REVIEW: 106289
(cherry picked from commit cb79ee6a88)
2012-09-05 11:31:38 -04:00
Dawit Alemayehu 1bac8668d7 Implemented the new KParts' listing filter extension, KParts::ListingFilterExtension.
REVIEW: 106289
2012-09-05 11:25:37 -04:00
Vishesh Handa 0016f150ae 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
2012-08-30 17:33:11 +05:30
Weng Xuetian a33310c99b fix missing enum
REVIEW: 106239
2012-08-29 07:44:24 -04:00
Weng Xuetian bdd0b97662 fix missing enum
REVIEW: 106239
2012-08-29 07:44:04 -04:00
Weng Xuetian 09ba6bcb62 Make --select can automatically scroll to the selected file.
REVIEW: 106209
2012-08-27 14:01:10 -04:00
Weng Xuetian 864495f661 Make --select can automatically scroll to the selected file.
REVIEW: 106209
2012-08-27 13:58:46 -04:00
Raphael Kubo da Costa 89960b65e9 Merge branch 'KDE/4.9'
`git merge -s recursive --log --edit KDE/4.9' was run first, and it looked
like the only conflicts were in some docbooks. I then aborted the merge and
ran `git merge' with `-Xours' to use this branch's version of the
conflicting files.

Even though a lot of changes are listed below, all but the last two are
already present in master because they were cherry-picked from one branch to
another.

Hopefully this sets a trend and people start using git as it was intended to
be used.

* KDE/4.9: (50 commits)
  Adjust to Ark's drag'n'drop D-Bus interface changes.
  Adjust to Ark's drag'n'drop D-Bus interface changes.
  Fix wrong behaviour, when Dolphin is started with --split argument.
  Do not crash when finishing inline renaming in unusual ways
  Fix regression that caused "(I18N_EMPTY_MESSAGE)" sub menus in menus
  Select the correct item in places-panel, when a directory is opened.
  SVN_SILENT made messages (.desktop file)
  avoid duplicate entries in konqueror address completion list
  Fix translations not showing in the Sort by and Additional Information submenus
  Fix wrong text color in Places Group Header. Use QPalette::Window for base color and QPalette::WindowText for text color. Also changed m_roleColor color mixing to 60% (from 70%) -> Better visible color difference when base color is darker than text color. Also changed styleOption().palette.brush(group, role).color() to styleOption().palette.color(group, role) in KStandardItemListWidget -> should be more efficient.
  Fix wrong text color in places and in folders panel.
  Show icon size as tooltip when adjusting icon size
  Fix a long standing security issue with the hiding of Konqueror's location (address) bar through javascript.
  Fixed the display of the security sheild icon for SSL sites.
  SVN_SILENT made messages (.desktop file)
  Follow-up to d7e7ca53bb - use correct icon
  Use a better icon for recently accessed items in the Places Panel
  Use a saner check for multimedia files in infopanel.
  Fix the size of the rating stars in Icons View
  Stop preview jobs when closing Dolphin
  ...
2012-08-26 01:30:51 -03:00
Raphael Kubo da Costa d898f40f29 Adjust to Ark's drag'n'drop D-Bus interface changes.
Ark's drag'n'drop D-Bus interface needs to be changed: so far, the object
path was always /DndExtract, but this does not work if Ark is being used as
an embedded KPart (in Konqueror or Rekonq, for example), as all tabs will
end up calling QDBusConnection::registerObject() with the same path. Only
the first call will work, and the result is that dragging and dropping from
any tab previewing an archive with Ark will extract from the first archive
being previewed.

To fix that, applications that accept the application/x-kde-dndextract
mimetype should now be adjusted to check the
application/x-kde-ark-dndextract-service and
application/x-kde-ark-dndextract-path ones instead; the former contains the
same service information that used to be passed, while the latter tells
which object path should be talked to.

This is the Dolphin part of the change, which also needs to be made to
the folderview plasmoid.

REVIEW:		106131
CCBUG:		304860
2012-08-26 01:28:59 -03:00
Emmanuel Pescosta 6f6a5d12af Fix wrong behaviour, when Dolphin is started with --split argument.
Actual Results:
dolphin starts without split view

Expected Results:
dolphin starts with split view

New behaviour:
* no url given - use default url for all two views
* one url given - use given url for all two views
* two urls given - open the first url in the left view and the second url in the right view

BUG: 305538
REVIEW: 106171

(cherry picked from commit d430a1c3b3)
2012-08-25 00:00:30 +02:00
Emmanuel Pescosta 4e9ebb4b01 Merge branch 'KDE/4.9' of git://anongit.kde.org/kde-baseapps into KDE/4.9 2012-08-24 23:58:49 +02:00
Emmanuel Pescosta 23ce8df1c8 Fix wrong behaviour, when Dolphin is started with --split argument.
Actual Results:
dolphin starts without split view

Expected Results:
dolphin starts with split view

New behaviour:
* no url given - use default url for all two views
* one url given - use given url for all two views
* two urls given - open the first url in the left view and the second url in the right view

BUG: 305538
REVIEW: 106171
FIXED-IN: 4.9.1
2012-08-24 23:57:51 +02:00
Frank Reininghaus ca6459ea5a Do not crash when finishing inline renaming in unusual ways
The crash was caused by a null pointer dereference when, e.g.,
minimizing Dolphin. The root cause was that
KStandardItemListWidget::closeRoleEditor() was called twice: once when
the role editor loses focus, and once again when the window is resized.
After m_roleEditor was set to 0, the second call dereferenced this null
pointer. I think the best solution is to disconnect from the role
editor's signals when the editor is not needed any more by the
KStandardItemListWidget.

CCBUG: 304524
(cherry picked from commit a9c2bdc3b5)
2012-08-24 23:29:17 +02:00
Frank Reininghaus 09775ec745 Do not crash when finishing inline renaming in unusual ways
The crash was caused by a null pointer dereference when, e.g.,
minimizing Dolphin. The root cause was that
KStandardItemListWidget::closeRoleEditor() was called twice: once when
the role editor loses focus, and once again when the window is resized.
After m_roleEditor was set to 0, the second call dereferenced this null
pointer. I think the best solution is to disconnect from the role
editor's signals when the editor is not needed any more by the
KStandardItemListWidget.

BUG: 304524
FIXED-IN: 4.9.1
2012-08-24 23:27:03 +02:00
Frank Reininghaus 89a678241d Fix regression that caused "(I18N_EMPTY_MESSAGE)" sub menus in menus
For top-level roles like "Name" and "Size", the group translation is 0.
In that case, the "group" member of the corresponding RoleInfo struct
must be an empty string. This is expected by the code which generates
Dolphin's menus, which group the top-level roles into a sub menu with
the name "(I18N_EMPTY_MESSAGE)" otherwise. This is a recent regression
caused by 199fabbaa8.

Thanks to Christoph Feck for investigating this issue!

CCBUG: 305228
(cherry picked from commit 168d0511c7)
2012-08-24 19:00:03 +02:00
Frank Reininghaus 2727715cdd Fix regression that caused "(I18N_EMPTY_MESSAGE)" sub menus in menus
For top-level roles like "Name" and "Size", the group translation is 0.
In that case, the "group" member of the corresponding RoleInfo struct
must be an empty string. This is expected by the code which generates
Dolphin's menus, which group the top-level roles into a sub menu with
the name "(I18N_EMPTY_MESSAGE)" otherwise. This is a recent regression
caused by 199fabbaa8.

Thanks to Christoph Feck for investigating this issue!

CCBUG: 305228
2012-08-24 18:57:47 +02:00
Christophe Giboudeaux 707dfbec0e Fix includes 2012-08-24 13:38:43 +02:00
Emmanuel Pescosta e7793132e8 Select the correct item in places-panel, when a directory is opened.
BUG: 304541
REVIEW: 106074
FIXED-IN: 4.9.1
(cherry picked from commit 1ec8de2c61)
2012-08-23 22:04:44 +02:00
Emmanuel Pescosta 9a8ffbe1d0 Select the correct item in places-panel, when a directory is opened.
BUG: 304541
REVIEW: 106074
2012-08-23 21:42:08 +02:00
Emmanuel Pescosta 9e203ab2b9 Changed the behaviour when middle clicking folders in places- and folders-dockwidget. Now it opens the folders in a new background tab (General behaviour of Dolphin)
BUG: 196263
REVIEW: 106069
2012-08-23 21:14:56 +02:00
Jekyll Wu a1a78f7bfb Remove one unneeded #include 2012-08-17 19:15:11 +08:00
Albert Astals Cid fac19c757e Fix translations not showing in the Sort by and Additional Information submenus
Acked by Frank
REVIEW: 106049
BUGS: 305228
FIXED-IN: 4.9.1
(cherry picked from commit 199fabbaa8)
2012-08-16 22:29:56 +02:00
Albert Astals Cid 90e1e4e9f0 Fix translations not showing in the Sort by and Additional Information submenus
Acked by Frank
REVIEW: 106049
BUGS: 305228
FIXED-IN: 4.9.1
2012-08-16 22:27:12 +02:00
Emmanuel Pescosta 15b687a270 Fix wrong text color in Places Group Header. Use QPalette::Window for base color and QPalette::WindowText for text color. Also changed m_roleColor color mixing to 60% (from 70%) -> Better visible color difference when base color is darker than text color. Also changed styleOption().palette.brush(group, role).color() to styleOption().palette.color(group, role) in KStandardItemListWidget -> should be more efficient.
BUG: 303133
FIXED-IN: 4.9.1
(cherry picked from commit b3c3da9851)
2012-08-15 15:04:55 +02:00