office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-01 21:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
8078 commits 137 branches 359 tags 75 MiB
Commit graph

388 commits

Author SHA1 Message Date
l10n daemon script 20f6524016 GIT_SILENT made messages (after extraction) 2016-12-13 02:45:16 +01:00
l10n daemon script b6614c4da4 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-12 05:17:25 +01:00
l10n daemon script 6bc9feaba4 GIT_SILENT made messages (after extraction) 2016-12-12 04:38:06 +01:00
l10n daemon script 4952893372 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-12 03:58:04 +01:00
l10n daemon script e798a92c06 GIT_SILENT made messages (after extraction) 2016-12-12 02:39:28 +01:00
l10n daemon script 4ed39dfc16 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-09 05:11:11 +01:00
l10n daemon script 8c2120e2d3 GIT_SILENT made messages (after extraction) 2016-12-09 04:31:33 +01:00
l10n daemon script 0d6f6edf60 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-09 03:56:48 +01:00
l10n daemon script 31da71cdec GIT_SILENT made messages (after extraction) 2016-12-09 02:36:45 +01:00
l10n daemon script 5282d434ee 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-02 05:48:46 +01:00
l10n daemon script 56759cd0b3 SVN_SILENT made messages (after extraction) 2016-12-02 05:11:22 +01:00
l10n daemon script dcb3edcf30 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-02 04:33:12 +01:00
l10n daemon script 4c8280e461 SVN_SILENT made messages (after extraction) 2016-12-02 03:21:51 +01:00
l10n daemon script fa74d6eea7 SVN_SILENT made messages (after extraction) 2016-12-01 02:51:26 +01:00
l10n daemon script 297795d40d 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-11-30 04:27:22 +01:00
l10n daemon script e65f2c6f62 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-11-29 05:41:48 +01:00
l10n daemon script fecf0a8de6 SVN_SILENT made messages (after extraction) 2016-11-29 05:04:44 +01:00
l10n daemon script fe628b9dbf 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-11-29 04:25:46 +01:00
l10n daemon script 96fd8111c1 SVN_SILENT made messages (after extraction) 2016-11-29 03:09:19 +01:00
l10n daemon script 5527fe1d44 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-11-28 05:28:46 +01:00
l10n daemon script 43cde01ced SVN_SILENT made messages (after extraction) 2016-11-28 04:44:19 +01:00
l10n daemon script 3fe1bef3d6 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-11-28 04:07:25 +01:00
l10n daemon script f505e51b32 SVN_SILENT made messages (after extraction) 2016-11-28 02:53:18 +01:00
l10n daemon script da42e4b166 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-11-25 05:01:26 +01:00
l10n daemon script 5ddc51b6c3 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-11-23 05:41:42 +01:00
l10n daemon script 6aaf19e884 SVN_SILENT made messages (after extraction) 2016-11-23 04:59:06 +01:00
l10n daemon script 5a7f11927f 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-11-23 04:21:05 +01:00
l10n daemon script d075df4eb0 SVN_SILENT made messages (after extraction) 2016-11-23 02:56:17 +01:00
l10n daemon script 7cb74091e3 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-11-22 06:10:26 +01:00
l10n daemon script a1fbd54673 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-11-21 05:41:15 +01:00
l10n daemon script 41ca35870f SVN_SILENT made messages (after extraction) 2016-11-21 05:02:16 +01:00
l10n daemon script 151a8f7e78 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-11-21 04:18:14 +01:00
l10n daemon script 2e65d70f63 SVN_SILENT made messages (after extraction) 2016-11-21 03:03:57 +01:00
l10n daemon script d89ad9053a SVN_SILENT made messages (after extraction) 2016-11-19 03:34:19 +00:00
l10n daemon script ae6961a63c SVN_SILENT made messages (after extraction) 2016-11-17 17:55:17 +00:00
l10n daemon script b0024f05c7 SVN_SILENT made messages (after extraction) 2016-11-15 07:55:46 +00:00
l10n daemon script 3898a99a8f SVN_SILENT made messages (after extraction) 2016-11-13 13:59:19 +00:00
l10n daemon script 36befe7161 SVN_SILENT made messages (after extraction) 2016-11-12 13:58:17 +00:00
l10n daemon script 3107e544b4 SVN_SILENT made messages (after extraction) 2016-11-11 07:16:25 +00:00
Burkhard Lück 4b7455396e add metadata for kimgio, mobipocket, ooo, plucker, poppler, spectre, txt, xps 
REVIEW:129347
BUG:363842
 2016-11-09 11:30:19 +01:00
l10n daemon script 66cba6e293 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-11-09 09:19:08 +00:00
l10n daemon script 3f484b44a9 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-11-08 10:00:59 +00:00
l10n daemon script a673dca880 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-11-07 09:47:04 +00:00
l10n daemon script b1bb8bfc61 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-11-06 09:39:30 +00:00
l10n daemon script 3a16c16a17 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-11-05 10:00:05 +00:00
l10n daemon script 191e10300d 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-11-04 09:43:54 +00:00
Albert Astals Cid 62eea3336b Merge remote-tracking branch 'origin/master' into frameworks 2016-10-29 11:13:24 +02:00
Olivier CHURLAUD 3b608a66c9 Preview functions again. 
I added again the okularXXX.desktop

Correct the mess done by review 126193
 2016-07-21 23:05:54 +02:00
Martin T. H. Sandsmark d5bdca64d2 Fix low hanging unused parameters warnings 2016-07-11 22:57:11 +02:00
Martin T. H. Sandsmark 2b473fedbd generators: Fix build without implicit cast to/from ascii 
See previous commit for details.
 2016-07-11 21:59:14 +02:00
l10n daemon script bae370462c 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-06-25 03:22:57 +00:00
Albert Vaca 67f69c8871 Merge branch 'master' into frameworks 
# Conflicts:
#	CMakeLists.txt
#	active/app/package/metadata.desktop
#	conf/widgetannottools.cpp
#	core/version.h
#	generators/poppler/libokularGenerator_poppler.desktop
#	generators/txt/libokularGenerator_txt.desktop
#	generators/xps/libokularGenerator_xps.desktop
#	ui/annotationwidgets.cpp
#	ui/presentationwidget.cpp
 2016-02-22 03:50:54 -08:00
Aleix Pol b6d3854e66 Fix installation of kimgio plugin 
Now kimgiotest passes
 2016-01-30 18:21:48 +01:00
Patrick Spendrin 37d5623102 Remove kdelibs4support from the generator plugins 
This removes kdelibs4support for all generators except the mobipocket one.
The test executable for kimgio needs some windows fixes too, so I'll try
to make a separate review for that.

REVIEW: 126375
 2016-01-30 16:51:46 +01:00
l10n daemon script 119bb0ecd2 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-01-18 04:45:59 +00:00
l10n daemon script 57c5cbfde0 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-01-09 03:25:47 +00:00
l10n daemon script a2fd918ad9 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-01-05 04:07:32 +00:00
Alex Richardson 00b15528a4 Add the Copyright information back to the JSON files 
REVIEW: 126193
 2016-01-04 15:59:07 +01:00
Alex Richardson 2f9246ae42 Port to new JSON plugin loading system 
This means Okular can now work without ksycoca and KDELibs4Support.

REVIEW: 126193
 2016-01-04 15:59:07 +01:00
l10n daemon script 2fee136339 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-12-08 03:41:42 +00:00
l10n daemon script 16f0780688 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-11-22 03:43:12 +00:00
l10n daemon script 9a5c82a411 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-11-05 04:21:47 +00:00
Albert Astals Cid 8445660539 Merge remote-tracking branch 'origin/master' into frameworks 2015-10-18 22:29:00 +02:00
l10n daemon script 98ac941316 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-10-18 04:25:21 +00:00
l10n daemon script 8c141cc2fc 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-10-12 04:04:13 +00:00
l10n daemon script cd34059f53 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-10-08 04:21:25 +00:00
l10n daemon script 7b8f0a7459 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-09-26 04:04:15 +00:00
l10n daemon script 22ba4596fa 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-09-21 03:49:52 +00:00
l10n daemon script 558b4bb765 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-09-15 05:00:52 +00:00
l10n daemon script dde68921b6 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-09-13 04:04:10 +00:00
l10n daemon script f6d4b45650 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-09-10 05:23:01 +00:00
l10n daemon script 2669a2f354 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-09-08 05:32:59 +00:00
l10n daemon script 2b1cf29728 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-09-06 04:39:34 +00:00
l10n daemon script 6a2b5fc7b8 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-09-04 03:59:45 +00:00
l10n daemon script 79fa933c73 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-09-03 04:18:26 +00:00
l10n daemon script ef99f17efb 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-09-02 03:58:51 +00:00
l10n daemon script 8703484e63 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-09-01 05:00:47 +00:00
l10n daemon script 7be388fa0f 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-08-31 04:47:52 +00:00
Albert Astals Cid ab8944dcce Add Comment 
BUGS: 351973
 2015-08-30 16:43:39 +02:00
Alex Richardson bb22f7d3f1 Don't rotate images with Qt 5.4.0 and 5.4.1 
There was behaviour change that automatically rotated jpeg images based
on exif metadata that was reverted in 5.4.2.
We now skip rotating with those two version to prevent rotating twice.

Also shared some code so that the #ifdef does not need to be added to
both methods

REVIEW: 123895
 2015-08-15 19:28:06 +01:00
Alex Richardson 824a35ced0 Ensure KImageIO test always finds the currently built generator 
REVIEW: 123895
 2015-08-14 01:30:32 +01:00
Marco Martin 1dd033d914 rename all the active specific desktop files 2015-08-05 16:54:48 +02:00
Alex Richardson 1049dc188a Add Q_INTERFACES( Okular::Generator ) to all plugins 
This seems to be required with KPluginFactory and Qt5 since without it
KPluginFactory::create<Okular::Generator>() always returns null.

For some reason this requires a complete rebuild before generatorstest
passes.

REVIEW: 123466
 2015-05-22 16:33:09 +01:00
Alex Richardson cfc82ee9b0 Be explicit about the target dependencies 2015-04-14 20:04:26 +01:00
Marco Martin af3b4cba17 use the new kpackage-based runtime for the QML app 
remove old dead code, the okular active app is now completely
qml and KPackage based
 2015-04-03 16:56:00 +02:00
Montel Laurent 5e984303a4 Use new KDE_ macro 2015-03-04 07:52:20 +01:00
Lukáš Tinkl fd6a35486e port KUrl -> QUrl 2015-01-29 20:55:57 +01:00
Patrick von Reth 49c28f52df lik to okularcore and okularpart instead of including the settings code multiple times, which breaks the exports 2015-01-23 13:24:09 +01:00
l10n daemon script 9a3672b255 SVN_SILENT made messages (.desktop file) 2014-12-26 04:18:45 +00:00
l10n daemon script e6ef3cb64b SVN_SILENT made messages (.desktop file) 2014-12-25 04:05:24 +00:00
Raymond Wooninck aad0211c10 Fix build 2014-11-23 16:13:14 +01:00
Montel Laurent 60f8d7b712 Fix includes 2014-10-12 17:34:50 +02:00
Montel Laurent 3b4ee788b8 Fix includes 2014-10-08 13:37:04 +02:00
Jeremy Whiting 83299b9532 Remove %i from .desktop files which added --icon to exec line. 
Since Okular no longer uses KApplication it no longer handles --icon parameters.
 2014-10-07 16:41:59 -06:00
Montel Laurent 26fc592e7d Fix includes 2014-10-06 08:31:17 +02:00
Montel Laurent 927e7a9a19 Merge remote-tracking branch 'origin/KDE/4.14' into frameworks 2014-10-01 07:29:17 +02:00
l10n daemon script 3588634833 SVN_SILENT made messages (.desktop file) 2014-09-30 09:11:55 +00:00
l10n daemon script 8365cf2873 SVN_SILENT made messages (.desktop file) 2014-09-30 04:39:47 +00:00
Raymond Wooninck f4badbc117 Port the aboutData to the new methods. Next would be to bring back 
to About Backend dialog
 2014-09-18 22:17:10 +02:00
Frederik Gladhorn f7d1dd9312 Remove -caption %c from .desktop files 
BUGS: 338264
 2014-09-17 20:16:49 +02:00