Commit graph

4926 commits

Author SHA1 Message Date
Emmanuel Pescosta 05de88f9fd added .reviewboardrc 2015-02-26 14:38:31 +01:00
Emmanuel Pescosta 7f4c3976c0 Merge branch 'master' into frameworks 2015-02-25 21:55:46 +01:00
Emmanuel Pescosta f923bda58b Merge branch 'Applications/14.12' 2015-02-25 21:53:21 +01:00
Emmanuel Pescosta 8a7d9b6d2c Bump the Qt version to 5.4 and the KF5 version to 5.7
Added all required components

Reviewed-By: David Edmundson
2015-02-25 21:46:49 +01:00
David Edmundson aca62bee91 Fix DolphinVcs cmake to be findable
Reviewed-By: Emmanuel Pescosta
2015-02-25 21:40:24 +01:00
Emmanuel Pescosta 67ccf75ef2 readded missing isVersioned check in VersionControlObserver::actions() 2015-02-25 17:32:30 +01:00
Emmanuel Pescosta 25751088c3 Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the deprecated KVersionControlPlugin interface from konqlib
REVIEW: 122687
2015-02-25 17:21:10 +01:00
Hrvoje Senjan f6b4f56216 Fix build on Jenkins (or with BUILD_TESTING=ON) 2015-02-24 17:07:55 +01:00
Emmanuel Pescosta b2ad2c076c Fix the build of kde-baseapps temporarily (categorized logging in DolphinPart) 2015-02-24 15:52:45 +01:00
Luca Beltrame f8d8256cbb Fix the build temporarily
The port of Dolphin to categorized logging created errors in one
specific point only, in main.cpp:

 undefined reference to `DolphinDebug()'

 I couldn't spot any obvious error, so for now I did it the bad way
 (warnings should not be commented out!) to keep it building while a
 real solution is found.

 CCMAIL: emmanuelpescosta099@gmail.com
2015-02-24 14:14:36 +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 092ddf7702 Port away from KLocale 2015-02-24 12:22:16 +01:00
l10n daemon script 688ce32e45 SVN_SILENT made messages (after extraction) 2015-02-21 06:26:31 +00:00
l10n daemon script 03cd86e478 SVN_SILENT made messages (after extraction) 2015-02-21 01:59:29 +00:00
Emmanuel Pescosta 13a4c5ed4c Fix a QDateTime porting bug (different format expressions) in KFileItemModel::dateRoleGroups
REVIEW: 122625
2015-02-20 14:16:27 +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 1ef5434572 Merge branch 'Applications/14.12' 2015-02-19 20:15:49 +01:00
Emmanuel Pescosta a8f4f01eaa Increase the version number to 14.12.3 2015-02-19 20:09:47 +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
Andreas Sturmlechner 23e8995771 Make tests optional
REVIEW: 122212
2015-02-18 01:28:25 +01:00
Elias Probst 4a86644b95 Update desktop filename for filelight. 2015-02-11 11:48:23 +01:00
Arjun AK 2305e34cc3 Assume links passed via cmdline args are local files
If not, when the user types 'dolphin nonexistantfile' he will be
taken to 'http://nonexistantfile'

BUG: 343906
2015-02-10 11:21:53 +05:30
Arjun AK b86d0def39 Construct URLs passed via cmdline args using QUrl::fromUserInput()
Otherwise user will have to type "dolphin file:///tmp" instead of
"dolphin /tmp"

REVIEW: 122475
BUG: 343906
2015-02-09 18:15:37 +05:30
l10n daemon script 9f3ac5f941 SVN_SILENT made messages (after extraction) 2015-02-09 01:56:39 +00:00
Montel Laurent f67bdd0fb7 kdelibs4support-- 2015-02-06 13:21:27 +01:00
Montel Laurent 3dbee30c1a Clean up includes 2015-02-06 09:37:24 +01:00
Montel Laurent 159234944c Fix includes 2015-02-06 09:35:26 +01:00
Montel Laurent 85cc0e78c7 Migrate settings 2015-02-06 09:32:39 +01:00
Montel Laurent c61cfc9860 Fix includes 2015-02-06 09:22:34 +01:00
l10n daemon script 4cc444b8ba SVN_SILENT made messages (.desktop file) 2015-02-05 06:55:16 +00:00
l10n daemon script 021e23d734 SVN_SILENT made messages (.desktop file) 2015-02-05 03:50:56 +00:00
Hrvoje Senjan db0cc8d548 Try to fix the build 2015-02-04 12:56:29 +01:00
Bhushan Shah 3a390a0580 add debug message to check CI failure 2015-02-04 16:57:20 +05:30
Emmanuel Pescosta 1b3ea64abb Add dolphin dbus service 2015-02-04 10:29:33 +01:00
Mathieu Tarral c725848709 Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData 2015-02-04 10:22:03 +01:00
Emmanuel Pescosta b15ee4cf70 Port away from KGlobal::mainComponent() 2015-02-04 09:39:40 +01:00
Emmanuel Pescosta 900b523d2b Solved TODO: KWindowConfig::saveWindowSize/restoreWindowSize in DolphinSettingsDialog 2015-02-04 09:10:23 +01:00
Emmanuel Pescosta 50c0aa3b07 Port KonqCopyToMenu to KFileCopyToMenu 2015-02-04 08:56:17 +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 122e1c6288 Port away from KGlobalSettings::completionMode()
REVIEW: 122347
2015-02-03 09:13:11 +01:00
Emmanuel Pescosta 5100c20c0d Port away from KGlobalSettings::singleClick() and use the mouse kcm module instead of implementing the single/double click settings on our one.
REVIEW: 122311
2015-02-01 16:16:13 +01:00
Emmanuel Pescosta fdb5c0d33e Port away from KGlobalSettings::naturalSorting() by moving it to Dolphin's GeneralSettings
REVIEW: 122310
2015-01-31 21:05:28 +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 08252ffc69 Port away from KGlobalSettings::graphicEffectsLevel()
REVIEW: 122309
2015-01-30 09:02:08 +01:00
Emmanuel Pescosta f8187b982a Revert commit 0c6c76b038e868e225f7816fae39635d472bce0a and make the
QWeakPointer a QPointer (+comment) to make it clear, that we must track the lifetime of the context menu instead of doing "only" out of scope deleting.

Thanks to Frank for pointing out this problem!

CCMAIL: frank78ac@googlemail.com
2015-01-29 13:45:14 +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