Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
PIM Messagelib
Commits
0b6dd107
Commit
0b6dd107
authored
May 15, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more autotests + remove duplicate code
parent
70241704
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
8 deletions
+25
-8
webengineviewer/src/print/autotests/printwebengineviewjobtest.cpp
...eviewer/src/print/autotests/printwebengineviewjobtest.cpp
+11
-0
webengineviewer/src/print/autotests/printwebengineviewjobtest.h
...ineviewer/src/print/autotests/printwebengineviewjobtest.h
+1
-0
webengineviewer/src/print/printwebengineviewjob.cpp
webengineviewer/src/print/printwebengineviewjob.cpp
+12
-8
webengineviewer/src/print/printwebengineviewjob.h
webengineviewer/src/print/printwebengineviewjob.h
+1
-0
No files found.
webengineviewer/src/print/autotests/printwebengineviewjobtest.cpp
View file @
0b6dd107
...
...
@@ -19,6 +19,7 @@
#include "../printwebengineviewjob.h"
#include <QTest>
#include <QPageLayout>
#include <QSignalSpy>
PrintWebEngineViewJobTest
::
PrintWebEngineViewJobTest
(
QObject
*
parent
)
:
QObject
(
parent
)
...
...
@@ -38,4 +39,14 @@ void PrintWebEngineViewJobTest::shouldHaveDefaultValue()
QVERIFY
(
!
job
.
pageLayout
().
isValid
());
}
void
PrintWebEngineViewJobTest
::
shouldFailedWhenWebEngineIsNotDefined
()
{
WebEngineViewer
::
PrintWebEngineViewJob
job
;
QSignalSpy
spyFailed
(
&
job
,
SIGNAL
(
failed
()));
QSignalSpy
spySuccess
(
&
job
,
SIGNAL
(
success
(
QString
)));
job
.
start
();
QCOMPARE
(
spyFailed
.
count
(),
1
);
QCOMPARE
(
spySuccess
.
count
(),
0
);
}
QTEST_MAIN
(
PrintWebEngineViewJobTest
)
webengineviewer/src/print/autotests/printwebengineviewjobtest.h
View file @
0b6dd107
...
...
@@ -28,6 +28,7 @@ public:
~
PrintWebEngineViewJobTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
void
shouldFailedWhenWebEngineIsNotDefined
();
};
#endif // PRINTWEBENGINEVIEWJOBTEST_H
webengineviewer/src/print/printwebengineviewjob.cpp
View file @
0b6dd107
...
...
@@ -49,26 +49,31 @@ PrintWebEngineViewJob::~PrintWebEngineViewJob()
}
void
PrintWebEngineViewJob
::
unableToPrint
()
{
Q_EMIT
failed
();
deleteLater
();
}
void
PrintWebEngineViewJob
::
start
()
{
if
(
mEngineView
)
{
if
(
!
mTemporaryFile
.
open
())
{
Q_EMIT
failed
();
deleteLater
();
unableToPrint
();
}
else
{
if
(
mPageLayout
.
isValid
())
{
mTemporaryFile
.
setAutoRemove
(
false
);
#if QT_VERSION >= 0x050700
mEngineView
->
page
()
->
printToPdf
(
invoke
(
this
,
&
PrintWebEngineViewJob
::
slotHandlePdfPrinted
),
mPageLayout
);
#else
unableToPrint
();
#endif
}
else
{
Q_EMIT
failed
();
deleteLater
();
unableToPrint
();
}
}
}
else
{
Q_EMIT
failed
();
deleteLater
();
unableToPrint
();
}
}
...
...
@@ -80,8 +85,7 @@ void PrintWebEngineViewJob::slotHandlePdfPrinted(const QByteArray &result)
QFile
file
(
mTemporaryFile
.
fileName
());
if
(
!
file
.
open
(
QFile
::
WriteOnly
))
{
//TODO warning.
Q_EMIT
failed
();
deleteLater
();
unableToPrint
();
return
;
}
...
...
webengineviewer/src/print/printwebengineviewjob.h
View file @
0b6dd107
...
...
@@ -50,6 +50,7 @@ private Q_SLOTS:
void
slotHandlePdfPrinted
(
const
QByteArray
&
result
);
private:
void
unableToPrint
();
QPageLayout
mPageLayout
;
QTemporaryFile
mTemporaryFile
;
QWebEngineView
*
mEngineView
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment