Commit graph

505 commits

Author SHA1 Message Date
Montel Laurent bfa4274f58 Pedantic-- 2015-09-01 22:02:47 +02:00
l10n daemon script d1871eb1b8 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-07-26 19:57:51 +00:00
l10n daemon script da7a6a16f8 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-24 10:34:19 +00:00
l10n daemon script a8a4981b2c SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-16 13:31:20 +00:00
l10n daemon script 1c1efb983c SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-06-04 11:19:31 +00:00
l10n daemon script 8b12612bbf SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-13 11:01:45 +00:00
l10n daemon script c1a2c0f1a7 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-05 14:00:14 +00:00
l10n daemon script f1c5cd302a SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-04 10:09:13 +00:00
l10n daemon script 06776451a7 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-26 09:44:42 +00:00
l10n daemon script 0daae53367 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-24 09:52:38 +00:00
l10n daemon script 4e96b1a42f SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-04-04 11:02:00 +00:00
Yuri Chornoivan e63b1de286 Fix some EBN issues 2015-03-19 20:13:40 +02:00
l10n daemon script a7484d2ce5 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-03-15 09:54:53 +00:00
l10n daemon script 5d115201af SVN_SILENT made messages (.desktop file) 2015-03-12 10:17:33 +00:00
l10n daemon script 157df4b4a6 SVN_SILENT made messages (.desktop file) 2015-03-11 09:43:09 +00:00
l10n daemon script 5431aff4df SVN_SILENT made messages (.desktop file) 2015-03-10 13:14:42 +00:00
l10n daemon script 6b760e926d SVN_SILENT made messages (.desktop file) 2015-03-09 09:36:36 +00:00
l10n daemon script 42e52a1eea SVN_SILENT made messages (.desktop file) 2015-03-08 09:41:37 +00:00
l10n daemon script 06bd36e225 SVN_SILENT made messages (.desktop file) 2015-03-07 10:01:52 +00:00
l10n daemon script 51181dad2b SVN_SILENT made messages (.desktop file) 2015-03-06 04:32:04 +00:00
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 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
Emmanuel Pescosta 169cca55b9 Replace kDebug/kWarning by categorized logging (org.kde.dolphin) 2015-02-24 13:07:35 +01: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
Emmanuel Pescosta 39b77e9861 Always connect the drop job result with DolphinView::slotPasteJobResult
to receive the error message in case of an error also when the destUrl
is not equal to the current url in the view.

CCMAIL: faure@kde.org
2015-01-05 12:50:53 +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
David Faure 2a561317c6 Remove unused libkonq includes 2014-12-25 10:16:12 +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
Andrius da Costa Ribas e1789b559e Fix Exports.
REVIEW: 121078
2014-11-20 01:06:58 -02:00
Emmanuel Pescosta 424d20e435 KIntSpinBox to QSpinBox 2014-11-10 09:12:33 +01:00
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
David Faure 30175dcbde KonqOperations: KIO::pasteMimeData -> KIO::paste, update signal and simplify dolphin accordingly. 2014-11-02 17:17:24 +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
Lukáš Tinkl 5ed011357c don't save view_properties in ~/.local/share/dolphindolphin
looks like writableLocation() already includes the app name
2014-10-26 19:02:03 +01: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 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
Lukáš Tinkl d9d7926c49 port Konqueror from KUrl to QUrl
REVIEW: 120650
2014-10-21 00:28:58 +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 cd601a582d Port to QDialog 2014-10-15 19:56:52 +02:00
Emmanuel Pescosta 9c6c0089c9 Replaced the ItemState structure with QPair<KFileItem, KVersionControlPlugin2::ItemVersion> 2014-10-15 17:42:42 +02:00
Montel Laurent 6f6b1bbb69 Clean includes + port to QMenu 2014-10-10 23:36:36 +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