Commit graph

4954 commits

Author SHA1 Message Date
Frank Reininghaus
fa988586bc Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/panels/terminal/terminalpanel.cpp
	dolphin/src/panels/terminal/terminalpanel.h
2014-10-24 18:49:05 +02:00
Frank Reininghaus
1f02d15f7e Merge remote-tracking branch 'origin/KDE/4.14' 2014-10-24 18:45:28 +02:00
Frank Reininghaus
d9700c4d43 Make the view/Terminal Panel synchronization less error-prone
The previous solution could cause problems if the user navigates to a
different URL in one view, and then activates another split view very
quickly: the new active view might be switched to the same URL as the
first view, which is unwanted.

To fix this problem, we record a history of "cd" commands that Dolphin
sends to the Terminal Panel in a queue. If a currentDirectoryChanged
signal is received, and the new terminal directory is "dir", this patch
does the following:

1.  If the queue is empty, change the view URL to "dir".
2.  Otherwise, take the queue's head, and check if it is equal to
    "dir". If that is the case, ignore the signal and return.
3.  Go back to step 1.

This ensures that every currentDirectoryChange signal that is caused by
a "cd" that was sent from Dolphin to the terminal is ignored.

BUG: 339009
BUG: 314038
REVIEW: 120768
2014-10-24 18:14:08 +02:00
Andrey Bondrov
3f28c70423 Fix the information panel video player in Dolphin.
Patch from ROSA Linux.

BUG: 337107
BUG: 337033
BUG: 334924
CCBUG: 339882
REVIEW: 120745
FIXED-IN: 4.14.3
2014-10-24 08:26:40 +02:00
Frank Reininghaus
592e1730e2 Merge branch 'KDE/4.14' 2014-10-23 23:23:19 +02:00
Frank Reininghaus
9d6f50ac50 Connect to the currentDirectoryChanged signal after the shell setup
This fixes the problem that the view URL may be reset to the Home URL
when opening the Terminal Panel while browsing a remote URL. Moreover,
it fixes crashes that can occur when the signal is received during the
shell setup if the DolphinMainWindow does not have a valid
m_activeViewContainer yet.

BUG: 339502
BUG: 340233
REVIEW: 120726
FIXED-IN: 4.14.3
2014-10-23 23:17:43 +02:00
Emmanuel Pescosta
c07a97c4be Use the path instead of the display string in PlacesItemModel::closestItem,
fixes the determination of the closest item for me.
2014-10-21 22:54:15 +02:00
Emmanuel Pescosta
c9641c96f9 Fix Dolphin build (protocol -> scheme) 2014-10-21 22:31:50 +02:00
Lukáš Tinkl
a8b39ff601 address 2 more KUrl -> QUrl issues mentioned in rr#120688 2014-10-21 22:02:26 +02:00
David Faure
9bf03a3c48 Dolphin: port to KIO::pasteInfoText().
DolphinContextMenu::createPasteAction used to be precise about destination
("Paste To Folder"), while now it's precise about the source (what to paste).
It was decided that this was more useful and consistent anyway.

REVIEW: 120695
2014-10-21 21:59:05 +02:00
Lukáš Tinkl
0ce1c983b5 port away from KMimeType 2014-10-21 21:37:30 +02:00
Lukáš Tinkl
12413eb910 libkonq now loads its own catalog 2014-10-21 21:37:09 +02:00
Lukáš Tinkl
1b4572dac9 port Dolphin from KUrl to QUrl
REVIEW: 120688
2014-10-21 21:19:14 +02:00
David Faure
3653c8ad6b Merge doPaste and doPasteV2. Remove unused QPoint. Remove unused editMimeType. 2014-10-21 00:39:40 +02:00
David Faure
403f8e7133 Port from KonqOperations::editMimeType to KMimeTypeEditor::editMimeType (from kwidgetsaddons) 2014-10-21 00:38:39 +02:00
Lukáš Tinkl
d9d7926c49 port Konqueror from KUrl to QUrl
REVIEW: 120650
2014-10-21 00:28:58 +02:00
Emmanuel Pescosta
3c74d908de The filenamesearch ioslave has been moved to kio-extras, remove it from Dolphin.
See commit 05689c462745edbaeebcfc63d456877746805451 in kio-extras
2014-10-20 11:10:13 +02:00
Montel Laurent
bfdc5a44d2 Increase version 2014-10-19 15:07:34 +02:00
Montel Laurent
0a6257bce3 Fix includes 2014-10-18 15:00:17 +02:00
Montel Laurent
aabd6ad3bc port to QPushButton 2014-10-18 14:43:41 +02:00
Montel Laurent
31a0c4fbd5 Fix includes 2014-10-18 14:42:41 +02:00
Montel Laurent
3d6c254846 Remove kdelibs4support 2014-10-18 14:40:47 +02:00
Montel Laurent
cac9083e2c fix forward declaration 2014-10-18 14:38:28 +02:00
Montel Laurent
938a83b8b1 Port test to qt5 2014-10-18 14:36:34 +02:00
Frank Reininghaus
01e4f60a09 Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	plasma/applets/folderview/folderview.cpp
2014-10-16 20:36:49 +02:00
Frank Reininghaus
a75e81ca01 Merge remote-tracking branch 'origin/KDE/4.14' 2014-10-16 20:33:19 +02:00
Frank Reininghaus
d98c61abf5 Update "About" dialog after maintainership change
See http://lists.kde.org/?t=140990649300001&r=1&w=2

REVIEW: 120608
2014-10-16 20:19:59 +02:00
Montel Laurent
cd601a582d Port to QDialog 2014-10-15 19:56:52 +02:00
Montel Laurent
dfd3232496 Port to QDialog 2014-10-15 19:51:06 +02:00
Emmanuel Pescosta
9c6c0089c9 Replaced the ItemState structure with QPair<KFileItem, KVersionControlPlugin2::ItemVersion> 2014-10-15 17:42:42 +02:00
Vishesh Handa
93465171bc Port Dolphin to the new Baloo APIs
REVIEW: 120582
2014-10-14 18:08:18 +02:00
Emmanuel Pescosta
a58f159854 Made the free space indicator and zoom slider a little bit larger. (was reduced by an older commit)
BUG: 339768
FIXED-IN: 4.14.3
2014-10-13 11:53:06 +02:00
l10n daemon script
ca6507b47c SVN_SILENT made messages (.desktop file) 2014-10-12 07:05:59 +00:00
l10n daemon script
df7b18aaae SVN_SILENT made messages (after extraction) 2014-10-12 05:17:04 +00:00
l10n daemon script
86ffee5313 SVN_SILENT made messages (.desktop file) 2014-10-12 04:06:23 +00:00
l10n daemon script
bf288b88cc SVN_SILENT made messages (after extraction) 2014-10-12 01:38:49 +00:00
Montel Laurent
7d41ad943a clean forward declaration 2014-10-11 14:18:23 +02:00
Montel Laurent
6f6b1bbb69 Clean includes + port to QMenu 2014-10-10 23:36:36 +02:00
l10n daemon script
a696093fa2 SVN_SILENT made messages (after extraction) 2014-10-09 05:14:24 +00:00
l10n daemon script
6993025dc3 SVN_SILENT made messages (after extraction) 2014-10-09 01:31:06 +00:00
Hrvoje Senjan
64bc639395 Revert "Fix desktop file"
This reverts commit ecd2ca2222f88c9aea1c23a57658a8a4e9ff54f9.

Dolphin still uses KApp/KCmdLineArgs, so qwindowtitle is not recognized
2014-10-08 12:51:30 +02:00
Marko Käning
f0760df29c Fix includes erroneously having slipped into baloo-only sections
CCMAIL: bhush94@gmail.com
2014-10-08 09:54:58 +02:00
Montel Laurent
6ff385e71a Fix desktop file 2014-10-08 08:12:46 +02:00
Montel Laurent
5c1420fec9 kdelibs4support-- 2014-10-07 07:38:16 +02:00
Montel Laurent
a705337fab Convert to reverse dns 2014-10-07 07:32:35 +02:00
Emmanuel Pescosta
6a09781a3b Ported Dolphin away from KStandardDirs
removed unused mirroredDirectory method

REVIEW: 120194
2014-10-01 12:34:49 +02:00
Volker Krause
1d590aa7d5 Make constants const, avoids unnecessary symbols in the .data section. 2014-09-26 20:38:57 +02:00
David Faure
d47557dcd1 Port away from KonqOperations::renameV2.
Tested. The if before the connect looks suspicious to me, though.
2014-09-22 22:37:44 +02:00
David Faure
4425c659a0 Port away from KonqOperations::rename
It's a bit more code, but this way if you want e.g. custom error handling
you know what to change :)
2014-09-22 22:37:44 +02:00
David Faure
76ce61a05f Port away from KonqOperations::rename 2014-09-22 22:37:44 +02:00