Commit graph

388 commits

Author SHA1 Message Date
l10n daemon script 26c40ab7bd GIT_SILENT made messages (after extraction) 2018-05-06 03:31:04 +02:00
l10n daemon script 29b1dec92b 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"
2018-01-29 05:04:25 +01:00
l10n daemon script 066805c550 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"
2017-12-01 04:51:24 +01:00
l10n daemon script 22885c00b0 GIT_SILENT made messages (after extraction) 2017-12-01 03:10:28 +01:00
l10n daemon script 02a4cfb26a 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"
2017-11-28 06:52:56 +01:00
l10n daemon script 0ef249b5a5 GIT_SILENT made messages (after extraction) 2017-11-28 05:48:07 +01:00
Albert Astals Cid 3957683d76 Merge branch 'dont-use-docdata-for-annots-and-forms' into Applications/17.12 2017-11-16 15:00:23 +01:00
Albert Astals Cid 19b7e3c112 The work in this branch was sponsored by LiMux
give them some credit in the headers
2017-11-16 09:58:31 +01:00
Alexander Trufanov e91bf07bcf Try to display a malformed image if feasible
Differential Revision: https://phabricator.kde.org/D8415
2017-11-14 22:27:00 +01:00
Albert Astals Cid ca5422d0e9 Implement swapBackingFile for the PDF backend
How does it work:
 * What it does is really closing and opening the file again through poppler
 * This means that things that are generated in "open" time like Page, Rects, Annotations, Forms need to be updated
	* For Page what we do is swap the PagePrivate so that other classes that hold Page* don't break
		* Since some parts of the PagePrivate can be reused, we move them in PagePrivate::adoptGeneratedContents
	* For all the commands in the undo stack we need to update the annotations/forms it refers to, added a new function to do that
	* The annotationmodel needs updating it's pointers
	* The widgets for the forms are reused and their form* updated
	* the widgets for the videos are recreased since videos don't really hold much content (you lose the playing status on save but i think that's acceptable)

TODO: Make this work for .okular files
TODO: For files with password we will need to reload the file, asking for the password again and thus losing the undo stack, warn the user
TODO: autotests
2017-10-26 15:30:44 +02:00
Albert Astals Cid 54bcb44559 Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms 2017-10-23 16:03:18 +02:00
l10n daemon script 1883a06614 GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
l10n daemon script 72abe6f85a GIT_SILENT made messages (after extraction) 2017-10-11 06:41:11 +02:00
Albert Astals Cid 04ed10d3ea Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms 2017-09-11 19:51:51 +02:00
Kevin Funk a53a2402ca clang-tidy: modernize-use-nullptr run
Semi-ACK'd by Albert :)
2017-09-06 00:19:48 +02:00
Albert Astals Cid 69982161e7 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 23:08:20 +02:00
Albert Astals Cid 9a25ea41dc Fix warning about TRANSLATION_DOMAIN being defined twice 2017-08-30 23:07:03 +02:00
Luigi Toscano d9584b30d8 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-30 01:29:21 +02:00
Luigi Toscano e858ecdd7c Fix translations: add translation domain for generators
Generators are libraries, so define the proper TRANSLATION_DOMAIN
for each for them.

Thanks Albert for spotting this.
2017-08-30 01:27:35 +02:00
l10n daemon script 3349c9fff7 GIT_SILENT made messages (after extraction) 2017-08-27 05:21:29 +02:00
l10n daemon script 3422520a5c GIT_SILENT made messages (after extraction) 2017-08-27 03:08:01 +02:00
l10n daemon script 0b85b7c138 GIT_SILENT made messages (after extraction) 2017-08-26 05:23:57 +02:00
l10n daemon script e279e26b40 GIT_SILENT made messages (after extraction) 2017-08-26 03:18:37 +02:00
Albert Astals Cid 37de97a030 Merge remote-tracking branch 'origin/Applications/17.08' 2017-08-21 00:11:28 +02:00
Andreas Sturmlechner 862fd4f3e1
Don't build kimgiotest unless BUILD_TESTING=ON
Summary:
In >=KF-5.38 target kimgiotest is only built if BUILD_TESTING=ON,
so subsequent target_compile_definitions will fail if OFF.

Reviewers: #okular

Subscribers: kfunk

Tags: #okular

Differential Revision: https://phabricator.kde.org/D7212
2017-08-09 00:47:12 +02:00
l10n daemon script 36c60741fb 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"
2017-07-30 04:54:11 +02:00
l10n daemon script 19406fdf57 GIT_SILENT made messages (after extraction) 2017-07-30 03:25:35 +02:00
l10n daemon script 767a1c0eac 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"
2017-05-21 04:36:10 +02:00
l10n daemon script ef9ea64bc3 GIT_SILENT made messages (after extraction) 2017-05-12 02:59:10 +02:00
l10n daemon script 94fbca1c95 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"
2017-04-22 04:06:38 +02:00
l10n daemon script a25642c178 GIT_SILENT made messages (after extraction) 2017-04-22 02:52:16 +02:00
l10n daemon script 91e740c236 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"
2017-04-17 04:01:59 +02:00
l10n daemon script cce5cf2592 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"
2017-04-09 04:02:44 +02:00
Albert Astals Cid 4072eb0c3a Add override 2017-03-02 20:38:50 +01:00
l10n daemon script c55c44ed95 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"
2017-02-07 12:50:18 +01:00
l10n daemon script 2a0bdca687 GIT_SILENT made messages (after extraction) 2017-02-07 08:56:11 +01:00
l10n daemon script 7381616690 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"
2017-02-06 06:04:23 +01:00
l10n daemon script 53a6cde141 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"
2017-02-04 06:23:35 +01:00
l10n daemon script 0922f2f524 GIT_SILENT made messages (after extraction) 2017-02-04 03:59:15 +01:00
l10n daemon script 0cbf1d24e7 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"
2017-02-02 05:57:03 +01:00
Albert Astals Cid ed4a9f42f4 Merge remote-tracking branch 'origin/Applications/16.12' 2017-01-16 00:37:25 +01:00
Albert Astals Cid f467807506 Remove #ifdefs for Qt we require in cmake anyway 2017-01-16 00:36:08 +01:00
Martin T. H. Sandsmark 033f21c826 Port some missing debug output to categorized logging 2017-01-14 19:15:26 +01:00
l10n daemon script a8a6268183 GIT_SILENT made messages (after extraction) 2017-01-10 08:01:20 +01:00
l10n daemon script e44b17080a 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"
2017-01-09 06:00:41 +01:00
l10n daemon script 93b824de9e GIT_SILENT made messages (after extraction) 2017-01-09 03:54:16 +01:00
l10n daemon script 4290dffb1b GIT_SILENT made messages (after extraction) 2016-12-26 06:45:49 +01:00
l10n daemon script 30993aa3f1 GIT_SILENT made messages (after extraction) 2016-12-26 03:41:57 +01:00
l10n daemon script fb77e0d1fd 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"
2016-12-20 13:06:28 +01:00
l10n daemon script 006cb782a2 GIT_SILENT made messages (after extraction) 2016-12-20 09:19:46 +01:00