Commit graph

495 commits

Author SHA1 Message Date
Albert Astals Cid
3b5f19fd9d Shell: Fix sync "Show menubar" action status
No need to sync it when Shell uses a native menubar
2017-07-02 18:00:04 +02:00
l10n daemon script
1658d3b64e GIT_SILENT made messages (after extraction) 2017-06-30 03:08:40 +02:00
l10n daemon script
5af987dac0 GIT_SILENT made messages (after extraction) 2017-06-20 05:05:53 +02:00
Albert Astals Cid
dc85379ce1 Merge remote-tracking branch 'origin/Applications/17.04' 2017-05-21 23:38:14 +02:00
l10n daemon script
bb8c12d1eb 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 05:48:05 +02:00
l10n daemon script
34edbb7711 GIT_SILENT made messages (after extraction) 2017-05-21 05:10:30 +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
58d23a20ae GIT_SILENT made messages (after extraction) 2017-05-12 04:56:11 +02:00
l10n daemon script
ef9ea64bc3 GIT_SILENT made messages (after extraction) 2017-05-12 02:59:10 +02:00
Friedrich W. H. Kossebau
2779bb6c0c Don't repeat work of KAboutData::setApplicationData(), set window icon 2017-05-08 15:17:48 +02:00
l10n daemon script
cd1d36df29 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 05:08:45 +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
Oliver Sander
3859fba07d Remove dependency on KActivities on Windows.
REVIEW: 130022
REVIEW: 126378
2017-03-18 01:58:47 +01:00
Albert Astals Cid
191a37fb52 Q_DECL_OVERRIDE -> override 2017-03-02 20:39:24 +01:00
l10n daemon script
5c929b2585 GIT_SILENT made messages (after extraction) 2017-02-28 09:33:35 +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
Albert Astals Cid
b13fc1d3be Readd test for file existance when opening files with # on the path
BUGS: 373855
2017-01-16 00:33:25 +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
73f7cd627b GIT_SILENT made messages (after extraction) 2016-12-23 03:49:23 +01:00
Albert Astals Cid
195c99e090 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-22 23:12:23 +01:00
l10n daemon script
2e1a71ffe3 GIT_SILENT made messages (after extraction) 2016-12-21 06:52:53 +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
l10n daemon script
20f6524016 GIT_SILENT made messages (after extraction) 2016-12-13 02:45:16 +01:00
l10n daemon script
6bc9feaba4 GIT_SILENT made messages (after extraction) 2016-12-12 04:38:06 +01:00
l10n daemon script
e798a92c06 GIT_SILENT made messages (after extraction) 2016-12-12 02:39:28 +01:00
l10n daemon script
8c2120e2d3 GIT_SILENT made messages (after extraction) 2016-12-09 04:31:33 +01:00
l10n daemon script
31da71cdec GIT_SILENT made messages (after extraction) 2016-12-09 02:36:45 +01:00
l10n daemon script
56759cd0b3 SVN_SILENT made messages (after extraction) 2016-12-02 05:11:22 +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
fecf0a8de6 SVN_SILENT made messages (after extraction) 2016-11-29 05:04:44 +01:00
l10n daemon script
96fd8111c1 SVN_SILENT made messages (after extraction) 2016-11-29 03:09:19 +01:00
l10n daemon script
43cde01ced SVN_SILENT made messages (after extraction) 2016-11-28 04:44:19 +01:00
l10n daemon script
f505e51b32 SVN_SILENT made messages (after extraction) 2016-11-28 02:53:18 +01:00
l10n daemon script
6aaf19e884 SVN_SILENT made messages (after extraction) 2016-11-23 04:59:06 +01:00
l10n daemon script
d075df4eb0 SVN_SILENT made messages (after extraction) 2016-11-23 02:56:17 +01:00
l10n daemon script
5a4b3f4aa9 SVN_SILENT made messages (after extraction) 2016-11-19 22:48:41 +01:00
l10n daemon script
1c3e55c4f2 SVN_SILENT made messages (after extraction) 2016-11-19 20:15:50 +01:00
l10n daemon script
92efe12446 SVN_SILENT made messages (after extraction) 2016-11-08 07:35:23 +00:00
l10n daemon script
dcb51a7f26 SVN_SILENT made messages (after extraction) 2016-11-07 07:22:48 +00:00
l10n daemon script
466a6ae8c2 SVN_SILENT made messages (after extraction) 2016-11-06 07:17:39 +00:00
Burkhard Lück
8666cacb92 add appdata file + metadata for chm, comicbook, djvu, dvi, epub, fax, fictionbook
REVIEW:128404
2016-11-04 14:56:55 +01: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
3c8464a4a0 Kill pre-release warning 2016-11-03 22:29:05 +01:00
Albert Vaca
c71f308252 Fixes suggested by Clazy 2016-10-29 16:33:05 +02:00
Albert Astals Cid
62eea3336b Merge remote-tracking branch 'origin/master' into frameworks 2016-10-29 11:13:24 +02:00
Martin T. H. Sandsmark
57fd20e90e Stop leaking qfiledialogs 2016-08-13 22:20:43 +02:00
Martin T. H. Sandsmark
1cd0bb2697 Ignore mimetypes without known globbing patterns 2016-08-13 21:59:17 +02:00
Martin T. H. Sandsmark
2eb0e01796 Merge mimetypes with same name, sort by name 2016-08-13 21:57:04 +02:00
Martin T. H. Sandsmark
e6e0d90a84 Fix typo in previous commit 2016-08-13 21:50:37 +02:00
Martin T. H. Sandsmark
8f86818b5c Make the open dialog a bit more usable without the Plasma QPA
Without the Plasma QPA now the file open dialog just lets you select a
single random filetype to view at the time.

REVIEW: 128435
2016-08-13 21:28:30 +02:00
Martin T. H. Sandsmark
ba1aeef06f Remove dead and unused code after porting to Qt5 QUrl 2016-07-24 19:14:29 +02:00
cjacker Jianzhong Huang
e90b836fee Fix i18n issue missing setApplicationDomain
REVIEW: 126445
2016-07-22 00:35:53 +02:00
Luigi Toscano
c3d2c8e1c4 Revert "Fix i18n issue missing setApplicationDomain"
This reverts commit 71950016aa.
Wrong authorship.
2016-07-22 00:34:04 +02:00
Martin T. H. Sandsmark
99b5688725 Make querying for KPart supported mimetypes a bit less broken 2016-07-13 01:43:30 +02:00
Olivier CHURLAUD
e3e2b7c6e3 Register Okular to DBus to get back the "open in new tab" feature.
REVIEW: 128424
2016-07-12 21:14:55 +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
48d52d9bd1 Add missing override declarations 2016-07-11 22:40:15 +02:00
Martin T. H. Sandsmark
67e7ada311 Fix build without implicit cast to/from ascii
See the previous commits for details. This is the last part.
2016-07-11 22:11:43 +02:00
Martin T. H. Sandsmark
439ced872d Port away from signal/slot keyword
When building okular without kdelibs4support it apparently builds with
-DQT_NO_SIGNALS_SLOTS_KEYWORDS.
2016-07-11 19:34:08 +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
Aleix Pol
32b62e919a Remove most KDELibs4Support linking
Ports away from KFileDialog.
Stops linking to KDELibs4Support from objects that don't need it.

REVIEW: 127021
2016-05-31 00:13:36 +02:00
Albert Astals Cid
18b4cababc Change kf5-warning text
Makes Thomas happier
2016-05-17 23:50:55 +02:00
Albert Astals Cid
f9917aa9fe Mark this as not official release 2016-05-04 22:54:23 +02:00
Aleix Pol
154c98fdaa Fix QUrl string encoding issue
Don't go through QUrl -> QString -> QUrl when opening files from the
argument list.
Don't be strict when opening URLs that come from the dbus interface.

REVIEW: 127042
2016-02-26 17:04:40 +01: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
a704fbce94 Fix porting QUrl issues
Reviewed by Albert Astals
2016-01-30 20:00:25 +01:00
Aleix Pol
cbf47d1bb8 Fix KTabWidget porting issue
Restore drop on tabs

Reviewed by Albert
2016-01-30 19:28:41 +01:00
Alex Richardson
1b2de0d1d0 Fix mainshelltest (and as a side-effect docdata saving)
Try fixing mainshelltest: one more passes now

QUrl is not automatically exposed to DBus so the DBus call would fail.
Changed the parameter to QString instead so that DBus invocation works.

mainshelltest: set QStandardPaths to test mode

Parse command line flags with a single dash as a long option

Unlike KCmdLineArgs QCommandLineParser treats options starting with a
single minus as multiple short options by default.

Previously okular -unique would fail with the following error:
Unknown options: u, n, i, q, u, e.

Also changed mainshelltest to use two dashes in case this behaviour
should change in the future.

mainshelltest failures have been reduced from 15 to 4 by this commit.

Fix docdata saving and added a warning message if it fails

If the ~/.local/okular/docdata directory didn't exist previously
creating the docdata file would fail as there are missing paths.

It seems that KStandardDirs used to create the okular/docdata directory
automatically, with QStandardPaths we have to create it manually.

mainshelltest is down to one failed test now

Fix final test case in mainshelltest

as we call QProcess::terminate the exit code will not be 0

REVIEW: 126192
2016-01-30 17:31:57 +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
Leslie Zhai
71950016aa Fix i18n issue missing setApplicationDomain
REVIEW: 126445
2016-01-04 15:12:45 +08: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
Alex Richardson
ab1d3a36cc Set the KXMLGUI component name to okular
Without this the .rc files will not be found by the unit tests or other
programs that use okularpart
2015-11-28 16:04:57 +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
David Rosca
c793fb2703 Fix crash on close
Delete m_tabwidget in destructor

REVIEW: 125890
2015-11-04 12:16:08 +01:00
Montel Laurent
466eb79615 Use QStringLiteral 2015-10-29 13:37:11 +01:00
Gleb Popov
f8870e60f4 Revert "Use QFileDialog from Qt 5 for "File -> Open" dialog."
Unlike KFileDialog, QFileDialog doesn't add special "All supported types" filter.
2015-10-21 14:33:49 +03:00
Gleb Popov
2bbdb762eb Use QFileDialog from Qt 5 for "File -> Open" dialog.
REVIEW: 125683
2015-10-21 08:57:35 +03: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