Commit graph

7261 commits

Author SHA1 Message Date
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
Albert Vaca db212c805f Make presentation widget tool bar follow the lineedit height
REVIEW: 126050
2016-02-22 02:56:17 -08:00
Albert Astals Cid aa2c28bc51 Forms: Let checkboxes be unchecked
At least in PDF which is the only backend with form support

Radio buttons are a bit of a mess since they're supposedly also uncheckable if NoToggleToOff is not set but in Adobe Reader they never are

BUGS: 357743
2016-02-22 02:54:04 -08:00
Krzysztof Pyrkosz 14c936ea1b Fix for CUPS printing
Okular was checking for Q_WS_X11 definition (which is not available since Qt 5) to detect CUPS, so detection always fails making CUPS parameters ignored.

REVIEW: 127036
2016-02-16 01:27:29 +01:00
Albert Astals Cid c8f52a2795 Merge remote-tracking branch 'origin/Applications/15.12' 2016-02-08 00:28:09 +01:00
Albert Astals Cid 41006445a9 setAttribute with doubles is evil as it uses the current locale and we don't want that, use QString::number
BUGS: 359016
2016-02-08 00:27:06 +01: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
Aleix Pol b6d3854e66 Fix installation of kimgio plugin
Now kimgiotest passes
2016-01-30 18:21:48 +01:00
Aleix Pol f42a3bad65 Drop libkscreen dependency
Drops the x11 fallback. We were falling back to QX11Extras that were in
fact using QScreen internally.
Also remove the QDesktopWidget fallbacks for the same reason.
Drops some API for fetching the dpi and unifies it with ::realDpi(QWidget).

Based on Sebas's patch.
Reviewed by Albert.

REVIEW: 126913
2016-01-30 18:15:07 +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
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
Albert Astals Cid db1c8ad751 Need new KF5 to get KPluginMetaData::mimeTypes 2016-01-30 16:49:37 +01:00
Aleix Pol 2c6cf868cf Let KDE*CompilerSettings change the policies in the project
As suggested in ECM documentation.
2016-01-28 14:59:01 +01:00
Alex Richardson 4930045ff1 Make sure we don't pick up the new FindPoppler from e-c-m yet
I will port it to that once the next version of e-c-m has been released
2016-01-27 11:35:28 +00:00
Marco Martin 5b5f0a0c8a a message if no docs present 2016-01-27 10:47:40 +01:00
Alex Richardson 449d727707 Fix parttest by increasing the wait duration 2016-01-24 14:11:46 +00:00
l10n daemon script ee162ffddb SVN_SILENT made messages (.desktop file) 2016-01-18 08:13:11 +00: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
Albert Astals Cid 40307ed70b Merge remote-tracking branch 'origin/Applications/15.12' 2016-01-15 01:06:22 +01:00
Albert Astals Cid ab3a9072b0 Forms: Let checkboxes be unchecked
At least in PDF which is the only backend with form support

Radio buttons are a bit of a mess since they're supposedly also uncheckable if NoToggleToOff is not set but in Adobe Reader they never are

BUGS: 357743
2016-01-15 01:05:25 +01:00
l10n daemon script a8cdfcb0d3 SVN_SILENT made messages (.desktop file) 2016-01-09 06:38:26 +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
Marco Martin 0772330f79 fix OkularDrawer appearance 2016-01-08 17:31:01 +01:00
l10n daemon script 1df2d478a9 SVN_SILENT made messages (.desktop file) 2016-01-07 06:46:40 +00:00
l10n daemon script b4ffc41bd0 SVN_SILENT made messages (.desktop file) 2016-01-05 07:57:52 +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 93b94161f2 Bring back the about backend dialog
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
Leslie Zhai 71950016aa Fix i18n issue missing setApplicationDomain
REVIEW: 126445
2016-01-04 15:12:45 +08:00
Michel Ludwig b939800fb7 Add logging categories file for kdebugsettings
REVIEW: 126589
2016-01-03 09:13:06 +01:00
Michel Ludwig 4c7c7dbd8c Unify the naming of logging categories 2016-01-01 16:14:17 +01:00
Patrick Spendrin d0ecab4736 Windows string fixes
This patch changes multiline QStringLiterals to QString::fromLatin1
as QStringLiterals doesn't understand multiline strings on windows.
Also, strncasecmp is replaced by the portable qstrnicmp function provided
by QByteArray header.

REVIEW: 126379
2015-12-28 22:48:25 +01:00
Marco Martin 9689a8eccd add missing file 2015-12-22 19:52:55 +01:00
Gleb Popov 355d592bfb Fix compilation of fax and comicbook generators with MSVC 2015.
REVIEW: 125791
2015-12-16 01:24:45 +01:00
Gleb Popov 0928298a74 Build okularpart as SHARED library when using MSVC, as using MODULE causes errors when linking to okularpart.dll.
REVIEW: 125792
2015-12-16 01:23:08 +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
Albert Astals Cid 7ff9609d52 Merge remote-tracking branch 'origin/Applications/15.12' 2015-12-07 23:58:12 +01:00
Albert Astals Cid 450fff8818 Increase version for KDE Applications 15.12.0
And soversion of the core library sicne there's a new virtual in it
2015-12-07 23:31:12 +01:00
l10n daemon script 9c7a558b8c SVN_SILENT made messages (.desktop file) 2015-12-07 06:48:20 +00:00
Marco Martin 2b4486a00d adapt to new components API 2015-12-01 17:29:16 +01:00
Alex Richardson 9b749abbc0 Remove tests/data/file2.pdf as we have it in autotests now 2015-11-28 16:55:10 +00:00
Alex Richardson de6443d106 Fix PartTest::testSelectText()
With Qt5 we need a qWait before the mouseRelease otherwise the selection
will not be made
2015-11-28 16:04:57 +00:00
Alex Richardson 19c2c170bb Make parttest pass by adding the file that it wants to open
It seems it was lost when merging master into frameworks.
2015-11-28 16:04:57 +00:00
Alex Richardson 5c566b3543 Fix crash in parttest by failing the test if the file couldn't be opened 2015-11-28 16:04:57 +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
Oliver Sander e5383ea2d6 Set objectName for 'm_name'
The unit test 'editdrawingtooldialogtest' on the frameworks branch aborts at run-time.  Reason: it expects the dialog to have a KLineEdit member with object name 'name'.  That KLineEdit does exist in the dialog, but no object name is set for it at all.  This patch explicitly sets the object name to 'name', which makes the editdrawingtooldialogtest pass again.

REVIEW: 126158
2015-11-27 19:50:10 +01:00
Sumit Sahrawat 3400f76dad Make inline annotation border width customizable, using a spin widget to accept input
REVIEW: 125801
BUGS: 332887
2015-11-24 01:10:46 +01: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