Commit graph

469 commits

Author SHA1 Message Date
Emmanuel Pescosta 832e157ecd Port away from KDELibs4Support (we only use KDELibs4Support when baloo isn't present, because KFileMetaDataWidget is in KDELibs4Support)
Reviewed-By: Vishesh Handa
2015-02-26 18:10:42 +01:00
Emmanuel Pescosta 7f4c3976c0 Merge branch 'master' into frameworks 2015-02-25 21:55:46 +01:00
Emmanuel Pescosta 169cca55b9 Replace kDebug/kWarning by categorized logging (org.kde.dolphin) 2015-02-24 13:07:35 +01:00
Emmanuel Pescosta 6d9f5b2131 Removed unused KGlobal includes and use KIO/Job instead of KIO/JobClasses 2015-02-24 12:51:24 +01:00
Emmanuel Pescosta b3a0c25314 include KFileItem instead of KFileItemList 2015-02-24 12:25:28 +01:00
Emmanuel Pescosta 5bfc7cd36c Missed a saveBookmarks call in the PlacesItemModel's deconstructor (see commit 2a79feaea0088730bbf4fd4b65baa1c4a91b84b9) 2015-02-20 10:47:23 +01:00
Emmanuel Pescosta 8679115552 Merge branch 'master' into frameworks 2015-02-19 20:34:35 +01:00
Emmanuel Pescosta f7c85b4225 Sync bookmark manager only if the change was done by the current process
Adoption of http://commits.kde.org/kdelibs/2b5c6e42fc8114c6854ce490b9cdd4356be683d9

FIXED-IN: 14.12.3
BUG: 343620
BUG: 310080
REVIEW: 122640
2015-02-19 20:05:55 +01:00
Emmanuel Pescosta 9221362cea QUrl porting bug: Added a missing QUrl::fromLocalFile in FoldersPanel::loadTree to make the FoldersPanel work again
REVIEW: 122631
BUG: 344204
FIXED-IN: 15.04
2015-02-19 12:08:07 +01:00
Montel Laurent f67bdd0fb7 kdelibs4support-- 2015-02-06 13:21:27 +01:00
Emmanuel Pescosta b15ee4cf70 Port away from KGlobal::mainComponent() 2015-02-04 09:39:40 +01:00
Emmanuel Pescosta 3515582495 Ported Dolphin from KDialog to QDialog and save/restoreDialogSize to KWindowConfig::save/restoreWindowSize with the help of the porting scripts.
REVIEW: 122305
2015-02-03 09:25:33 +01:00
Emmanuel Pescosta 6d0f2554cb Port KGlobalSettings::smallestReadableFont() to QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont)
REVIEW: 122308
2015-01-30 09:04:11 +01:00
Emmanuel Pescosta a06ee3399b Merge branch 'Applications/14.12' into frameworks
Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	konqueror/settings/ebrowsing/ebrowsing.desktop
	konqueror/settings/kio/cache.desktop
	konqueror/settings/kio/cookies.desktop
	konqueror/settings/kio/netpref.desktop
	konqueror/settings/kio/proxy.desktop
	konqueror/settings/kio/smb.desktop
	konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
	konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
	konqueror/settings/kio/useragent.desktop
	lib/konq/konq_operations.cpp
2015-01-28 17:13:59 +01:00
David Faure 7bd5bec219 Dolphin: port from KonqOperations::doDrop to the new KIO::DropJob
REVIEW: 121678
2015-01-05 09:07:10 +01:00
Emmanuel Pescosta b5fc036999 use save() instead of writeConfig() 2014-12-14 19:11:39 +01:00
Emmanuel Pescosta a07d63d419 port away from deprecated KFileItem(mode_t mode, mode_t permissions, const QUrl &url, bool delayedMimeTypes = false); 2014-12-14 17:46:58 +01:00
Arjun AK 895a7c941b Fix Terminal-View navigation sync issue
The URL needs to be constructed from 'QUrl::fromLocalFile()' instead of
a QString so that the scheme is set properly.

REVIEW: 121409
BUG: 341678
2014-12-10 23:13:23 +05:30
Emmanuel Pescosta 02c0835148 KLineEdit to QLineEdit 2014-11-10 09:08:04 +01:00
Emmanuel Pescosta d0f0f1f2e2 make use of initializer lists 2014-11-10 08:45:38 +01:00
Lukáš Tinkl 037d5db85b Q_DECL_OVERRIDE 2014-11-03 23:52:18 +01:00
Lukáš Tinkl b96def1856 use QUrl::fromLocalFile() on devices
fixes being unable to access eg. removable drives
2014-11-03 18:25:19 +01:00
Lukáš Tinkl 7a3310ce73 fix initializer list 2014-11-03 16:16:52 +01:00
David Faure 8b306b67bf Port from KonqOperations::doPaste to new job KIO::paste
Remove KonqOperations::doPaste.
2014-11-02 15:20:41 +01:00
Emmanuel Pescosta 76a7ab4bff Merge branch 'KDE/4.14' 2014-10-29 12:20:10 +01:00
Emmanuel Pescosta b3e113c05a Hide the video player when the video has finished.
BUG: 339882
FIXED-IN: 4.14.3
REVIEW: 120776
2014-10-29 12:18:02 +01:00
Montel Laurent 422dc4e921 Port to QDialog 2014-10-28 21:49:53 +01:00
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
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 1b4572dac9 port Dolphin from KUrl to QUrl
REVIEW: 120688
2014-10-21 21:19:14 +02:00
Montel Laurent 0a6257bce3 Fix includes 2014-10-18 15:00:17 +02:00
Montel Laurent 31a0c4fbd5 Fix includes 2014-10-18 14:42:41 +02:00
Montel Laurent dfd3232496 Port to QDialog 2014-10-15 19:51:06 +02: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
Montel Laurent 5c1420fec9 kdelibs4support-- 2014-10-07 07:38:16 +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 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
Luca Beltrame 2744fb4a0b Merge branch 'master' into frameworks 2014-09-21 14:36:15 +02:00
Luca Beltrame 4479a546bd Merge branch 'KDE/4.14' 2014-09-21 14:36:02 +02:00
Arjun AK 398162a1be Do not allow files or folders inside trash to be added to dolphin's places panel
REVIEW: 120286
BUG: 339204
FIXED-IN: 4.14.2
2014-09-21 17:16:19 +05:30