office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8161 commits 139 branches 358 tags 110 MiB
Commit graph

1625 commits

Author SHA1 Message Date
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
Albert Astals Cid ef860fb1d8 Merge remote-tracking branch 'origin/Applications/16.12' 2016-12-08 23:39:47 +01:00
Albert Astals Cid ecf54e4203 Try other generators if opening fails with one generator 
This is not very common but would happen so be a bit stubborner
 2016-12-08 23:35:04 +01:00
Miklós Máté e81fb3d639 Check all supported mime types the generator supports 
Stopping on the first inherit match can prevent finding a perfect match, and thus we might enter a competition of inherit matches from other generators.

Example: spectre supports application/postscript and image/x-eps. When opening an eps the app/ps is an inherit match, but so is text/plain from the txt generator. Thanks to stable_sort() the txt generator is deterministically selected from the above two inherit matches. Unless we continue and find the perfect match, which is spectre:image/x-eps.

REVIEW: 129610
 2016-12-08 22:42:44 +01:00
Albert Astals Cid 2868e3e5ca Support SetOCGState links 
Needs a very recent poppler

BUGS: 368402
REVIEW: 129216
 2016-11-26 16:00:46 +01:00
Albert Vaca 3c93b2523e Added missing overrides found by clang-tidy 2016-10-29 17:07:10 +02:00
Albert Vaca c71f308252 Fixes suggested by Clazy 2016-10-29 16:33:05 +02:00
Albert Vaca dd126149d6 Use Qt to detect the paper type and name. 2016-10-29 16:33:05 +02:00
Aleix Pol ebeeac8d72 Set the version to 1.0 
Remove redundant version.h file in favor of the ecm-generated.
Use minor version from KDE_APPLICATIONS_VERSION_*

Reviewed by Albert Astals
 2016-10-29 12:42:59 +02:00
Albert Astals Cid 62eea3336b Merge remote-tracking branch 'origin/master' into frameworks 2016-10-29 11:13:24 +02:00
Albert Astals Cid f943f9ee8b Remove the !this checks 
It's not part of the standard and GCC recently removed support for it

Looking at the code it seems we only need one external check, let's hope i'm right :D
 2016-10-17 13:02:49 +02:00
Albert Astals Cid 75c387c62c increase version in master 2016-10-07 01:00:49 +02:00
Albert Astals Cid 7003eff75e Increase version 
We had the cbr fix

GIT_SILENT
 2016-10-07 00:59:46 +02:00
Albert Astals Cid 744a6901d6 Increase version 
Meh i forgot to update it for .0

GIT_SILENT
 2016-08-23 00:22:33 +02:00
Olivier CHURLAUD 411bdee0eb Open relative path again 
REVIEW: 128507
 2016-08-03 16:01:30 +02:00
Martin T. H. Sandsmark f87a306ec1 Fix warning about incompatible pointers in synctex parser 2016-07-24 22:30:39 +02:00
Martin T. H. Sandsmark d2f4f1c2d7 Remove outdated compiler message 2016-07-24 22:11:46 +02:00
Martin T. H. Sandsmark a6ec5ea9de Fix parsing of lilypond URLs 2016-07-24 20:27:04 +02:00
Albert Astals Cid ea607664d2 Beta version for KDE Applications 16.08 2016-07-21 23:46:24 +02:00
Olivier CHURLAUD 33122dd825 Uncomment printing option pdf2ps 2016-07-21 20:33:04 +02:00
Olivier CHURLAUD dd8fa351ce Fonts are scanned again by poppler5 
Fonts are filtered as well to only appear once.

REVIEW: 128441
 2016-07-13 23:46:43 +02:00
Olivier CHURLAUD ec0b68a756 Update deprecated KArchive method + remove unused variable in 
generator_pdf

Reviewer: sandsmark
 2016-07-13 21:00:35 +02:00
Martin T. H. Sandsmark 89e5f17542 Improve matching of generators 
Instead of trying to use the plain text generator for everything, try to
find a more specialized one first.

BUG: 323213
 2016-07-13 03:23:09 +02:00
Martin T. H. Sandsmark 3985577c90 Unbreak fetching of supporting generators 2016-07-13 02:27:55 +02:00
Martin T. H. Sandsmark f0323c26d0 Fix duplicate mimetype elimination 2016-07-13 01:57:26 +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 25a1915daf Fix source file encoding 2016-07-11 22:45:39 +02:00
Martin T. H. Sandsmark d29ec08007 remove invalid null pointer checks 2016-07-11 22:29:20 +02:00
Martin T. H. Sandsmark f05d42eac3 core: Fix build without implicit cast to/from ascii 
See previous commits for details.
 2016-07-11 22:07:57 +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
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 445b9f383d Increase version for KDE Applications 16.04 
GIT_SILENT
 2016-04-13 22:08:21 +02:00
Albert Astals Cid 852e9586d1 Increase version for KDE Applications 16.04 RC 2016-04-06 23:03:56 +02: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
Aleix Pol a704fbce94 Fix porting QUrl issues 
Reviewed by Albert Astals
 2016-01-30 20:00:25 +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
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
Albert Astals Cid fd203820f7 Increase version for master 2015-11-18 00:35:59 +01:00
Albert Astals Cid 50b70c51de Increase version for beta 2015-11-18 00:34:57 +01:00
Montel Laurent 466eb79615 Use QStringLiteral 2015-10-29 13:37:11 +01:00
Montel Laurent 8805760ccf Merge remote-tracking branch 'origin/master' into frameworks 2015-10-29 13:24:05 +01:00
Albert Astals Cid c743eceb3d Optimize all those SettingsCore::paperColor().rgb() calls 
Maybe the compiler can do it, but i can do it as well :D
 2015-10-21 00:07:35 +02:00
Lauri Lyly 9d7533d28e Fix trimming margins when paperColor not white 
REVIEW: 125721
 2015-10-21 00:05:37 +02:00
Albert Astals Cid 8445660539 Merge remote-tracking branch 'origin/master' into frameworks 2015-10-18 22:29:00 +02:00
Gleb Popov b8d22401f2 Implement qHash() for Okular::NormalizedRect. 2015-10-17 15:10:16 +03:00
Arseniy Lartsev 76c1e944a8 Support for non-integer transition durations in PDF presentations 
REVIEW: 125329
 2015-10-15 00:16:55 +02:00
Arseniy Lartsev e9e5cb6317 Repeat videos in PDFs automatically when needed 
REVIEW: 125341
BUGS: 353171
 2015-09-26 17:30:04 +02:00
Albert Astals Cid d52a07c9d2 Merge remote-tracking branch 'origin/gsoc2015_layer_feature' 2015-09-16 22:54:42 +02:00
Albert Astals Cid 1cd101b480 Small cleanup of the layer support feature 
Tab replacing, function naming, include removal, @since addition, etc
 2015-09-15 01:38:09 +02:00
Albert Astals Cid a475a7570c Merge remote-tracking branch 'origin/Applications/15.08' 2015-09-13 16:42:28 +02:00
Frederic Tronel 4fee5131e9 Do not --use when invoking kate anymore 
BUGS: 352657
 2015-09-13 16:41:09 +02:00
Albert Astals Cid 46ffe3e76f Increase version for KDE Applications 15.08.1 2015-09-10 22:51:25 +02:00
Tobias Koenig 8b603c174d Add basic support for RichMedia annotations in PDF files 
That patch extracts the video file, which is defined in a
rich media annotation as parameter for the flash player,
and uses the normal multimedia player, to playback the video
file.

This feature requires poppler-qt5 in version 0.36.

FEATURE: 326230
REVIEW: 124612
 2015-08-20 08:59:34 +02:00
Alex Richardson e608908961 Remove check for Qt < 4.7 
Useless as we currently require at least 5.2
 2015-08-19 15:14:29 +01:00
Alex Richardson 64afe09e88 Port away from KLocale 2015-08-19 15:14:25 +01:00
Alex Richardson 81d4b984a4 K_GLOBAL_STATIC -> Q_GLOBAL_STATIC 2015-08-19 15:14:18 +01:00
Montel Laurent 6fab218de9 Use Q_NULLPTR 2015-08-18 15:12:07 +02:00
Montel Laurent 2f95249a58 Merge remote-tracking branch 'origin/master' into frameworks 2015-08-16 10:52:13 +02:00
Alex Richardson 22b6d4551d Remove copy of qpagesize.cpp 
No longer needed with Qt5
 2015-08-15 19:28:06 +01:00
Albert Astals Cid 29b2b92d02 Merge remote-tracking branch 'origin/Applications/15.08' 2015-08-12 22:43:26 +02:00
Tobias Koenig b683889c3a Fix play back of video with rendition link 
Process the operations of the rendition link independently of whether
there is a JS script or not. Most of the time the JS script won't be
executed correctly anyway, since Okular is missing most of the JS API,
so we should fall back on the given operations.

BUGS: 324167
FIXED-IN: KDE Applications 15.08.0
 2015-08-12 22:42:00 +02:00
Albert Astals Cid 48d20f2117 Increase version for KDE Applications 15.08.0 2015-08-12 01:14:05 +02:00
Albert Astals Cid e2b5bc547b GIT_SILENT Update version 2015-08-06 00:30:43 +02:00
Montel Laurent 3c8daf3068 Use QVector 2015-08-04 14:21:25 +02:00
Montel Laurent 49ce3fc4d2 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	core/version.h
 2015-08-03 09:44:50 +02:00
David Faure 94b95d8fda Print out better error message if a plugin can't be loaded. 
(turns out that poppler installs into lib/ rather than lib64/)
 2015-07-31 12:15:09 +02:00
Albert Astals Cid f063b94be3 More TODOs 2015-07-30 12:57:51 +02:00
Albert Astals Cid 1de97322e7 Bring QPageSize from Qt5 
Allows us to not use a dummy printer for knowing page size
Which is nice since it won't block because Qt4 QPrinter is a bit weird sometimes

BUGS: 334708
FIXED-IN: KDE Applications 15.08
 2015-07-30 12:47:22 +02:00
Albert Astals Cid dafd8f6972 Bring QPageSize from Qt5 
Allows us to not use a dummy printer for knowing page size
Which is nice since it won't block because Qt4 QPrinter is a bit weird sometimes

BUGS: 334708
FIXED-IN: KDE Applications 15.08
 2015-07-30 12:45:55 +02:00
Albert Astals Cid 6195d6b7f5 Merge remote-tracking branch 'origin/Applications/15.08' 2015-07-30 10:50:40 +02:00
Albert Astals Cid 1da3c424d1 Allow for the deletion of Caret annotations 
Seems poppler just renders them fine, so we set them to externally rendered and allow annotation
FIXED-IN: KDE Applications 15.08
BUGS: 350740
 2015-07-30 10:49:00 +02:00
Michel Ludwig f98eb936d5 Fix url creation in 'Document::processSourceReference' 
This commit fixes the error message "<url> is not a local file" when processing
source references. 'giveAbsolutePath(QString)' returns a local file name, so we
create the corresponding url using 'QUrl::fromLocalFile'.
 2015-07-21 21:29:14 +02:00
Albert Astals Cid ade9fe5bdb Increase version number 2015-07-21 19:38:18 +02:00
Albert Astals Cid be793983eb Increase version number 2015-07-21 19:36:25 +02:00
Jan Kundrát abd30fb774 s/auto_ptr/unique_ptr/ 
The old auto_ptr was used for simple RAII. None of the auto_ptr flaws
were apparent in that context, but given that that class is actively
deprecated and that compilers warn about its use, it's better to switch
to its drop-in replacement.

My reason for not using QScopedPointer is that the C++11 version works
well enough, Okular is being built in C++11 mode anyway, unique_ptr
works on the KF5-minimal-mandated-compilers according to their docs, and
therefore there's no point in using something with a different API
(QScopedPointer) just because its name begins with a Q.

REVIEW: 124027
 2015-07-20 16:14:01 +02:00
Saheb Preet Singh 19e4a9abd6 refreshing pixmaps in the correct order 2015-07-12 21:22:33 +05:30
Albert Astals Cid 3e77904f31 Compile++ 2015-07-10 00:15:40 +02:00
Albert Astals Cid b088001a7c Increase the per request limit from ~80M to ~800M 
Unless you're in greedy mode that we won't protect you from yourself :D
CCMAIL: 349863
 2015-07-10 00:04:42 +02:00
Saheb Preet Singh 455a381f39 fixed the license in new files 2015-05-29 09:54:06 +05:30
Saheb Preet Singh bf673495fb added layers on the left sidebar 2015-05-27 19:26:56 +05:30
Alex Richardson c2fc0199b8 Use KPluginFactory::createInstance<Okular::Generator>() 
Now that all generators have the necessary Q_INTERFACES() it works again
This restores the behaviour from before commit e4a4d400c3

REVIEW: 123466
 2015-05-22 16:33:09 +01:00
Albert Astals Cid 3f55cc1e90 Try to fix Mac/clang build 2015-05-22 05:53:43 +02:00
Albert Astals Cid 146c6d85bb Merge remote-tracking branch 'origin/Applications/15.04' 2015-05-14 00:59:48 +02:00
Jonathan Doman 223092aa0e Fix embed mode detection 
Wow, I have no idea how this happened. I wrote an big test case and spent a lot of time playing with tabs. Stephan Binner even told me about this a month ago, but I didn't quite understand the problem...
Broken embed mode detection means that the tabbed interface is disabled. It actually made it into release... ugh

REVIEW: 123680
 2015-05-14 00:58:48 +02:00
Albert Astals Cid cb9aa1559d 0.22.1 
For Applications 15.04.1
SVN_SILENT
 2015-05-02 14:49:49 +02:00
Andreas Cord-Landwehr ac258e49f1 Use generated version and CMake config files. 
Replace both the package version file by a generated file, as well as
OkularConfig.cmake package configuration file.

Note that with this change the compatibility CMake variable OKULAR_FOUND
is not set anymore, use Okular_FOUND instead.

REVIEW: 123314
 2015-04-15 21:55:35 +02:00
Alex Richardson cfc82ee9b0 Be explicit about the target dependencies 2015-04-14 20:04:26 +01:00
Albert Astals Cid 8f854256ef And forgot to increase this one ^_^ 
GIT_SILENT
 2015-04-07 22:37:49 +02:00
Albert Astals Cid bf203fd1a9 Prepare for the KDE Applications 15.04.0 release 
GIT_SILENT
 2015-04-07 22:37:13 +02:00
Albert Astals Cid c11c734caf RC version 2015-03-25 23:02:26 +01:00
Montel Laurent 5d727ee965 Fix includes 2015-03-20 08:55:32 +01:00
Albert Astals Cid bb00a153e6 Update for 15.04 Beta 3 
SVN_SILENT
 2015-03-18 23:53:47 +01:00
Montel Laurent d780d15ea9 Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	autotests/mainshelltest.cpp
	part.cpp
	part.h
	shell/shell.cpp
 2015-03-17 08:47:52 +01:00
Albert Astals Cid a77bbac299 Fix typo 2015-03-14 16:10:09 +01:00
Montel Laurent c50c3d5332 kdelibs4support-- 2015-03-06 14:00:25 +01:00
Montel Laurent 04943508cf Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	core/document.cpp
	core/version.h
 2015-03-04 07:55:32 +01:00
Albert Astals Cid 7e954058d3 Update for the next version in master 2015-03-02 23:39:07 +01:00
Albert Astals Cid 50116cf59f Update for 15.04 Beta 1 
SVN_SILENT
 2015-03-02 23:38:06 +01:00
Andreas Hartmetz f847d716a0 Fix build with Qt 5.5 branch. 
Is Qt even allowed to remove accidental includes and / or forward
declarations?
 2015-03-02 13:09:27 +01:00
Albert Astals Cid 5a3d77a81b Compile++ 
I've no idea why i need this for it to compile now, but kind of makes sense to follow the
same pattern for all the phonon includes, so unify with the rest of includes in this file
 2015-03-01 16:02:52 +01:00
Albert Astals Cid 5275d1271f Justity the hack don't feel like breaking/expanding the API now 2015-02-09 22:25:09 +01:00
Albert Astals Cid 93491b4fd3 Merge remote-tracking branch 'origin/Applications/14.12' 2015-02-09 22:21:57 +01:00
Albert Astals Cid 10a1899058 Hack to restore KWallet support 
Better fix code-wise will come with an API break in master

BUGS: 339170
 2015-02-09 22:03:44 +01:00
Montel Laurent c4f224f1e8 Port to new connect api 2015-01-30 22:06:53 +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
Albert Astals Cid 4ad7da97da Prepare for 0.21.2 
SVN_SILENT
 2015-01-29 19:52:52 +01:00
Albert Astals Cid adf39b2ed6 GIT_SILENT Update version for Applications 14.12.1 2015-01-06 12:29:40 +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
Albert Astals Cid da82ce77bc Prepare for Applications 14.12 release 2014-12-09 19:31:52 +01:00
Albert Astals Cid 31f194cc5f Prepare for Applications 14.12 RC 2014-11-26 00:02:15 +01:00
Albert Astals Cid 0ef618540d Beta 3 version 2014-11-19 18:45:09 +01:00
Albert Astals Cid d927eb2f3a Increase version 2014-11-12 23:40:59 +01:00
Albert Astals Cid f15bdf1b30 This is not 0.21.60 2014-11-05 23:51:40 +01:00
Albert Astals Cid a1e3e8ed5d Forgot to increase this 2014-11-05 23:50:49 +01:00
Albert Astals Cid 4985168ede Increase version 2014-11-05 23:49:44 +01:00
Montel Laurent 5da7c5f77d port to qCDebug. Autogenerate export headers 2014-10-27 22:35:06 +01:00
Montel Laurent 4ee83e6a77 Fix includes 2014-10-14 07:37:01 +02:00
Montel Laurent 17a55c6dab Merge remote-tracking branch 'origin/master' into frameworks 
Conflicts:
	CMakeLists.txt
	core/document.cpp
	generators/poppler/CMakeLists.txt
	generators/poppler/generator_pdf.cpp
	generators/poppler/generator_pdf.h
 2014-10-09 07:34:35 +02:00
Albert Astals Cid e8fd56f3ba Fixup last commit 
Somehow i ended up commiting a partial patch and not what was in reviewboard, this amends the previous commit to be what i really wanted to commit

Sorry for the mess :/
 2014-10-09 00:53:54 +02:00
Albert Astals Cid d95efa7698 Move synctex up to the core from poppler generator 
This way dvi and any other potential user gets it for free

The diff is huge, but the synctex files are just moves.

And the code in core/ is also mostly just a move from the generator_pdf.cpp code

Acked by Luigi

REVIEW: 120311
 2014-10-09 00:17:53 +02:00
Montel Laurent 17b7049c69 Fix includes 2014-10-08 13:48:01 +02:00
Montel Laurent 3b4ee788b8 Fix includes 2014-10-08 13:37:04 +02:00
Montel Laurent d3a3b2df25 Fix includes 2014-10-07 23:04:36 +02:00
Montel Laurent 08013f87d0 Port to QStandardPaths 2014-10-07 13:21:58 +02:00
Arnold Dumas d852a7bee0 Use new Q_OS_* macros. 2014-10-06 20:02:48 +02:00
Montel Laurent 26fc592e7d Fix includes 2014-10-06 08:31:17 +02:00
Montel Laurent 5557598b47 Port to QDialog 2014-10-06 07:39:24 +02:00
Montel Laurent d386ea257e Port to new connect api 2014-10-01 14:02:01 +02:00
Montel Laurent 378f6847a2 Remove some deprecated kdelibs4support 2014-10-01 07:27:09 +02:00
Arnold Dumas f8f90b15b3 Port away from KGlobal::caption(). 2014-09-26 20:04:00 +02: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 3581fb6245 Port to QTemporaryFile 2014-09-18 00:30:39 +02:00
Frederik Gladhorn dad6936896 Bring back the txt generator 2014-09-17 23:52:52 +02:00
Frederik Gladhorn 6c602bf0e7 Use categorized logging even more 2014-09-16 23:38:25 +02:00
Frederik Gladhorn 9d89739972 Use categorized logging 2014-09-16 23:24:36 +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
Fabio D'Urso e059d2652c core: support for migration of annots and forms out of docdata/ 2014-09-10 12:18:34 +02:00
Frederik Gladhorn 34fbdf8c85 Some more kDebug->qDebug 2014-09-09 18:17:36 +02:00
Albert Astals Cid 4335b6e509 douc++ 2014-09-09 11:44:33 +02:00
Fabio D'Urso 288f87f1a5 Merge branch 'master' into dont-use-docdata-for-annots-and-forms 
Conflicts:
	core/document.cpp
	core/document_p.h
	part.cpp
	part.h
 2014-09-08 14:58:55 +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 f76184cb55 Revert e96dabc467 
Diggory i think there was a misunderstanding in our discussion

The patch is unfinished (not goot to commit with a TODO)
and needs to be improved (need to find a way to not break ABI, QSize param should be const &) please
open a reviewrequest and we can discuss/finalize it there.

CCMAIL: diggory.hardy@unibas.ch
 2014-08-13 21:07:32 +02:00
Diggory Hardy e96dabc467 Fix font size on high-DPI displays in ePub documents (but makes images small) 2014-08-13 18:54:30 +02:00
Vishesh Handa 46cf7e46a5 Port away from KUrl::List 2014-08-13 13:07:44 +02:00
Vishesh Handa e038950f50 KIcon -> QIcon 2014-08-13 11:54:49 +02:00
Vishesh Handa fb330dd45c Port the EPubGenerator 2014-08-13 11:42:09 +02:00