Commit graph

404 commits

Author SHA1 Message Date
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
Montel Laurent
014b712359 Use explicit. Q_DECL_OVERRIDE 2015-08-18 15:27:20 +02: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
Montel Laurent
5c85b83a8f Fix includes 2015-02-07 13:16:07 +01:00
Lukáš Tinkl
e9ae1d99af port away from KLocale 2015-01-29 21:48:47 +01:00
Lukáš Tinkl
fd6a35486e port KUrl -> QUrl 2015-01-29 20:55:57 +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
Montel Laurent
f59383196d Fix debug, QStandardpath 2014-10-17 08:30:24 +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
6300c30fea Fix cmakelists.txt 2014-10-06 09:00:20 +02:00
Montel Laurent
927e7a9a19 Merge remote-tracking branch 'origin/KDE/4.14' into frameworks 2014-10-01 07:29:17 +02:00
Montel Laurent
378f6847a2 Remove some deprecated kdelibs4support 2014-10-01 07:27:09 +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
Frederik Gladhorn
6c602bf0e7 Use categorized logging even more 2014-09-16 23:38:25 +02:00
Frederik Gladhorn
e28dbc6c00 Port to QMime
compressedMimeFor now already does the inheritance check, so another
check was removed.
2014-09-11 16:32:43 +02:00
Frederik Gladhorn
83d3f1f6b7 Revert "Some more kDebug->qDebug"
Seems like kDebug doesn't spam the user, so this needs to use qCDebug.

This reverts commit 34fbdf8c85.
2014-09-11 02:03:46 +02:00
Frederik Gladhorn
34fbdf8c85 Some more kDebug->qDebug 2014-09-09 18:17:36 +02:00
Fabio D'Urso
75c8acee60 Compile DVI, TIFF and XPS generators 2014-08-24 23:13:45 +02:00
Frederik Gladhorn
b79e706e56 Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	generators/dvi/generator_dvi.cpp
	generators/ooo/generator_ooo.cpp
	part.cpp
	shell/main.cpp
	shell/shell.cpp
	shell/shell.h
	shell/shellutils.h
	tests/CMakeLists.txt
	ui/propertiesdialog.cpp
2014-08-14 13:35:43 +02:00
Albert Astals Cid
e9e3d4a435 Make documentInfo be Hash based instead of XML based 2014-08-10 22:38:13 +02:00
Frederik Gladhorn
7261d5d45a Generator porting (mostly kaboutdata) 2014-08-09 21:29:06 +02:00
l10n daemon script
896de56ef0 SVN_SILENT made messages (.desktop file) 2014-07-25 05:38:42 +00:00
l10n daemon script
1b5cbbea59 SVN_SILENT made messages (.desktop file) 2014-07-24 04:51:37 +00:00
l10n daemon script
d62def2323 SVN_SILENT made messages (.desktop file) 2014-07-06 04:29:52 +00:00
l10n daemon script
6a46dd7447 SVN_SILENT made messages (.desktop file) 2014-06-30 04:40:38 +00:00
l10n daemon script
6f62e29846 SVN_SILENT made messages (.desktop file) 2014-02-24 04:37:30 +00:00
l10n daemon script
d773e626a9 SVN_SILENT made messages (.desktop file) 2013-08-04 04:26:31 +00:00
l10n daemon script
4e84194bef SVN_SILENT made messages (.desktop file) 2013-07-24 04:05:35 +00:00
l10n daemon script
db0c64854d SVN_SILENT made messages (.desktop file) 2013-07-23 04:02:30 +00:00
l10n daemon script
9476a9cf7a SVN_SILENT made messages (.desktop file) 2013-07-14 04:14:05 +00:00
l10n daemon script
2e847d2f81 SVN_SILENT made messages (.desktop file) 2013-07-01 03:53:16 +00:00
l10n daemon script
8f1b2b7281 SVN_SILENT made messages (.desktop file) 2013-06-05 04:52:43 +00:00
David Faure
155312269b Remove erroneous double-quotes around %c in Exec line 2013-05-03 13:25:44 +02:00
Script Kiddy
cbc693b664 SVN_SILENT made messages (.desktop file) 2013-04-20 09:48:58 +02:00
Script Kiddy
583fc0d81f SVN_SILENT made messages (.desktop file) 2013-04-08 08:57:28 +02:00
Script Kiddy
c40dcc576a SVN_SILENT made messages (.desktop file) 2013-03-27 08:31:16 +01:00
Albert Astals Cid
cbf3bddb42 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	VERSION
	core/version.h
	generators/spectre/okularApplication_ghostview.desktop
2013-03-26 20:32:56 +01:00
Script Kiddy
879df5807a SVN_SILENT made messages (.desktop file) 2013-03-17 13:32:34 +01:00
Script Kiddy
b23f5037df SVN_SILENT made messages (.desktop file) 2013-03-11 08:35:41 +01:00
Script Kiddy
0b17013be3 SVN_SILENT made messages (.desktop file) 2013-03-01 08:49:04 +01:00
Marco Martin
27c37c1fd1 use TryExec to not appear when not installed
when okular active is not installed, it should not appear in the open with menu, so add TryExec to see if the executable exists
this is used instead of conditional install to make easier for distributions to package the desktop and active versions separately

BUG:314981
REVIEW:109047
2013-02-20 11:14:13 +01:00
Script Kiddy
a034e086e5 SVN_SILENT made messages (.desktop file) 2013-02-08 08:27:14 +01:00
Script Kiddy
23e88b8605 SVN_SILENT made messages (.desktop file) 2013-02-05 21:28:25 +01:00
Script Kiddy
ba79674de9 SVN_SILENT made messages (.desktop file) 2013-02-05 16:52:55 +01:00
Script Kiddy
be8aa28dc9 SVN_SILENT made messages (.desktop file) 2013-01-31 16:28:53 +01:00
Script Kiddy
472d8d1480 SVN_SILENT made messages (.desktop file) 2013-01-31 11:56:49 +01:00
Script Kiddy
be60fbf64d SVN_SILENT made messages (.desktop file) 2013-01-23 08:25:54 +01:00
Albert Astals Cid
cb003adcfd Merge remote-tracking branch 'origin/KDE/4.10' 2013-01-23 00:06:26 +01:00
Script Kiddy
44b7ff680c SVN_SILENT made messages (.desktop file) 2013-01-22 20:35:02 +01:00
Script Kiddy
a4a7d5039d SVN_SILENT made messages (.desktop file) 2013-01-17 08:12:57 +01:00
Albert Astals Cid
3a46e10b9e Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	VERSION
	core/version.h
2013-01-16 18:01:06 +01:00
Script Kiddy
45c8af8151 SVN_SILENT made messages (.desktop file) 2013-01-15 20:29:31 +01:00
Script Kiddy
39e2ea5e73 SVN_SILENT made messages (.desktop file) 2013-01-15 16:11:09 +01:00
Script Kiddy
aca1975553 SVN_SILENT made messages (.desktop file) 2013-01-13 08:05:04 +01:00
Script Kiddy
94a3df94f8 SVN_SILENT made messages (.desktop file) 2013-01-10 12:21:24 +01:00
Script Kiddy
a3a57f0634 SVN_SILENT made messages (.desktop file) 2013-01-08 17:18:28 +01:00
Albert Astals Cid
c74c732b24 Merge remote-tracking branch 'origin/KDE/4.10' 2012-12-31 12:05:52 +01:00
Marco Martin
fec9218235 every mimetype with own desktop file
splits the desktop file of the active app per mimetype,
as is done for the desktop version and for the part,
so only the ones that were actually built will be supported
2012-12-31 11:54:44 +01:00
Script Kiddy
999d89b0be SVN_SILENT made messages (.desktop file) 2012-12-28 07:43:16 +01:00
Script Kiddy
341c0bc7f2 SVN_SILENT made messages (.desktop file) 2012-12-24 09:00:24 +01:00
Script Kiddy
d4aceee67e SVN_SILENT made messages (.desktop file) 2012-12-23 07:56:06 +01:00
Script Kiddy
79f95f3086 SVN_SILENT made messages (.desktop file) 2012-12-22 08:08:47 +01:00
Script Kiddy
b38206612c SVN_SILENT made messages (.desktop file) 2012-11-20 15:21:13 +01:00
Script Kiddy
02893a5d74 SVN_SILENT made messages (.desktop file) 2012-10-29 09:48:52 +01:00
Jan Binder
aa6ed8afc0 Replace deprecated QMatrix by QTransform
REVIEW: 105737
2012-09-08 17:06:02 +02:00
Script Kiddy
e653d83816 SVN_SILENT made messages (.desktop file) 2012-08-07 18:30:47 +02:00
Script Kiddy
dc6823c135 SVN_SILENT made messages (.desktop file) 2012-06-24 10:17:10 +02:00
Script Kiddy
d41c8bd1c7 SVN_SILENT made messages (.desktop file) 2012-06-12 17:04:54 +02:00
Script Kiddy
f6781637c0 SVN_SILENT made messages (.desktop file) 2012-05-12 12:28:52 +02:00
Script Kiddy
d7e2453a4d SVN_SILENT made messages (.desktop file) 2012-05-05 10:45:59 +02:00
Script Kiddy
00fdc61daa SVN_SILENT made messages (.desktop file) 2012-04-11 09:35:46 +02:00
Script Kiddy
5778a66e7c SVN_SILENT made messages (.desktop file) 2012-02-16 10:52:04 +01:00
Script Kiddy
5cfe3b8575 SVN_SILENT made messages (.desktop file) 2012-02-05 09:41:48 +01:00
Script Kiddy
76f96438e7 SVN_SILENT made messages (.desktop file) 2012-01-29 11:39:01 +01:00
Script Kiddy
92360f704a SVN_SILENT made messages (.desktop file) 2011-12-21 09:59:21 +01:00
Script Kiddy
ee684dc516 SVN_SILENT made messages (.desktop file) 2011-12-20 16:26:22 +01:00
Script Kiddy
16d92557a0 SVN_SILENT made messages (.desktop file) 2011-12-19 15:36:45 +01:00
Script Kiddy
417e8b0359 SVN_SILENT made messages (.desktop file) 2011-12-17 09:46:38 +01:00
Script Kiddy
e56df195f0 SVN_SILENT made messages (.desktop file) 2011-12-13 15:52:26 +01:00
Script Kiddy
6715c207e8 SVN_SILENT made messages (.desktop file) 2011-12-11 08:38:07 +01:00
Script Kiddy
6af2062d72 SVN_SILENT made messages (.desktop file) 2011-12-08 09:04:23 +01:00
Script Kiddy
2d70239ee3 SVN_SILENT made messages (.desktop file) 2011-12-07 09:23:18 +01:00