1 | diff -Naur vendor\current/build_os2.cmd trunk/build_os2.cmd
|
---|
2 | --- vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100
|
---|
3 | +++ trunk/build_os2.cmd 2013-05-22 17:19:38.000000000 +0200
|
---|
4 | @@ -0,0 +1,296 @@
|
---|
5 | +/* qpdfview Build Script */
|
---|
6 | +/* version history */
|
---|
7 | +/* version 0.1.0 from 25.03.2013 Silvan (first edition) */
|
---|
8 | +/* version 0.1.1 from 25.04.2013 Silvan (new poppler lib) */
|
---|
9 | +
|
---|
10 | +/* init the version string (don't forget to change) */
|
---|
11 | +version = "0.1.1"
|
---|
12 | +version_date = "25.04.2013"
|
---|
13 | +popplerDll = 'popp36.dll'
|
---|
14 | +popplerDllQt = 'poppqt44.dll'
|
---|
15 | +popplerDir = 'e:\trees\poppler\trunk'
|
---|
16 | +'@echo off'
|
---|
17 | +
|
---|
18 | +parse arg command option
|
---|
19 | +parse source . . scriptFile
|
---|
20 | +
|
---|
21 | +/* init the required vars */
|
---|
22 | +qRC = 0
|
---|
23 | +mRC = 0
|
---|
24 | +buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
|
---|
25 | +sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
|
---|
26 | +srcDir = sourceDir
|
---|
27 | +OS2Dir = sourceDir
|
---|
28 | +installDir = buildDir || '\install'
|
---|
29 | +installDirT= installDir || '\data'
|
---|
30 | +qErrorFile = buildDir||'\qmake.err'
|
---|
31 | +qOutFile = buildDir||'\qmake.out'
|
---|
32 | +mErrorFile = buildDir||'\make.err'
|
---|
33 | +mOutFile = buildDir||'\make.out'
|
---|
34 | +
|
---|
35 | +/* get the Qpdfview version */
|
---|
36 | +Qpdfview_version = '0.0.0'
|
---|
37 | +Qpdfview_build = ' '
|
---|
38 | +call version
|
---|
39 | +internal_build = translate(Qpdfview_version, '_', '.')
|
---|
40 | +
|
---|
41 | +title = "Qpdfview for eCS (OS/2) build script v" || version || " from " || version_date
|
---|
42 | +say title
|
---|
43 | +say
|
---|
44 | +say "Build directory:" buildDir
|
---|
45 | +say "Source directory:" sourceDir
|
---|
46 | +say
|
---|
47 | +say "Qpdfview version:" Qpdfview_version
|
---|
48 | +say " build: " Qpdfview_build
|
---|
49 | +say
|
---|
50 | +
|
---|
51 | +/* translate command to all upercase */
|
---|
52 | +command = translate(command)
|
---|
53 | +
|
---|
54 | +if command = "" then signal help
|
---|
55 | +
|
---|
56 | +if command = "INSTALL" then do
|
---|
57 | + select
|
---|
58 | + when Qpdfview_build \== "" then do
|
---|
59 | + zipFile = installDir || '\qpdfview-' || internal_build || '-' || Qpdfview_build || '.zip'
|
---|
60 | + end
|
---|
61 | + otherwise do
|
---|
62 | + signal help
|
---|
63 | + end
|
---|
64 | + end
|
---|
65 | +end
|
---|
66 | +
|
---|
67 | +/* now we translate also the option */
|
---|
68 | +option = translate(option)
|
---|
69 | +
|
---|
70 | +if sourceDir \== buildDir then do
|
---|
71 | + say "Shadow build in progress ..."
|
---|
72 | + say
|
---|
73 | +end
|
---|
74 | +
|
---|
75 | +select
|
---|
76 | + when command = "MAKE" & option = "CLEAN" then do
|
---|
77 | + say "Executing command: "command option
|
---|
78 | +
|
---|
79 | + say "cleaning the tree"
|
---|
80 | + call make 'distclean'
|
---|
81 | +
|
---|
82 | + say "please execute this script again with 'make' to build Qpdfview"
|
---|
83 | +
|
---|
84 | + end
|
---|
85 | + when command = "MAKE" then do
|
---|
86 | + say "Executing command: "command option
|
---|
87 | +
|
---|
88 | + say "creating Qpdfview makefile"
|
---|
89 | + call qmake
|
---|
90 | +
|
---|
91 | + if qRC = 0 then do
|
---|
92 | + say "building Qpdfview"
|
---|
93 | + if option = "" then do
|
---|
94 | + call make
|
---|
95 | + end
|
---|
96 | + else do
|
---|
97 | + call make 'debug'
|
---|
98 | + end
|
---|
99 | + end
|
---|
100 | +
|
---|
101 | + end
|
---|
102 | +
|
---|
103 | + when command = "INSTALL" then do
|
---|
104 | + say "Executing command: "command
|
---|
105 | +
|
---|
106 | +/* first delete everything */
|
---|
107 | + call deleteall
|
---|
108 | +
|
---|
109 | +/* create the installDir,and the translation subdir */
|
---|
110 | + ok = SysMkDir(installDir)
|
---|
111 | + ok = SysMkDir(installDirT)
|
---|
112 | +
|
---|
113 | +/* copy the exe */
|
---|
114 | + ok = SysCopyObject(buildDir||'\Qpdfview.exe',installDir)
|
---|
115 | +
|
---|
116 | +/* copy all dll */
|
---|
117 | + ok = SysFileTree(buildDir||'\*.dll', rm.,'FOS')
|
---|
118 | + do i = 1 to rm.0
|
---|
119 | + ok = SysCopyObject(rm.i, installDir)
|
---|
120 | + end
|
---|
121 | +
|
---|
122 | +/* copy the readme */
|
---|
123 | + rm.0 = 1
|
---|
124 | + rm.1 = 'install.os2'
|
---|
125 | + do i = 1 to rm.0
|
---|
126 | + cmdtorun = 'sed "s;_VERSION_;' || Qpdfview_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || Qpdfview_build || ';g" >' || installDir || '\' || rm.i
|
---|
127 | + address cmd cmdtorun
|
---|
128 | + end
|
---|
129 | +
|
---|
130 | +/* copy different stuff */
|
---|
131 | + rm.0 = 5
|
---|
132 | + rm.1 = 'CHANGES'
|
---|
133 | + frmDir.1 = os2Dir
|
---|
134 | + toDir.1 = installDir
|
---|
135 | + rm.2 = 'help.html'
|
---|
136 | + frmDir.2 = os2Dir || '\miscellaneous'
|
---|
137 | + toDir.2 = installDirT
|
---|
138 | + rm.3 = popplerDll
|
---|
139 | + frmDir.3 = popplerDir || '\poppler\.libs'
|
---|
140 | + toDir.3 = installDir
|
---|
141 | + rm.4 = popplerDllQt
|
---|
142 | + frmDir.4 = popplerDir || '\qt4\src\.libs'
|
---|
143 | + toDir.4 = installDir
|
---|
144 | + rm.5 = 'tiff.dll'
|
---|
145 | + frmDir.5 = 'e:\trees\libtiff\trunk\libtiff\.libs'
|
---|
146 | + toDir.5 = installDir
|
---|
147 | + do i = 1 to rm.0
|
---|
148 | + cmdtorun = 'copy ' || frmDir.i || '\' || rm.i || ' ' || toDir.i
|
---|
149 | + address cmd cmdtorun
|
---|
150 | + end
|
---|
151 | +
|
---|
152 | +/* create the qm files from ts files */
|
---|
153 | + ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
|
---|
154 | + do i = 1 to rm.0
|
---|
155 | + fileName = filespec('N',rm.i)
|
---|
156 | + fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
|
---|
157 | + cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDirT || '\' || fileName
|
---|
158 | + address cmd cmdtorun
|
---|
159 | + end
|
---|
160 | +
|
---|
161 | +/* zip all dynamic stuff */
|
---|
162 | + ok = directory(installDir)
|
---|
163 | + cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
|
---|
164 | + address cmd cmdtorun
|
---|
165 | + ok = directory(buildDir)
|
---|
166 | +
|
---|
167 | +/* zip all icons */
|
---|
168 | +
|
---|
169 | + end
|
---|
170 | +
|
---|
171 | + when command = "UNINSTALL" then do
|
---|
172 | + say "Executing command: "command
|
---|
173 | +
|
---|
174 | + call deleteall
|
---|
175 | +
|
---|
176 | + end
|
---|
177 | +
|
---|
178 | + otherwise do
|
---|
179 | + say 'Unknown parameter "'command'" - aborting...'
|
---|
180 | + exit 1
|
---|
181 | + end
|
---|
182 | +end
|
---|
183 | +
|
---|
184 | +/* cleanup the mess */
|
---|
185 | +error:
|
---|
186 | +
|
---|
187 | +if qRC = 0 & mRC = 0 then do
|
---|
188 | + ok = SysFileDelete(mOutFile)
|
---|
189 | + ok = SysFileDelete(mErrorFile)
|
---|
190 | + ok = SysFileDelete(qOutFile)
|
---|
191 | + ok = SysFileDelete(qErrorFile)
|
---|
192 | +end
|
---|
193 | +else do
|
---|
194 | + if mRC <> 0 then do
|
---|
195 | + say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
|
---|
196 | + end
|
---|
197 | + if qRC <> 0 then do
|
---|
198 | + say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
|
---|
199 | + end
|
---|
200 | +end
|
---|
201 | +
|
---|
202 | +exit 0
|
---|
203 | +
|
---|
204 | +qmake:
|
---|
205 | + sourceFile = sourceDir || '/qpdfview.pro'
|
---|
206 | + address cmd 'qmake "CONFIG+=without_pkgconfig" "CONFIG+=without_ps" "CONFIG+=without_dbus" "CONFIG+=without_magic" ' sourceFile ' 2>'qErrorFile' 1>'qOutFile
|
---|
207 | +
|
---|
208 | + qRC = RC
|
---|
209 | + if qRC <> 0 then do
|
---|
210 | + call beep 880, 20
|
---|
211 | + say "Alarm! qmake RC="RC
|
---|
212 | + end
|
---|
213 | +return
|
---|
214 | +
|
---|
215 | +make:
|
---|
216 | + makeparm = arg(1)
|
---|
217 | + address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
|
---|
218 | + mRC = RC
|
---|
219 | + if mRC <> 0 then do
|
---|
220 | + call beep 880, 20
|
---|
221 | + say "Alarm! make RC="RC
|
---|
222 | + end
|
---|
223 | +return
|
---|
224 | +
|
---|
225 | +
|
---|
226 | +deleteall: /* delete installDir (including subdirs) except zip files */
|
---|
227 | +
|
---|
228 | + say "Delete all files except *zip in " installDir
|
---|
229 | + ok = SysFileTree(installDir||'\*', rm.,'FOS')
|
---|
230 | + do i = 1 to rm.0
|
---|
231 | + if translate(right(rm.i, 3)) \== 'ZIP' then do
|
---|
232 | + ok = SysFileDelete(rm.i)
|
---|
233 | + end
|
---|
234 | + end
|
---|
235 | +
|
---|
236 | + say "Delete zip file " zipFile
|
---|
237 | + ok = SysFileDelete(zipFile)
|
---|
238 | +
|
---|
239 | + say "Removing subdirs from " || installDir
|
---|
240 | + ok = SysFileTree(installDir||'\*', rm.,'OS')
|
---|
241 | + do i = 1 to rm.0
|
---|
242 | + ok = SysRmDir(rm.i)
|
---|
243 | + end
|
---|
244 | +
|
---|
245 | + call SysSleep(5)
|
---|
246 | +return
|
---|
247 | +
|
---|
248 | +/**
|
---|
249 | + * Fixes the directory path by a) converting all slashes to back
|
---|
250 | + * slashes and b) ensuring that the trailing slash is present if
|
---|
251 | + * the directory is the root directory, and absent otherwise.
|
---|
252 | + *
|
---|
253 | + * @param dir the directory path
|
---|
254 | + * @param noslash
|
---|
255 | + * optional argument. If 1, the path returned will not have a
|
---|
256 | + * trailing slash anyway. Useful for concatenating it with a
|
---|
257 | + * file name.
|
---|
258 | + */
|
---|
259 | +FixDir: procedure expose (Globals)
|
---|
260 | + parse arg dir, noslash
|
---|
261 | + noslash = (noslash = 1)
|
---|
262 | + dir = translate(dir, '\', '/')
|
---|
263 | + if (right(dir, 1) == '\' &,
|
---|
264 | + (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
|
---|
265 | + dir = substr(dir, 1, length(dir) - 1)
|
---|
266 | + return dir
|
---|
267 | +
|
---|
268 | +/**
|
---|
269 | + * reads the version.cpp and gets the Qpdfview version from there
|
---|
270 | + */
|
---|
271 | +version: procedure expose Qpdfview_version Qpdfview_build srcDir
|
---|
272 | +
|
---|
273 | + QpdfviewVer = ' '
|
---|
274 | + /* Qpdfview Version file */
|
---|
275 | + Version = srcDir || "\os2conf.pri"
|
---|
276 | +
|
---|
277 | + do until lines(Version) = 0
|
---|
278 | + verline = linein(Version)
|
---|
279 | + if left(Verline,19) = "APPLICATION_VERSION" then do
|
---|
280 | + parse var verline . ' '. ' ' QpdfviewVer
|
---|
281 | + end
|
---|
282 | + end
|
---|
283 | +
|
---|
284 | + ok = stream(Version,'c','close')
|
---|
285 | + if QpdfviewVer \== ' ' then do
|
---|
286 | + QpdfviewVer = strip(QpdfviewVer,,'"')
|
---|
287 | + parse var QpdfviewVer ver '.' maj '.' min '.' Qpdfview_build
|
---|
288 | + Qpdfview_version = ver || '.'|| maj || '.' || min
|
---|
289 | + end
|
---|
290 | +
|
---|
291 | + return
|
---|
292 | +
|
---|
293 | +help:
|
---|
294 | + say "Parameters:"
|
---|
295 | + say " make"
|
---|
296 | + say " make debug"
|
---|
297 | + say " make clean"
|
---|
298 | + say " install version (version should be found by this script)"
|
---|
299 | + say " uninstall"
|
---|
300 | +exit 255
|
---|
301 | diff -Naur vendor\current/icons/qpdfview.ico trunk/icons/qpdfview.ico
|
---|
302 | --- vendor\current/icons/qpdfview.ico 1970-01-01 01:00:00.000000000 +0100
|
---|
303 | +++ trunk/icons/qpdfview.ico 2013-05-28 16:32:12.000000000 +0200
|
---|
304 | @@ -0,0 +1,23 @@
|
---|
305 | +((š |
---|
306 | F šî |
---|
307 | h((PþþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ |
---|
308 | |
---|
309 | ÿÿÿ
|
---|
310 | +
|
---|
311 | +
|
---|
312 | +
|
---|
313 | +
|
---|
314 | +
|
---|
315 | +
|
---|
316 | +
|
---|
317 | +
|
---|
318 | +
|
---|
319 | +Û |
---|
320 | ÿÿÿ |
---|
321 | |
---|
322 | |
---|
323 | |
---|
324 | |
---|
325 | |
---|
326 | |
---|
327 | |
---|
328 | W |
---|
329 |
|
---|
330 | +ÿÿÿ |
---|
331 | |
---|
332 | ÿÿÿÿ 3333ñ²º
|
---|
333 | |
---|
334 | |
---|
335 | |
---|
336 | XÿÿÿÿÿÌÆ
|
---|
337 | F
|
---|
338 | + |
---|
339 | |
---|
340 | |
---|
341 | Xÿÿÿÿÿÿ |
---|
342 | |
---|
343 |
|
---|
344 | ++C |
---|
345 | ((( |
---|
346 | Wÿÿÿÿÿÿÿ |
---|
347 |
|
---|
348 |
|
---|
349 |
|
---|
350 |
|
---|
351 | + |
---|
352 | ª®s99\5Ø áÿÿÿÿÿÿÿÿ |
---|
353 | bï@?4Z»NQèÿÿÿÿÿÿÿÿ |
---|
354 | |
---|
355 | B@N0°--EP |
---|
356 | _â(ÿÿÿÿÿÿÿÿ |
---|
357 | |
---|
358 | |
---|
359 |
|
---|
360 | hõq0/-7jj7P2JDÿÿÿÿÿÿÿÿ |
---|
361 | |
---|
362 |
|
---|
363 | +DG2c0ŒT7LL5K/8Sÿÿÿÿÿÿÿÿ |
---|
364 |
|
---|
365 | b<üÁ-)£66[E^` |
---|
366 |
|
---|
367 | +ÿÿÿÿÿÿÿÿ |
---|
368 | |
---|
369 | |
---|
370 | lo{)$Ie¬hBÏJ«0xê%ÿÿÿÿÿÿÿÿ `a i'; |
---|
371 | |
---|
372 | '$¹uÈ>%ÿÿÿÿÿÿÿÿ aúwi; |
---|
373 | |
---|
374 | ;',f^cq>kÿÿÿÿÿÿÿÿ ž©oU/I,&&e
|
---|
375 | 6RK?ÎÄ9µÿÿÿÿÿÿÿÿ ÝÙ³=zy,&&,IR[K}=mQÿÿÿÿÿÿÿÿ ŠÊãAnUû' |
---|
376 | |
---|
377 | ',$)E?škþ
|
---|
378 | ÿÿÿÿÿÿÿÿ ÷·óýO¯2) |
---|
379 | € |
---|
380 | &$)/8m5ÿÿÿÿÿÿÿÿ ÚÖp Ž@_J$|$fä<ðJvÿÿÿÿÿÿÿÿ GG]àÀO\<28=Ã>Bÿÿÿÿÿÿÿÿ "*Z:~%STsnåÍDÉËë ÿÿÿÿÿÿÿÿ "YÇrÕ¢gÜA
|
---|
381 | Ôp4 ÿÿÿÿÿÿÿÿ .ör"4]::ßÞ¿ ÿÿÿÿÿÿÿÿ ÂøÐ×Y**""* ÿÿÿÿÿÿÿÿ .ŸæÑ* ÿÿÿÿÿÿÿÿ |
---|
382 | ìÓôç ÿÿÿÿÿÿÿÿ ## |
---|
383 | ÿÿÿÿÿÿÿÿ |
---|
384 | ÿÿÿÿÿÿÿÿ |
---|
385 | ÿÿÿÿÿÿÿÿ |
---|
386 | ÿÿÿÿÿÿÿÿ |
---|
387 | ÿÿÿÿÿÿÿÿ |
---|
388 | ÿÿÿÿÿÿÿÿ |
---|
389 | ÿÿÿÿÿÿÿÿ |
---|
390 | ÿÿÿÿÿÿÿÿ |
---|
391 | ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñÿÿààààààààààààààààààààààààààààààààààààààð?( @þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ |
---|
392 | |
---|
393 | ÿÿÿ |
---|
394 | |
---|
395 | |
---|
396 | |
---|
397 | |
---|
398 | |
---|
399 | |
---|
400 | W |
---|
401 |
|
---|
402 | +ÿÿ |
---|
403 | |
---|
404 | ÿÿÿ 333ñ²
|
---|
405 | |
---|
406 | |
---|
407 | |
---|
408 | ÿÿÿÿÌÆ
|
---|
409 |
|
---|
410 | + |
---|
411 | |
---|
412 | Xÿÿÿÿÿ |
---|
413 |
|
---|
414 |
|
---|
415 |
|
---|
416 | + |
---|
417 | ª®99\5 áÿÿÿÿÿÿ |
---|
418 | bï@4Z»Qèÿÿÿÿÿÿ |
---|
419 | |
---|
420 | @N0--EP_â(ÿÿÿÿÿÿ |
---|
421 | |
---|
422 | |
---|
423 |
|
---|
424 | hq0/7jj72JDÿÿÿÿÿÿ |
---|
425 |
|
---|
426 | b<Á-)66[^`
|
---|
427 | +ÿÿÿÿÿÿ |
---|
428 | |
---|
429 | lo)$I¬hBÏ«0xêÿÿÿÿÿÿ `ai' |
---|
430 | |
---|
431 | '$uÈ>ÿÿÿÿÿÿ awi; |
---|
432 | ;',^cq>ÿÿÿÿÿÿ Ù³=y,&,IR[}=mQÿÿÿÿÿÿ ÊãAnû' |
---|
433 | ',$)?šk
|
---|
434 | ÿÿÿÿÿÿ ·óýO2) |
---|
435 | |
---|
436 | &$)8m5ÿÿÿÿÿÿ GG]àO\<28=ÃBÿÿÿÿÿÿ "*Z~%SsnåÍÉËë ÿÿÿÿÿÿ "YÇÕ¢gA
|
---|
437 | p4 ÿÿÿÿÿÿ .ör"4::ß¿ ÿÿÿÿÿÿ .Ÿæ* ÿÿÿÿÿÿ |
---|
438 | ìÓô ÿÿÿÿÿÿ ## |
---|
439 | ÿÿÿÿÿÿ |
---|
440 | ÿÿÿÿÿÿ |
---|
441 | ÿÿÿÿÿÿ |
---|
442 | ÿÿÿÿÿÿ |
---|
443 | ÿÿÿÿÿÿ |
---|
444 | ÿÿÿÿÿÿ |
---|
445 | ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüùüðàÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀà((àþþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊÿÿÿÿ ÿÿÿÿÿÿ |
---|
446 | |
---|
447 | ÿÿ |
---|
448 | |
---|
449 | |
---|
450 | |
---|
451 | W |
---|
452 | ÿ |
---|
453 | |
---|
454 | ÿÿ + ( ÿÿÿ ï?4»Qÿÿÿ |
---|
455 |
|
---|
456 | õ0-j7Jÿÿÿ bü-£6[ |
---|
457 | ÿÿÿ ` i; |
---|
458 | $È%ÿÿÿ ©o/,&
|
---|
459 | R?ĵÿÿÿ ÊAU' |
---|
460 | ,)?šþÿÿÿ ÚpŽ_$$äðvÿÿÿ "*:%TnÍÉëÿÿÿ ."]:¿ÿÿÿ .Ñÿÿÿ #ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿðÀ
|
---|
461 | +:6:2::6>2>>>6:>:À~( @þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊÿÿÿÿÿÿÿÿ |
---|
462 | |
---|
463 | ÿ |
---|
464 | |
---|
465 | |
---|
466 | |
---|
467 | ÿÿ
|
---|
468 | + |
---|
469 | XÿÿÿïZQÿÿÿ |
---|
470 | h07jJÿÿÿ |
---|
471 | $¬B«xÿÿÿ ai |
---|
472 | '^qÿÿÿ ãn''$?š
|
---|
473 | ÿÿÿ Gà\2=Bÿÿÿ Ç¢
|
---|
474 | pÿÿÿ Ÿæÿÿÿ #ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿàøÀ
|
---|
475 | \ No newline at end of file
|
---|
476 | diff -Naur vendor\current/icons/qpdfview2.ico trunk/icons/qpdfview2.ico
|
---|
477 | --- vendor\current/icons/qpdfview2.ico 1970-01-01 01:00:00.000000000 +0100
|
---|
478 | +++ trunk/icons/qpdfview2.ico 2012-10-29 18:54:00.000000000 +0100
|
---|
479 | @@ -0,0 +1,32 @@
|
---|
480 | +BA(HCI
|
---|
481 | |
---|
482 | (PÿÿÿCI |
---|
483 | ((þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊBA(CIà |
---|
484 | @ÿÿÿCIà |
---|
485 | þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊBA(Ø CI
|
---|
486 | +
|
---|
487 | +à |
---|
488 | (ÿÿÿCI
|
---|
489 | +
|
---|
490 | + |
---|
491 | þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊBA(CI |
---|
492 | |
---|
493 | ÿÿÿCI |
---|
494 | |
---|
495 | þþþêêêâââæææÞÞÞúúúÖÖÖîîîÎÎκººŠŠŠÚÚÚÒÒÒÂÂÂÊÊÊÆÆÆŸŸŸ¢¢¢¶¶¶òòòööö²²²ÚºªªªÒ¶Æº®ðæÞÆÂŸÖ¶ÆÂºæÖÊÞÚÚêÞÖîâÚêææâÒÂÖº®®®êÞÒÚÆ¶ÒºÖŸªÒº¢ºŸŸÆ~êîîÎ²ÖÆºâÖÊÙʺŸzƪ®îæÚŸvºr¢ƊÂ~ÚÖÖÚή²²âÞÞÚʶ¶ººÊ®ÂŸæÚÎÒŸ®Ö²ÖÊŸŸÂÂÆ¢ÞÚÖÚÆ²Ò²âÒÆÞÖÒÖÆ¶ºnÊʲҶÞΟʲƮڟŠÂzκªÆzÞÖÎÖº¢ÞÞÚæÞÒàʺƟºâÚÒîâÖÚÊŸâÞÚººŸ¶fʲ¢Òƺ®¢Î®ÎÂŠÎ¶Š²¶¶ÞªæââîÞÒΪæÖÆÊŠÖŸŠêÚÎÂÊŸʮnnnÖºÚÖÒ¶®æÚÒÞÒÆÆ¢òööÂvÞÆ²Îªҟ¢ÆÞΟrº®ÆÒŸÂªÚòîÞÞ⊪ªÊÎκŠÖºŠÎ²¢êÞÎÆÆÂÚÆ®Òêæº²ªÎº®âζ¢¢Ÿ²¢âÖÆòêâκ¢²ª¢ÂÆÆŸz¢êæâÒŸŠæÞÖ¶fÚÎÆŸÚ®ÂÂÆæêê²®ªÞÒÎââÞÚÚÖªº¶²âʶÆÊÊΪҟªÂÖÆÆ®ÒÒÎÖªΟ¢ºnŸvÞââÆÎ¶Ö²ÖÖÒ~Ÿ¶®âææÚÒÆÂ¢Ö¶îööÆæÚÆº²ŸÒÆ®ªªÊ²²ÒîææÞÚv¶ÒÎÊ®Š¢ºŠº®¢rrrζ¢¢Î¶ÎŸ®âòòÂʶêêæª®®Æª¶²®Êª²²¶ÆÆÊÆŠºjêêîÆÂŠŸÖÊÂ~Öîê¶®ŠÆÞÒâÎºÞÆ¶Î®ŸººÎÊÊÿÿñÿÿààààààààààààààààààààààààààààààààààààààð?ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ |
---|
496 | |
---|
497 | ÿÿÿ
|
---|
498 | +
|
---|
499 | +
|
---|
500 | +
|
---|
501 | +
|
---|
502 | +
|
---|
503 | +
|
---|
504 | +
|
---|
505 | +
|
---|
506 | +
|
---|
507 | +Û |
---|
508 | ÿÿÿ |
---|
509 | |
---|
510 | |
---|
511 | |
---|
512 | |
---|
513 | |
---|
514 | |
---|
515 | |
---|
516 | W |
---|
517 |
|
---|
518 | +ÿÿÿ |
---|
519 | |
---|
520 | ÿÿÿÿ 3333ñ²º
|
---|
521 | |
---|
522 | |
---|
523 | |
---|
524 | XÿÿÿÿÿÌÆ
|
---|
525 | F
|
---|
526 | + |
---|
527 | |
---|
528 | |
---|
529 | Xÿÿÿÿÿÿ |
---|
530 | |
---|
531 |
|
---|
532 | ++C |
---|
533 | ((( |
---|
534 | Wÿÿÿÿÿÿÿ |
---|
535 |
|
---|
536 |
|
---|
537 |
|
---|
538 |
|
---|
539 | + |
---|
540 | ª®s99\5Ø áÿÿÿÿÿÿÿÿ |
---|
541 | bï@?4Z»NQèÿÿÿÿÿÿÿÿ |
---|
542 | |
---|
543 | B@N0°--EP |
---|
544 | _â(ÿÿÿÿÿÿÿÿ |
---|
545 | |
---|
546 | |
---|
547 |
|
---|
548 | hõq0/-7jj7P2JDÿÿÿÿÿÿÿÿ |
---|
549 | |
---|
550 |
|
---|
551 | +DG2c0ŒT7LL5K/8Sÿÿÿÿÿÿÿÿ |
---|
552 |
|
---|
553 | b<üÁ-)£66[E^` |
---|
554 |
|
---|
555 | +ÿÿÿÿÿÿÿÿ |
---|
556 | |
---|
557 | |
---|
558 | lo{)$Ie¬hBÏJ«0xê%ÿÿÿÿÿÿÿÿ `a i'; |
---|
559 | |
---|
560 | '$¹uÈ>%ÿÿÿÿÿÿÿÿ aúwi; |
---|
561 | |
---|
562 | ;',f^cq>kÿÿÿÿÿÿÿÿ ž©oU/I,&&e
|
---|
563 | 6RK?ÎÄ9µÿÿÿÿÿÿÿÿ ÝÙ³=zy,&&,IR[K}=mQÿÿÿÿÿÿÿÿ ŠÊãAnUû' |
---|
564 | |
---|
565 | ',$)E?škþ
|
---|
566 | ÿÿÿÿÿÿÿÿ ÷·óýO¯2) |
---|
567 | € |
---|
568 | &$)/8m5ÿÿÿÿÿÿÿÿ ÚÖp Ž@_J$|$fä<ðJvÿÿÿÿÿÿÿÿ GG]àÀO\<28=Ã>Bÿÿÿÿÿÿÿÿ "*Z:~%STsnåÍDÉËë ÿÿÿÿÿÿÿÿ "YÇrÕ¢gÜA
|
---|
569 | Ôp4 ÿÿÿÿÿÿÿÿ .ör"4]::ßÞ¿ ÿÿÿÿÿÿÿÿ ÂøÐ×Y**""* ÿÿÿÿÿÿÿÿ .ŸæÑ* ÿÿÿÿÿÿÿÿ |
---|
570 | ìÓôç ÿÿÿÿÿÿÿÿ ## |
---|
571 | ÿÿÿÿÿÿÿÿ |
---|
572 | ÿÿÿÿÿÿÿÿ |
---|
573 | ÿÿÿÿÿÿÿÿ |
---|
574 | ÿÿÿÿÿÿÿÿ |
---|
575 | ÿÿÿÿÿÿÿÿ |
---|
576 | ÿÿÿÿÿÿÿÿ |
---|
577 | ÿÿÿÿÿÿÿÿ |
---|
578 | ÿÿÿÿÿÿÿÿ |
---|
579 | ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüùüðàÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀÀàÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ |
---|
580 | |
---|
581 | ÿÿÿ |
---|
582 | |
---|
583 | |
---|
584 | |
---|
585 | |
---|
586 | |
---|
587 | |
---|
588 | W |
---|
589 |
|
---|
590 | +ÿÿ |
---|
591 | |
---|
592 | ÿÿÿ 333ñ²
|
---|
593 | |
---|
594 | |
---|
595 | |
---|
596 | ÿÿÿÿÌÆ
|
---|
597 |
|
---|
598 | + |
---|
599 | |
---|
600 | Xÿÿÿÿÿ |
---|
601 |
|
---|
602 |
|
---|
603 |
|
---|
604 | + |
---|
605 | ª®99\5 áÿÿÿÿÿÿ |
---|
606 | bï@4Z»Qèÿÿÿÿÿÿ |
---|
607 | |
---|
608 | @N0--EP_â(ÿÿÿÿÿÿ |
---|
609 | |
---|
610 | |
---|
611 |
|
---|
612 | hq0/7jj72JDÿÿÿÿÿÿ |
---|
613 |
|
---|
614 | b<Á-)66[^`
|
---|
615 | +ÿÿÿÿÿÿ |
---|
616 | |
---|
617 | lo)$I¬hBÏ«0xêÿÿÿÿÿÿ `ai' |
---|
618 | |
---|
619 | '$uÈ>ÿÿÿÿÿÿ awi; |
---|
620 | ;',^cq>ÿÿÿÿÿÿ Ù³=y,&,IR[}=mQÿÿÿÿÿÿ ÊãAnû' |
---|
621 | ',$)?šk
|
---|
622 | ÿÿÿÿÿÿ ·óýO2) |
---|
623 | |
---|
624 | &$)8m5ÿÿÿÿÿÿ GG]àO\<28=ÃBÿÿÿÿÿÿ "*Z~%SsnåÍÉËë ÿÿÿÿÿÿ "YÇÕ¢gA
|
---|
625 | p4 ÿÿÿÿÿÿ .ör"4::ß¿ ÿÿÿÿÿÿ .Ÿæ* ÿÿÿÿÿÿ |
---|
626 | ìÓô ÿÿÿÿÿÿ ## |
---|
627 | ÿÿÿÿÿÿ |
---|
628 | ÿÿÿÿÿÿ |
---|
629 | ÿÿÿÿÿÿ |
---|
630 | ÿÿÿÿÿÿ |
---|
631 | ÿÿÿÿÿÿ |
---|
632 | ÿÿÿÿÿÿ |
---|
633 | ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿîÎ
|
---|
634 | +Š
|
---|
635 | +ÚÒÊÆ¢¶ò²
|
---|
636 | +
|
---|
637 | +ª¶
|
---|
638 | +®ðÀ
|
---|
639 | +ÆÖ:Ú6î:æ2Â:®:Þ6¶>Ö2º>Ÿ>ê>²6º:Ù>:À~îÿÿÿÿ ÿÿÿÿÿÿ |
---|
640 | |
---|
641 | ÿÿ |
---|
642 | |
---|
643 | |
---|
644 | |
---|
645 | W |
---|
646 | ÿ |
---|
647 | |
---|
648 | ÿÿ + ( ÿÿÿ ï?4»Qÿÿÿ |
---|
649 |
|
---|
650 | õ0-j7Jÿÿÿ bü-£6[ |
---|
651 | ÿÿÿ ` i; |
---|
652 | $È%ÿÿÿ ©o/,&
|
---|
653 | R?ĵÿÿÿ ÊAU' |
---|
654 | ,)?šþÿÿÿ ÚpŽ_$$äðvÿÿÿ "*:%TnÍÉëÿÿÿ ."]:¿ÿÿÿ .Ñÿÿÿ #ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÆŸÚÂÂÆê²ÞÒâÞÖªº¶Ê¶ÊÎÒŸÆÆÒÒÂªàøŸâÆÖ²ÖÒ~ŸâæÒÆÖîöæÚ²Ÿ®ª²ÀÒÿÿÿÿÿÿÿÿ |
---|
655 | |
---|
656 | ÿ |
---|
657 | |
---|
658 | |
---|
659 | |
---|
660 | ÿÿ
|
---|
661 | + |
---|
662 | XÿÿÿïZQÿÿÿ |
---|
663 | h07jJÿÿÿ |
---|
664 | $¬B«xÿÿÿ ai |
---|
665 | '^qÿÿÿ ãn''$?š
|
---|
666 | ÿÿÿ Gà\2=Bÿÿÿ Ç¢
|
---|
667 | pÿÿÿ Ÿæÿÿÿ #ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
|
---|
668 | \ No newline at end of file
|
---|
669 | diff -Naur vendor\current/install.os2 trunk/install.os2
|
---|
670 | --- vendor\current/install.os2 1970-01-01 01:00:00.000000000 +0100
|
---|
671 | +++ trunk/install.os2 2013-05-27 16:13:20.000000000 +0200
|
---|
672 | @@ -0,0 +1,264 @@
|
---|
673 | +Qpdfview _VERSION_ _BUILD_ installation
|
---|
674 | +
|
---|
675 | +
|
---|
676 | +0. CONTENTS OF THIS FILE
|
---|
677 | +========================
|
---|
678 | +
|
---|
679 | +1. INTRODUCTION
|
---|
680 | +
|
---|
681 | +2. REQUIREMENTS
|
---|
682 | +
|
---|
683 | +3. INSTALLATION
|
---|
684 | +
|
---|
685 | +4. BUGREPORTS
|
---|
686 | +
|
---|
687 | +5. CREDITS
|
---|
688 | +
|
---|
689 | +6. SUPPORT AND DONATIONS
|
---|
690 | +
|
---|
691 | +7. HISTORY
|
---|
692 | +
|
---|
693 | +
|
---|
694 | +1. INTRODUCTION
|
---|
695 | +===============
|
---|
696 | +
|
---|
697 | +Welcome to Qpdfview _VERSION_ _BUILD_ port for OS/2 and eComStation.
|
---|
698 | +
|
---|
699 | +
|
---|
700 | +2. REQUIREMENTS
|
---|
701 | +===============
|
---|
702 | +
|
---|
703 | +The following requirements need to be installed.
|
---|
704 | +
|
---|
705 | +
|
---|
706 | +2.1 kLIBC, GCC4Core, Qt4, Zlib, cups
|
---|
707 | +------------------------------------
|
---|
708 | +
|
---|
709 | +The installation of these products can be done either by RPM or ZIP files.
|
---|
710 | +
|
---|
711 | +2.1.a RPM installation
|
---|
712 | +----------------------
|
---|
713 | +
|
---|
714 | +kLIBC
|
---|
715 | +-----
|
---|
716 | +
|
---|
717 | + 1. yum install libc
|
---|
718 | +
|
---|
719 | +GCC4Core
|
---|
720 | +--------
|
---|
721 | +
|
---|
722 | + 1. yum install libgcc4*
|
---|
723 | + 2. yum install gcc-stack-protector
|
---|
724 | + 3. yum install gcc-stdc++-shared-library
|
---|
725 | + 4. yum install gcc-supc++-shared-library
|
---|
726 | +
|
---|
727 | +Qt4 dll
|
---|
728 | +-------
|
---|
729 | +
|
---|
730 | + 1. yum install libqt4
|
---|
731 | + 2. Install the xsystray plugin as noted in the readme.os2 and also in
|
---|
732 | + readme.xsystray
|
---|
733 | +
|
---|
734 | +Zlib
|
---|
735 | +----
|
---|
736 | +
|
---|
737 | + 1. yum install zlib
|
---|
738 | +
|
---|
739 | +Jpeg
|
---|
740 | +----
|
---|
741 | +
|
---|
742 | + 1. yum install libjpeg
|
---|
743 | +
|
---|
744 | +djvulibre
|
---|
745 | +---------
|
---|
746 | +
|
---|
747 | + not available as a rpm at this time of writing
|
---|
748 | +
|
---|
749 | +cups
|
---|
750 | +----
|
---|
751 | +
|
---|
752 | + not available as a rpm at this time of writing
|
---|
753 | +
|
---|
754 | +freetype/fontconfig
|
---|
755 | +-------------------
|
---|
756 | +
|
---|
757 | + not available as a rpm at this time of writing
|
---|
758 | +
|
---|
759 | +pthread
|
---|
760 | +-------
|
---|
761 | +
|
---|
762 | + 1. yum install pthread
|
---|
763 | +
|
---|
764 | +
|
---|
765 | +2.1.b ZIP Installation
|
---|
766 | +----------------------
|
---|
767 | +
|
---|
768 | +kLIBC
|
---|
769 | +-----
|
---|
770 | +
|
---|
771 | + 1. Download kLIBC 0.6.5 or better (see http://svn.netlabs.org/libc for more
|
---|
772 | + information)
|
---|
773 | + 2. Install the files to your libpath eg x:\ecs\dll
|
---|
774 | +
|
---|
775 | +GCC4Core
|
---|
776 | +--------
|
---|
777 | +
|
---|
778 | + 1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
|
---|
779 | + 2. Install the files to your libpath eg. x:\ecs\dll
|
---|
780 | +
|
---|
781 | +Qt4 dll
|
---|
782 | +-------
|
---|
783 | +
|
---|
784 | + 1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more
|
---|
785 | + information)
|
---|
786 | + 2. Install the files according to the readme
|
---|
787 | + 3. Install the xsystray plugin as noted in the readme.os2 and also in
|
---|
788 | + readme.xsystray
|
---|
789 | +
|
---|
790 | +Zlib
|
---|
791 | +----
|
---|
792 | +
|
---|
793 | + 1. Download zlib from http://rpm.netlabs.org/release/00/zip
|
---|
794 | + 2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
|
---|
795 | +
|
---|
796 | +Jpeg
|
---|
797 | +----
|
---|
798 | +
|
---|
799 | + 1. Download jpeg from http://rpm.netlabs.org/release/00/zip
|
---|
800 | + 2. Unpack and install jpeg.dll to your libpath eg. x:\ecs\dll
|
---|
801 | +
|
---|
802 | +djvulibre
|
---|
803 | +---------
|
---|
804 | +
|
---|
805 | + 1. Download djvulibre from ftp://ftp.netlabs.org/pub/unixos2/djvulibre-3_5_25.zip
|
---|
806 | + 2. Unpack and install djvu.dll to your libpath eg. x:\ecs\dll
|
---|
807 | +
|
---|
808 | +cups
|
---|
809 | +----
|
---|
810 | +
|
---|
811 | + 1. Go to eCUPS wiki to see how to install eCUPS (http://svn.netlabs.org/ecups)
|
---|
812 | + 2. Install eCUPS according to the above wiki
|
---|
813 | +
|
---|
814 | +freetype/fontconfig
|
---|
815 | +-------------------
|
---|
816 | +
|
---|
817 | + 1. Download MZFNTCFGFT_RUNTIME as zip or wpi from
|
---|
818 | + ftp://ftp.netlabs.org/incoming/mozilla
|
---|
819 | + 2. Unpack and install it to your libpath eg. x:\ecs\dll
|
---|
820 | +
|
---|
821 | +pthread
|
---|
822 | +-------
|
---|
823 | +
|
---|
824 | + 1. Download pthread from http://rpm.netlabs.org/release/00/zip
|
---|
825 | + 2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
|
---|
826 | +
|
---|
827 | +
|
---|
828 | +3. INSTALLATION
|
---|
829 | +===============
|
---|
830 | +
|
---|
831 | +To install qpdfview, do the following:
|
---|
832 | +
|
---|
833 | + 1. Create a directory for qpdfview.
|
---|
834 | + 2. Extract the qpdfview package to the new directory.
|
---|
835 | + 3. Create a WPS object for qdpfview.exe.
|
---|
836 | + 4. Start qdpfview
|
---|
837 | + 5. Happy using it
|
---|
838 | +
|
---|
839 | +
|
---|
840 | +4. BUGREPORTS
|
---|
841 | +=============
|
---|
842 | +
|
---|
843 | +Please create bugreports at http://svn.netlabs.org/qtapps
|
---|
844 | +Only bug reports with a reproducable bug are accepted. :-)
|
---|
845 | +
|
---|
846 | +
|
---|
847 | +5. CREDITS
|
---|
848 | +==========
|
---|
849 | +
|
---|
850 | +The port was done by:
|
---|
851 | +
|
---|
852 | +Silvan Scherrer aka _diver
|
---|
853 | +
|
---|
854 | +Thanks go to:
|
---|
855 | +
|
---|
856 | + * Dmitriy Kuminov
|
---|
857 | +
|
---|
858 | +They either helped me when I had some nasty questions or did some testing for
|
---|
859 | +me.
|
---|
860 | +
|
---|
861 | +
|
---|
862 | +6. SUPPORT AND DONATIONS
|
---|
863 | +========================
|
---|
864 | +
|
---|
865 | +qpdfview port is based on volunteer work. If you would like to support further
|
---|
866 | +development, you can do so in one of the following ways:
|
---|
867 | +
|
---|
868 | +
|
---|
869 | + * Donate to the Qt4 project: see qt.netlabs.org for more information
|
---|
870 | +
|
---|
871 | + * Contribute to the project: Besides actual development, this also includes
|
---|
872 | + maintaining the documentation and the project web site as well as help
|
---|
873 | + for users.
|
---|
874 | +
|
---|
875 | +
|
---|
876 | +7. HISTORY
|
---|
877 | +==========
|
---|
878 | +
|
---|
879 | +2013-05-27
|
---|
880 | +
|
---|
881 | + * updated to latest qpdfview 0.4.3 source
|
---|
882 | +
|
---|
883 | +2013-05-14
|
---|
884 | +
|
---|
885 | + * updated to latest qpdfview 0.4.3 beta source
|
---|
886 | +
|
---|
887 | +2013-04-25
|
---|
888 | +
|
---|
889 | + * updated to latest poppler 0.22.3
|
---|
890 | +
|
---|
891 | +2013-04-19
|
---|
892 | +
|
---|
893 | + * updated to latest qpdfview 0.4.2 beta source
|
---|
894 | +
|
---|
895 | +2013-03-25
|
---|
896 | +
|
---|
897 | + * updated to latest qpdfview 0.4.1 source
|
---|
898 | +
|
---|
899 | +2013-03-20
|
---|
900 | +
|
---|
901 | + * updated to latest qpdfview 0.4.1 beta source
|
---|
902 | +
|
---|
903 | +2013-02-19
|
---|
904 | +
|
---|
905 | + * updated to latest qpdfview 0.4.0 source
|
---|
906 | +
|
---|
907 | +2013-02-12
|
---|
908 | +
|
---|
909 | + * updated to latest qpdfview 0.4.0 beta1 source
|
---|
910 | +
|
---|
911 | +2013-02-06
|
---|
912 | +
|
---|
913 | + * updated to latest qpdfview 0.3.7 source
|
---|
914 | +
|
---|
915 | +2013-01-14
|
---|
916 | +
|
---|
917 | + * updated to latest poppler 0.22.0
|
---|
918 | +
|
---|
919 | +2012-12-13
|
---|
920 | +
|
---|
921 | + * updated to latest qpdfview 0.3.7 beta 1 source
|
---|
922 | +
|
---|
923 | +2012-11-27
|
---|
924 | +
|
---|
925 | + * updated to latest qpdfview source
|
---|
926 | +
|
---|
927 | +2012-10-29
|
---|
928 | +
|
---|
929 | + * created install.os2
|
---|
930 | + * updated qpdfview to contain a icon (thx Herwig)
|
---|
931 | +
|
---|
932 | +2012-10-24
|
---|
933 | +
|
---|
934 | + * first public port
|
---|
935 | +
|
---|
936 | +
|
---|
937 | diff -Naur vendor\current/miscellaneous/qpdfview.desktop trunk/miscellaneous/qpdfview.desktop
|
---|
938 | --- vendor\current/miscellaneous/qpdfview.desktop 1970-01-01 01:00:00.000000000 +0100
|
---|
939 | +++ trunk/miscellaneous/qpdfview.desktop 2013-05-27 19:29:58.000000000 +0200
|
---|
940 | @@ -0,0 +1,10 @@
|
---|
941 | +[Desktop Entry]
|
---|
942 | +Type=Application
|
---|
943 | +Terminal=false
|
---|
944 | +Name=qpdfview
|
---|
945 | +Icon=/usr/share/qpdfview/qpdfview.svg
|
---|
946 | +GenericName=PDF viewer
|
---|
947 | +Comment=A tabbed PDF viewer using the poppler library.
|
---|
948 | +Categories=Viewer;Office;
|
---|
949 | +Exec=qpdfview --unique %F
|
---|
950 | +MimeType=application/pdf;application/x-pdf;text/pdf;text/x-pdf;image/pdf;image/x-pdf;image/vnd.djvu;image/x-djvu;
|
---|
951 | diff -Naur vendor\current/os2conf.pri trunk/os2conf.pri
|
---|
952 | --- vendor\current/os2conf.pri 1970-01-01 01:00:00.000000000 +0100
|
---|
953 | +++ trunk/os2conf.pri 2013-05-27 16:13:32.000000000 +0200
|
---|
954 | @@ -0,0 +1,22 @@
|
---|
955 | +APPLICATION_VERSION = 0.4.3.GA
|
---|
956 | +
|
---|
957 | +#define the djvu part
|
---|
958 | +DJVU_LIBS += -Le:/trees/djvulibre/trunk/libdjvu/.libs
|
---|
959 | +DJVU_LIBS += djvulibre
|
---|
960 | +DJVU_INCLUDEPATH += e:/trees/djvulibre/trunk
|
---|
961 | +DJVU_PLUGIN = qpdfdjvu
|
---|
962 | +DJVU_PLUGIN_NAME = $$DJVU_PLUGIN".dll"
|
---|
963 | +
|
---|
964 | +# define the poppler part
|
---|
965 | +PDF_DEFINES += HAS_POPPLER_14 HAS_POPPLER_18 HAS_POPPLER_20 HAS_POPPLER_22
|
---|
966 | +PDF_LIBS += -Le:/trees/poppler/trunk/qt4/src/.libs
|
---|
967 | +PDF_LIBS += popplerqt4
|
---|
968 | +PDF_INCLUDEPATH += e:/trees/poppler/trunk/qt4/src
|
---|
969 | +PDF_PLUGIN = qpdfpdf
|
---|
970 | +PDF_PLUGIN_NAME = $$PDF_PLUGIN".dll"
|
---|
971 | +
|
---|
972 | +DEF_FILE_VENDOR = bww bitwise works GmbH
|
---|
973 | +DEF_FILE_VERSION = $$APPLICATION_VERSION
|
---|
974 | +DEF_FILE_DESCRIPTION = eCS (OS/2) port of qpdfview by Adam Reichold
|
---|
975 | +
|
---|
976 | +
|
---|
977 | diff -Naur vendor\current/qpdfview_os2.rc trunk/qpdfview_os2.rc
|
---|
978 | --- vendor\current/qpdfview_os2.rc 1970-01-01 01:00:00.000000000 +0100
|
---|
979 | +++ trunk/qpdfview_os2.rc 2012-10-29 16:47:48.000000000 +0100
|
---|
980 | @@ -0,0 +1 @@
|
---|
981 | +ICON 1 DISCARDABLE "icons\qpdfview2.ico"
|
---|
982 | diff -Naur vendor\current/qpdfview-application.pro trunk/qpdfview-application.pro
|
---|
983 | --- vendor\current/qpdfview-application.pro 2013-05-12 08:47:04.000000000 +0200
|
---|
984 | +++ trunk/qpdfview-application.pro 2013-05-28 16:34:26.000000000 +0200
|
---|
985 | @@ -134,7 +134,8 @@
|
---|
986 |
|
---|
987 | !without_cups {
|
---|
988 | DEFINES += WITH_CUPS
|
---|
989 | - LIBS += $$system(cups-config --libs)
|
---|
990 | + !os2:LIBS += $$system(cups-config --libs)
|
---|
991 | + os2:LIBS += cups
|
---|
992 | }
|
---|
993 |
|
---|
994 | !without_synctex {
|
---|
995 | @@ -180,3 +181,7 @@
|
---|
996 | manual.path = $${MANUAL_INSTALL_PATH}
|
---|
997 |
|
---|
998 | INSTALLS += target data launcher manual
|
---|
999 | +
|
---|
1000 | +# ressource files
|
---|
1001 | +os2:RC_FILE = qpdfview_os2.rc
|
---|
1002 | +win:RC_FILE = qpdfview.rc
|
---|
1003 | diff -Naur vendor\current/qpdfview-djvu-plugin.pro trunk/qpdfview-djvu-plugin.pro
|
---|
1004 | --- vendor\current/qpdfview-djvu-plugin.pro 2013-04-07 08:46:02.000000000 +0200
|
---|
1005 | +++ trunk/qpdfview-djvu-plugin.pro 2013-05-27 19:27:24.000000000 +0200
|
---|
1006 | @@ -5,6 +5,14 @@
|
---|
1007 | CONFIG += plugin
|
---|
1008 | static_djvu_plugin:CONFIG += static
|
---|
1009 |
|
---|
1010 | +os2 {
|
---|
1011 | +#define the djvu part
|
---|
1012 | +DESTDIR = lib
|
---|
1013 | +LIBS += $$DJVU_LIBS
|
---|
1014 | +INCLUDEPATH += $$DJVU_INCLUDEPATH
|
---|
1015 | +TARGET_SHORT = $$DJVU_PLUGIN
|
---|
1016 | +}
|
---|
1017 | +
|
---|
1018 | OBJECTS_DIR = objects-djvu
|
---|
1019 | MOC_DIR = moc-dvju
|
---|
1020 |
|
---|
1021 | diff -Naur vendor\current/qpdfview-pdf-plugin.pro trunk/qpdfview-pdf-plugin.pro
|
---|
1022 | --- vendor\current/qpdfview-pdf-plugin.pro 2013-04-07 08:46:02.000000000 +0200
|
---|
1023 | +++ trunk/qpdfview-pdf-plugin.pro 2013-05-27 19:26:40.000000000 +0200
|
---|
1024 | @@ -5,6 +5,15 @@
|
---|
1025 | CONFIG += plugin
|
---|
1026 | static_pdf_plugin:CONFIG += static
|
---|
1027 |
|
---|
1028 | +os2 {
|
---|
1029 | +# define the poppler part
|
---|
1030 | +DESTDIR = lib
|
---|
1031 | +DEFINES += $$PDF_DEFINES
|
---|
1032 | +LIBS += $$PDF_LIBS
|
---|
1033 | +INCLUDEPATH += $$PDF_INCLUDEPATH
|
---|
1034 | +TARGET_SHORT = $$PDF_PLUGIN
|
---|
1035 | +}
|
---|
1036 | +
|
---|
1037 | OBJECTS_DIR = objects-pdf
|
---|
1038 | MOC_DIR = moc-pdf
|
---|
1039 |
|
---|
1040 | diff -Naur vendor\current/qpdfview.pri trunk/qpdfview.pri
|
---|
1041 | --- vendor\current/qpdfview.pri 2013-05-26 10:32:10.000000000 +0200
|
---|
1042 | +++ trunk/qpdfview.pri 2013-05-27 16:08:10.000000000 +0200
|
---|
1043 | @@ -1,3 +1,4 @@
|
---|
1044 | +os2:include(os2conf.pri)
|
---|
1045 | isEmpty(APPLICATION_VERSION):APPLICATION_VERSION = 0.4.3
|
---|
1046 |
|
---|
1047 | isEmpty(TARGET_INSTALL_PATH):TARGET_INSTALL_PATH = /usr/bin
|
---|
1048 | diff -Naur vendor\current/qpdfview.rc trunk/qpdfview.rc
|
---|
1049 | --- vendor\current/qpdfview.rc 1970-01-01 01:00:00.000000000 +0100
|
---|
1050 | +++ trunk/qpdfview.rc 2013-05-28 16:25:38.000000000 +0200
|
---|
1051 | @@ -0,0 +1 @@
|
---|
1052 | +IDI_ICON1 ICON DISCARDABLE "icons/qpdfview.ico"
|
---|
1053 | diff -Naur vendor\current/synctex/synctex_parser_utils.c trunk/synctex/synctex_parser_utils.c
|
---|
1054 | --- vendor\current/synctex/synctex_parser_utils.c 2013-03-24 14:30:12.000000000 +0100
|
---|
1055 | +++ trunk/synctex/synctex_parser_utils.c 2013-03-20 17:08:22.000000000 +0100
|
---|
1056 | @@ -57,6 +57,10 @@
|
---|
1057 | #define SYNCTEX_WINDOWS 1
|
---|
1058 | #endif
|
---|
1059 |
|
---|
1060 | +#if defined(__OS2__)
|
---|
1061 | +#define SYNCTEX_OS2 1
|
---|
1062 | +#endif
|
---|
1063 | +
|
---|
1064 | #ifdef _WIN32_WINNT_WINXP
|
---|
1065 | #define SYNCTEX_RECENT_WINDOWS 1
|
---|
1066 | #endif
|
---|
1067 | @@ -121,7 +125,7 @@
|
---|
1068 | last_component = next+1;
|
---|
1069 | }
|
---|
1070 | }
|
---|
1071 | -# ifdef SYNCTEX_WINDOWS
|
---|
1072 | +# if defined(SYNCTEX_WINDOWS) || defined (SYNCTEX_OS2)
|
---|
1073 | /* On Windows, the '\' is also a path separator. */
|
---|
1074 | while((next = strstr(last_component,"\\"))){
|
---|
1075 | last_component = next+1;
|
---|
1076 | @@ -207,7 +211,7 @@
|
---|
1077 | if(!strlen(name)) {
|
---|
1078 | return synctex_NO;
|
---|
1079 | }
|
---|
1080 | -# if SYNCTEX_WINDOWS
|
---|
1081 | +# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2)
|
---|
1082 | if(strlen(name)>2) {
|
---|
1083 | return (name[1]==':' && SYNCTEX_IS_PATH_SEPARATOR(name[2]))?synctex_YES:synctex_NO;
|
---|
1084 | }
|
---|
1085 | diff -Naur vendor\current/synctex/synctex_parser_utils.h trunk/synctex/synctex_parser_utils.h
|
---|
1086 | --- vendor\current/synctex/synctex_parser_utils.h 2013-03-24 14:30:12.000000000 +0100
|
---|
1087 | +++ trunk/synctex/synctex_parser_utils.h 2013-03-20 17:11:20.000000000 +0100
|
---|
1088 | @@ -64,7 +64,7 @@
|
---|
1089 | #define FALSE 0
|
---|
1090 | #define TRUE !FALSE
|
---|
1091 |
|
---|
1092 | -# if _WIN32
|
---|
1093 | +# if defined(_WIN32) || defined(__OS2__)
|
---|
1094 | # define SYNCTEX_CASE_SENSITIVE_PATH FALSE
|
---|
1095 | # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c)
|
---|
1096 | # else
|
---|
1097 | @@ -72,7 +72,7 @@
|
---|
1098 | # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
|
---|
1099 | # endif
|
---|
1100 |
|
---|
1101 | -# if _WIN32
|
---|
1102 | +# if defined(_WIN32) || defined(__OS2__)
|
---|
1103 | # define SYNCTEX_IS_DOT(c) ('.' == c)
|
---|
1104 | # else
|
---|
1105 | # define SYNCTEX_IS_DOT(c) ('.' == c)
|
---|