1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
|
--- python-poppler-qt4-0.16.2/poppler-annotation.sip 2010-10-28 11:49:32.000000000 +0200
+++ python-poppler-qt4-0.16.2/poppler-annotation.sip 2012-05-18 13:38:21.000000000 +0200
@@ -45,6 +45,7 @@ public:
void setFlags( int flags );
QRectF boundary() const;
void setBoundary( const QRectF &boundary );
+%If(- POPPLER_V0_18_0)
struct Style {
// appearance properties
QColor color; // black
@@ -92,12 +93,18 @@ public:
// QLinkedList< Poppler::Annotation::Revision >& revisions();
const QLinkedList< Poppler::Annotation::Revision >& revisions() const;
+%End
virtual SubType subType() const = 0;
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode & parentNode, QDomDocument & document ) const;
+%End
virtual ~Annotation();
private:
Annotation(const Poppler::Annotation&);
+%If(POPPLER_V0_20_0 -)
+ virtual void store( QDomNode & parentNode, QDomDocument & document ) const;
+%End
%ConvertToSubClassCode
switch (sipCpp->subType()) {
@@ -151,17 +158,23 @@ class TextAnnotation : Poppler::Annotati
%End
public:
+%If(- POPPLER_V0_18_0)
TextAnnotation();
TextAnnotation( const QDomNode &node );
+%End
virtual ~TextAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum TextType { Linked, InPlace };
enum InplaceIntent { Unknown, Callout, TypeWriter };
TextType textType() const;
+%If(- POPPLER_V0_18_0)
void setTextType( TextType type );
+%End
QString textIcon() const;
void setTextIcon( const QString &icon );
@@ -176,12 +189,20 @@ public:
void setInplaceText( const QString &text );
QPointF calloutPoint( int id ) const;
+%If(- POPPLER_V0_18_0)
void setCalloutPoint( int id, const QPointF &point );
+%End
InplaceIntent inplaceIntent() const;
void setInplaceIntent( InplaceIntent intent );
private:
+%If(POPPLER_V0_20_0 -)
+ TextAnnotation();
+ TextAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+ void setTextType( TextType type );
+%End
TextAnnotation(const Poppler::TextAnnotation&);
}; // class TextAnnotation
@@ -194,10 +215,14 @@ class LineAnnotation : Poppler::Annotati
%End
public:
+%If(- POPPLER_V0_18_0)
LineAnnotation();
LineAnnotation( const QDomNode &node );
+%End
virtual ~LineAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum TermStyle { Square, Circle, Diamond, OpenArrow, ClosedArrow, None,
@@ -232,6 +257,11 @@ public:
void setLineIntent( LineIntent intent );
private:
+%If(POPPLER_V0_20_0 -)
+ LineAnnotation();
+ LineAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
LineAnnotation(const Poppler::LineAnnotation&);
}; // class LineAnnotation
@@ -244,10 +274,14 @@ class GeomAnnotation : Poppler::Annotati
%End
public:
+%If(- POPPLER_V0_18_0)
GeomAnnotation();
GeomAnnotation( const QDomNode &node );
+%End
virtual ~GeomAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum GeomType { InscribedSquare, InscribedCircle };
@@ -258,10 +292,17 @@ public:
QColor geomInnerColor() const;
void setGeomInnerColor( const QColor &color );
+%If(- POPPLER_V0_18_0)
int geomPointWidth() const;
void setGeomPointWidth( int width );
+%End
private:
+%If(POPPLER_V0_20_0 -)
+ GeomAnnotation();
+ GeomAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
GeomAnnotation(const Poppler::GeomAnnotation&);
}; // class GeomAnnotation
@@ -274,10 +315,14 @@ class HighlightAnnotation : Poppler::Ann
%End
public:
+%If(- POPPLER_V0_18_0)
HighlightAnnotation();
HighlightAnnotation( const QDomNode &node );
+%End
virtual ~HighlightAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum HighlightType {
Highlight,
@@ -341,6 +386,11 @@ public:
void setHighlightQuads( const QList< Poppler::HighlightAnnotation::Quad > &quads );
private:
+%If(POPPLER_V0_20_0 -)
+ HighlightAnnotation();
+ HighlightAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
HighlightAnnotation(const Poppler::HighlightAnnotation&);
}; // class HighlightAnnotation
@@ -353,13 +403,25 @@ class StampAnnotation : Poppler::Annotat
%End
public:
+%If(- POPPLER_V0_18_0)
StampAnnotation();
StampAnnotation( const QDomNode &node );
+%End
virtual ~StampAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
QString stampIconName() const;
void setStampIconName( const QString &name );
+
+private:
+%If(POPPLER_V0_20_0 -)
+ StampAnnotation();
+ StampAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
+
}; // class StampAnnotation
@@ -370,15 +432,24 @@ class InkAnnotation : Poppler::Annotatio
%End
public:
+%If(- POPPLER_V0_18_0)
InkAnnotation();
InkAnnotation( const QDomNode &node );
+%End
virtual ~InkAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
QList< QLinkedList<QPointF> > inkPaths() const;
void setInkPaths( const QList< QLinkedList<QPointF> > &paths );
private:
+%If(POPPLER_V0_20_0 -)
+ InkAnnotation();
+ InkAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
InkAnnotation(const Poppler::InkAnnotation&);
}; // class InkAnnotation
@@ -391,15 +462,24 @@ class LinkAnnotation : Poppler::Annotati
%End
public:
+%If(- POPPLER_V0_18_0)
LinkAnnotation();
LinkAnnotation( const QDomNode &node );
+%End
virtual ~LinkAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum HighlightMode { None, Invert, Outline, Push };
+%If(- POPPLER_V0_18_0)
Poppler::Link* linkDestionation() const;
+%End
+%If(POPPLER_V0_20_0 -)
+ Poppler::Link* linkDestination() const;
+%End
void setLinkDestination( Poppler::Link *link );
HighlightMode linkHighlightMode() const;
@@ -409,6 +489,11 @@ public:
void setLinkRegionPoint( int id, const QPointF &point );
private:
+%If(POPPLER_V0_20_0 -)
+ LinkAnnotation();
+ LinkAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
LinkAnnotation(const Poppler::LinkAnnotation&);
}; // class LinkAnnotation
@@ -421,16 +506,25 @@ class CaretAnnotation : Poppler::Annotat
%End
public:
+%If(- POPPLER_V0_18_0)
CaretAnnotation();
CaretAnnotation( const QDomNode &node );
+%End
virtual ~CaretAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
enum CaretSymbol { None, P };
CaretSymbol caretSymbol() const;
void setCaretSymbol( CaretSymbol symbol );
private:
+%If(POPPLER_V0_20_0 -)
+ CaretAnnotation();
+ CaretAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
CaretAnnotation(const Poppler::CaretAnnotation&);
}; // class CaretAnnotation
@@ -443,10 +537,14 @@ class FileAttachmentAnnotation : Poppler
%End
public:
+%If(- POPPLER_V0_18_0)
FileAttachmentAnnotation();
FileAttachmentAnnotation( const QDomNode &node );
+%End
virtual ~FileAttachmentAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
QString fileIconName() const;
void setFileIconName( const QString &icon );
@@ -454,6 +552,11 @@ public:
void setEmbeddedFile( Poppler::EmbeddedFile *ef );
private:
+%If(POPPLER_V0_20_0 -)
+ FileAttachmentAnnotation();
+ FileAttachmentAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
FileAttachmentAnnotation(const Poppler::FileAttachmentAnnotation&);
}; // class FileAttachmentAnnotation
@@ -466,10 +569,14 @@ class SoundAnnotation : Poppler::Annotat
%End
public:
+%If(- POPPLER_V0_18_0)
SoundAnnotation();
SoundAnnotation( const QDomNode &node );
+%End
virtual ~SoundAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
QString soundIconName() const;
void setSoundIconName( const QString &icon );
@@ -477,6 +584,11 @@ public:
void setSound( Poppler::SoundObject *ef );
private:
+%If(POPPLER_V0_20_0 -)
+ SoundAnnotation();
+ SoundAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
SoundAnnotation(const Poppler::SoundAnnotation&);
}; // class SoundAnnotation
@@ -489,10 +601,14 @@ class MovieAnnotation : Poppler::Annotat
%End
public:
+%If(- POPPLER_V0_18_0)
MovieAnnotation();
MovieAnnotation( const QDomNode &node );
+%End
virtual ~MovieAnnotation();
+%If(- POPPLER_V0_18_0)
virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
virtual SubType subType() const;
Poppler::MovieObject* movie() const;
@@ -501,6 +617,11 @@ public:
void setMovieTitle( const QString &title );
private:
+%If(POPPLER_V0_20_0 -)
+ MovieAnnotation();
+ MovieAnnotation( const QDomNode &node );
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+%End
MovieAnnotation(const Poppler::MovieAnnotation&);
}; // class MovieAnnotation
--- python-poppler-qt4-0.16.2/poppler-qt4.sip 2011-04-22 23:45:22.000000000 +0200
+++ python-poppler-qt4-0.16.2/poppler-qt4.sip 2012-05-18 12:54:23.000000000 +0200
@@ -9,6 +9,8 @@
POPPLER_V0_12_1
POPPLER_V0_14_0
POPPLER_V0_16_0
+ POPPLER_V0_18_0
+ POPPLER_V0_20_0
}
%Include types.sip
--- python-poppler-qt4-0.16.2/setup.py 2011-05-20 11:41:55.000000000 +0200
+++ python-poppler-qt4-0.16.2/setup.py 2012-05-18 12:54:45.000000000 +0200
@@ -125,8 +125,12 @@ class build_ext(build_ext_base):
tag = 'POPPLER_V0_12_1'
elif ver < (0, 16, 0):
tag = 'POPPLER_V0_14_0'
- else:
+ elif ver < (0, 18, 0):
tag = 'POPPLER_V0_16_0'
+ elif ver < (0, 20, 0):
+ tag = 'POPPLER_V0_18_0'
+ else:
+ tag = 'POPPLER_V0_20_0'
cmd = [sip_bin]
if hasattr(self, 'sip_opts'):
|
