source: diffs/djview4_4.8.diff@ 146

diff -Naur vendor\current/readme.os2 trunk/readme.os2
--- vendor\current/readme.os2   1970-01-01 01:00:00.000000000 +0100
+++ trunk/readme.os2    2013-05-27 15:35:12.000000000 +0200
@@ -0,0 +1,170 @@
+DjView4 4.8 README 25.03.2013
+
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. INTRODUCTION
+
+2. REQUIREMENTS
+
+3. INSTALLATION
+
+4. LICENSE, COPYRIGHT, DISCLAIMER
+
+5. CONTACT
+
+6. CREDITS
+
+7. SUPPORT AND DONATIONS
+
+8. HISTORY
+
+
+1. INTRODUCTION
+===============
+
+Welcome to DjView4 4.8 port for OS/2 and eComStation.
+
+
+
+2. REQUIREMENTS
+===============
+
+* klibc 0.6.5 or later
+
+    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_5-csd5.wpi
+
+* djvulibre
+
+    ftp://ftp.netlabs.org/pub/unixos2/djvulibre-3_5_25.zip
+
+* jpeg
+
+    ftp://ftp.netlabs.org/pub/unixos2/libjpeg.zip
+
+* Qt4 dll
+
+    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+
+* Cups
+
+    see http://svn.netlabs.org/ecups for more information
+
+* pthread
+
+    http://rpm.netlabs.org/release/00/zip/pthread-20120924-11_oc00.zip
+
+
+3. INSTALLATION
+===============
+          
+To install DjView4, do the following:
+
+klibc
+-----
+
+  1. Download klibc 0.6.3 csd3 or later.
+  2. Install the package by double-clicking on the WPI file.
+
+
+Qt4 dll
+-------
+
+  1. Download the zip or rpm and follow the instructions
+
+
+Cups
+----
+
+  1. Download the latest cups version which is 1.4.8 or better
+  2. Install it and be sure to put the cups.dll somewhere to your path 
+
+
+DjView4
+-------
+
+  1. Create a directory for DjView4.
+  2. Extract the DjView4 package to the new directory.
+  3. Create a WPS object for djview.exe.
+  4. Start djview
+  5. Enjoy the app :)
+  
+
+
+4. LICENSE, COPYRIGHT, DISCLAIMER
+=================================
+
+see COPYRIGHT and COPYING
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+5. CONTACT
+==========
+
+if you find a bug, then add a ticket to the trac at http://svn.netlabs.org/qtapps
+
+
+
+6. CREDITS
+==========
+
+The port was done by:
+
+Silvan Scherrer aka _diver
+
+Thanks go to:
+
+  * Dmitry A. Kuminov
+  * Oliver Cremer
+
+They either helped me when I had some nasty questions or did some testing for
+me.
+
+
+7. SUPPORT AND DONATIONS
+========================
+
+DjView4 is based on volunteer work. If you would like to support further
+development, you can do so in one of the following ways:
+
+
+  * Donate to the Qt4 project: see qt.netlabs.org for more information
+
+  * Contribute to the project: Besides actual development, this also includes
+    maintaining the documentation and the project web site as well as help
+    for users.
+
+
+8. HISTORY
+==========
+
+2013-03-25
+
+  * updated to djviewlibre 3.5.25 code
+
+2011-09-27
+
+  * updated to 4.8 code level of djview
+  * updated to djviewlibre 3.5.24
+  * updated to Qt 4.7.3
+  * cups >= 1.4.8 required
+
+2010-10-13
+
+  * added printing support
+
+2010-09-02
+
+  * updated to 4.6 code level of djview
+  * updated to 3.5.23 code level of djvulibre
+
+2010-09-01
+
+  * initial port
+
diff -Naur vendor\current/src/djview_os2.rc trunk/src/djview_os2.rc
--- vendor\current/src/djview_os2.rc    1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/djview_os2.rc     2010-09-02 16:19:00.000000000 +0200
@@ -0,0 +1 @@
+ICON   1       DISCARDABLE     "images/DjVuApp_os2.ico"
\ No newline at end of file
diff -Naur vendor\current/src/djview.pro trunk/src/djview.pro
--- vendor\current/src/djview.pro       2011-08-17 16:24:20.000000000 +0200
+++ trunk/src/djview.pro        2011-09-30 11:58:02.000000000 +0200
@@ -33,6 +33,10 @@
     # for use under unix with pkgconfig
     CONFIG += link_pkgconfig
     PKGCONFIG += ddjvuapi
+} else:os2 {
+    INCLUDEPATH += . e:/trees/djvulibre/trunk d:/cups/include
+    LIBS += -ldjvulibre -lpthread -ljpeg -Le:/trees/djvulibre/trunk/libdjvu/.libs -Ld:/cups/lib -llibcups
+    RC_FILE = djview_os2.rc
 } else {
     # for use on other platforms
     # LIBS += -ldjvulibre
@@ -113,3 +117,13 @@
 TRANSLATIONS += djview_de.ts
 TRANSLATIONS += djview_cs.ts
 TRANSLATIONS += djview_ru.ts
+
+# -- needed that shadowbuild works nicely
+qtPrepareTool(LRELEASE, lrelease)
+updateqm.input = TRANSLATIONS
+updateqm.output = ${QMAKE_FILE_BASE}.qm
+updateqm.variable_out = PRE_TARGETDEPS
+updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+updateqm.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += updateqm
diff -Naur vendor\current/src/images/djvuapp_os2.ico trunk/src/images/djvuapp_os2.ico
--- vendor\current/src/images/djvuapp_os2.ico   1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/images/djvuapp_os2.ico    2011-08-31 19:06:40.000000000 +0200
@@ -0,0 +1,5 @@
+BA(HCIØ      
0`ÿÿÿCIØ

00ÿÿÿå®yYU$¥oÈðõɓf0BŽpµ²ÔÂ@x£jikÀ¢‘èøÅ;Þ|;ȞV0s3z9Çÿeƒ“€¹ŽkŠÍ"~ÁÛǵMVqNšPBi‹ãÿݳÛÙÙÛæ›Èþ·À²²«‰xynúà­ôóãU“Ÿ…
C9Y(‡v1Š–×¥už^Hƒš»ÎYX[SvœÒÿÒh0bŒnn¡¡¡uQIÊÊÊöâÌd±å‘ToŸbaÒ² o,Œz;R9Žîß‘ž\Msáêð˜~~;„·bUsbÔÿáÿ᥎ŽÅÞÎæÒ€üùÓåݹšd—0Ì`2›'€ãSATo`†vG­·€¢áó±€@fúìÂ^iz꿅
Bo’ÚÐËtk{žu_t±Ù~ižîÿîÄñÇÉœŒj.‰ôÖŒ„„„U7‚Üî௭±èääŠqŒøÖ sKɂš›gš¥}nýýæ_,kòïÒT%™^B§µ¿k-±ìâ¢à—šŸ‡‡ñ矝bpâáÈõôóõͧt¹æ+|¹q/˜x4ˆåÝÓ±™‹v<»“X}v7`ÛןãùÍÓÿÁd-z.~ˆmª_Lx®š™jaxn2m€kxŒ›±§ÎŒÖÑÑb©×~=F ‘ÎÌßÙÞÿÉáʛgR…
Z3©©©xvw•]ŠîìÇè̶æðÛ»»»íÚ°ve6•ÔQbîíìòä׋KJ•ã_&®žuš]UgâÒ¬q5Ye/¥Ÿ`VÑÆÅÙóÓz7kÝâšúçžë˕úúÜw3ÄQ-Žîú×ųªýýñb8“c.VñÍúñÉfT}%y¹Ü»ˆñâÀÓÄ·ËñÏŠI?pBŠ}~}õÛŠ___rrrQ=r³³³`)•+„ÃéäÔ}C¹g0LåÒÆmP‘tK€ñО¶ œìౘl³®‘†]Emƶµ‘ttÜí¥g)¶èÏœñί÷áµ¥†|æõœãÞÛìݹùôÕ÷Û«hcoˆF0U&žãë³·œ‘[?€ã×µäÌ­ûûúá×À£€vWCt÷ЙðǛk³á–t¯ˆˆ‰÷öíBA(CIØ
 @ÿÿÿCIØ
  ÿÿÿ‘é¬|bßÿW,ô˒Kƒ¬ª¢žE²íÌÞÑ|a€ýòÈq¬ÏŒ‘œÅáÊ«šàéªGžÌ}:xâüâ„m£Ëœ»³•‡sH™˜†°ŒÚîîØÆzœé4‡ÃbI€Mf¶ùÞ©žŸŸµÛ•gyãõÃ
—åäàßûïâäƊ㟉n2·€£µµµ
+†×ÈÄÐêîòƒ„ƒÙПyb–ÓüӂNxˆlôæ»EÄøéÚ¡ÙÒҏ€ž~A‰Êž«éζïèÌŠ³œœŸ‘ùõòZ(qgAq0}ûúת«ªâǕ™€ ’¶¹zäÝŽåõÕóÍ¡BˆÇŒ¬ªÕŬÑÅÅh£ÉîéçrX
áŽ‚‰}nƒú؞ãèŖËëe/†Ä¶ŽÁÂÁðâØÞëØìí¶ßýˎhƒóÕ¶jO•åÕ«ÜÜÛÞÞ õòÓìúÇxk˜éÎ ûù簞›sT™ë˱šŸëÝÏüå³àÕÉÀ«žñâ§ðïïåçèe,|ëÚ¯»Œ»þýôíòÁãòãY€ëêÜÑÒÑÓ»¬ÅãÌËËËüëŸóß³õקñš€€§õêÃçᜓ•úúúéç«gJèõº‰{†”Œž°°°™˜ž±Ž}À¥˜§š³o0‡ýùÏ÷М„…
‡g6Ž××ןÈúûᒄ«ÚÈŸm8”eG†òãÂâÛÚïÓ¡ŠzŸ›‹²ÔÊÊIžòàúÔöõ×|<„lA‘ôÝ»ñã¹íÞÈìÖš[+{_3…
0ÂDºîÜǪš€­íɟ     ‹Þ÷ìÎøðëze›ØúÍçΪííìæßÔèÛÁä͝ÆÊÍwbèßžûæ·éíÀŠÚóóòêääàßßäڻƹžŸª€Á±¯qP”òï草“åÔ§äÕ²ÛÑËø÷äïËŠIu‰i‰úíÄÌÂÂ÷÷ö’Ž™üõÎäã㍂™Æ¬žqD•yfõԞ˹¯éééúâ±úÙ¢øÔ¡ìϜ”€®³ ŸüüøúíßèôăR{’h}ôîÇðíË­¥œ£–¶Äš˜iC‹FÂõù÷Ò®~füüñø÷êùúÛéÜÖöЀBA(CIØ
 ÿÿÿCIX
ÿÿÿ
Þž’õҜËîxH‡@·óÊÉÎ=ŽÈâüÓÇ«˜hh›­ŸœôåÀÞÙåu‘öíæ[¹ç°ŸÍ‚_•!ƒÑáÔË6ÛÖ»£Ê»º”wšÓçÖ ‰²·±·éç®ìåÓ~o‰õ÷Õ°ŠªûÞš×ǹֳ”îÔ«”…
“ÇÔÚôõôçìêç̛êïœÆŒÑõÚžº¯ÄR¿îÄÀÅÖÎÌûç¶äÞÙ©ž¥æóÍ~WŽøøçíâ·êõ×ãäâÒÈÂëáÂúýôõà°ùóÍïïïúìÀýõî~ÛëÕßÙÔª™žæèŒA²íðèƁiŒñãÎî̙ÇÂÍìÛ¶ßÞÞÜÐÈîçŸöã·ûüûêèæôÕ­êПù÷÷÷ÚªöúÚÉÀÔÔ¹ßÕÐíêïðÞ°æààÒÇ·ßß㮢¹TŒë“|’öòññóñóîãמ ÓʺõîêïÞ¶~kŠüùøùû÷îäÐáßÛíÞ²ééé=·ôääåßÙÑßÔÍýþþ÷øÙùÙ©õäµìãÃ~i‹ß×ÒÉŸÓÒÇÀ~mŠßßáêèèòòñõӝäåäîâžþþþøóÍÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÁÿÿÿÿÿÿÿÿÿÿÿÿÿÿþÿÿÿÿüÿÿÿÿðÿÿÿøÿÿ„à€€€€€€ÀÀÀÀÀÀàààààððððððøøøøø?øÿü‡ÿÿüÿÿÿÿÿÿÿÿÿ˜C-ŽS˜E&a*E
€“*E
€*E
ÅY*E
Å?9{Lm/*E
?³9’i+®ý^ŠQ
+*E
Ë«š8† LmÞލ^ŠQîî

ПÍd3ÒÊOE
€ÖRÚٜÄD¯.....ÏÏ
ҕ€•ÊÊ55•
©©©]OE
Œ4UÌÐ3ggҞžž333ÒÊ5
©©©©Ò©©©©©©©©©©–=E
Ôkï<…
Ÿ5©©©©©©©©©©©©©©h!SBGS!h©©©©©©}üMW'—»
Ê©©©©©©©©©©©©aGySŸÈÈŸÜBya©©•©©ö7¬§l
'»D€©©©©©©©©©©•BëzÃqqqqÕZG2ah•©}ö7¬t
»')óÒ©©©©©©©©©aG¥žÃÃJ¡ºººº%%ŽâŽhŽh©}A€
»'‚Àžh©©©©©©©ŽõížVÃÃJ¡ººœº%ÿ%êBᎎ}}}}Ê
;—¶²xê©©©©©©
õΞžVÃJJ¡ºo‰ µ¿¿ÿêBá!}}}}Êþ
;—<;d
©©©}}©Î$žžVÃJºqºo‰ µ¿öö}ZB©}}}}5þ
u—;[
}}}}}ŽáÛí$çžVÃJºìºo‰Šµ¿¿öö%Sa}}}}5þÐu—uŽê}}}}}SõÛ$$çIIëJJºqo‰Š£¿¿¿¿ÿêy}}}ö5dÐu—ó€©}}©
áûjÎíçÆÆ>zJºqo‰š£¿¿¿¿¿%hööö•dв<ÀÒ©}}„è¹
>IÎIݺº¡ºwš|¿¿¿%÷%aŸ:öö
dв<‡²3h}}\ߢÂXX
¹›çƛJºqKw‰ô%ooô°qZ\öö
dÐN<—ä©öö\Ü¢újÎ

¥Æ>JJ¡°

°|oq°ôºƒøöêÍÐN<ä[}öö\S¢jÎí
>ç>>ÃJ°¥

I°ºqõôºÕèhÍÐN±²Žöö\òåújí¹IV¥ëÃz›I

°IKÃIôºƒnhÍН±behöö\"ØÂÂúÛ¹IV¥Çì›>¥
顛IzIzJZ\©ÍŸ±‘5\sŽÂXÛ¹íVÇÇÃ>>ÃéTÃI›ôJJìá©©ÍН±±²žÈ
ŽæÂúj$žžI¥V¥¥VñT¡VÝzJÃq!}ŸŸe±­hƒÂjÎ$žVVVžžV·ãzÃÃÃÃÃZê}ŸŸe1­[
cúj$$$žžçžçˆÝVVVVªae1Óùö}ê~újÎ$$$$$IˆÝžžž6Ž©ó1‹eh©h~újjjÎÎíÛIvΞç6Zh,11Ê}hcÂúújjjÛÛÎÎí6•©œ1×ð3}h©cúúÛÛ~6h•}œpþ}h©ª666ªªê
©Qp𐩙0`Šp(Ñö5”0É#ppe

 Fµ}x,pÁŒÊ©H_fö
gŽrrð3hHöf}
€x
©5ÍP@ÍÐÐ×(à[[ŸŸŸŸŸÍÍdÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñÿÿÿáÿÿÿÁÿÿÿÿÿÀ€€€€€ÀÀÀÀÀààààààððÿðÿÿÿÿÿÿµ
–ø 
ø©-Ž7©¹#ñbÙÙ5jN7©¹Ø4ð~~~


ãWVÒÒݓˆ,?7©È;Tà‘Ýҋ!Fz€œ€ËËwæ¿vµ©¹¬Äƒæææææ¿¿æ9\+m+OÛß¿æwZ       UÐ]¿¿¿¿¿¿fOtP̊Š1‡ìÍ9Ê/
%Ršââ,¿¿¿¿v9ζ6
ù«žžÖÀOÍQ€/Ú­¡·¿vvɡŸÆÚÞE«žaªûÑÏ+šÉ܀š­*H¿ÉÉv(çÆÚÞE«žaœííS+€ÜŒœ0÷—ŠæÉÜ&†ç…
y‰E«žaªíí{ÕیŒœ0÷D2fÜ&Í(ä¥kGÓùEýaLû{ü\SŒf0÷ЀŒážo)G±Âòýó$YÖlÁ>‡JAË0¢­ƒŒá@Mä†)kG6ùÅïK>«Ôh<úAß0¢›á@Mé ê…
y‰6eiKÔ>eh<Aw0¢[pö”×ä¥6£ºÂyiÇÓK¯ùåíæ0
x§ •=ä „¯‰±6|¯¯˜>9æ0
ŒŒþMX Ƅ„„6`


sSÉ,2nvəX rrƅ
g„„°€ëCËv™™è  †8uÆ°€Œ³.É^cÿéé醮qʌ§²ôŒÉ»'îî_ÉIBŸw"3íõŒÜw‚ÜwdŽßf
+}ÉÉæf€:9fËßËfœƒ’ÿÿÿÿÿøÿñ€€€€€€ÀÀÀÿÿ0I deD'5"
1t7u†P<aj€2‚
N„ƒ$O@y:vb(K/)w&S‰Z
+>~`;}G4M+‡!68\qm
Q%…
WlRH|=
F]i?r,9JU ^kV#3{
BpXTc.zY_Lf[nChEo-
ˆˆx*gAs
\ No newline at end of file
diff -Naur vendor\current/src/qdjviewexporters.cpp trunk/src/qdjviewexporters.cpp
--- vendor\current/src/qdjviewexporters.cpp     2011-08-17 16:24:20.000000000 +0200
+++ trunk/src/qdjviewexporters.cpp      2011-09-26 13:31:18.000000000 +0200
@@ -91,6 +91,10 @@
 #include "qdjvuwidget.h"
 #include "qdjvu.h"
 
+#ifdef Q_WS_PM
+# include <cups/cups.h>
+#endif
+
 #ifdef WIN32
 # define wdup(fh) _dup(fh)
 #else
@@ -783,6 +787,7 @@
     }
   else if (printer)
     {
+#ifndef Q_WS_PM
       QString printerName = printer->printerName();
       // disable sigpipe
 #ifdef SIGPIPE
@@ -923,6 +928,24 @@
             closeFile();
         }
 #endif
+#else
+        char filename[512];
+        int fd = cupsTempFd(filename, 512);
+        if (fd < 0) {
+            qWarning("QPdfPrinter: Could not open temporary file to print");
+            return;
+        }
+/* we need to close the cups fd, so djview can open it again */
+        close(fd);
+        file.close();
+        file.setFileName(filename);
+        if (! file.fileName().isEmpty())
+        {
+              file.remove();
+              if (file.open(QIODevice::WriteOnly))
+                output = ::fdopen(file.handle(), "wb");
+        }
+#endif
     }
 }
 
@@ -936,6 +959,64 @@
     ::close(outputfd);
   if (file.openMode())
     file.close();
+#ifdef Q_WS_PM
+  if (printer)
+     {
+        QString printerName = printer->printerName();
+
+        // Set up print options.
+        QByteArray prnName;
+        QList<QPair<QByteArray, QByteArray> > options;
+        QVector<cups_option_t> cupsOptStruct;
+
+        if (!printerName.isEmpty()) {
+            prnName = printerName.toLocal8Bit();
+
+              QPrintEngine *engine = printer->printEngine();
+# define PPK_CupsOptions QPrintEngine::PrintEnginePropertyKey(0xfe00)
+# define PPK_CupsStringPageSize QPrintEngine::PrintEnginePropertyKey(0xfe03)
+      QVariant cPageSize = engine->property(PPK_CupsStringPageSize);
+      QVariant cOptions = engine->property(PPK_CupsOptions);
+      QStringList cupsOptions = cOptions.toStringList();
+
+        if (!cPageSize.toString().isEmpty()) {
+            options.append(QPair<QByteArray, QByteArray>("media", cPageSize.toString().toLocal8Bit()));
+        }
+
+        if (copies > 1) {
+            options.append(QPair<QByteArray, QByteArray>("copies", QString::number(copies).toLocal8Bit()));
+        }
+
+        if (collate) {
+            options.append(QPair<QByteArray, QByteArray>("Collate", "True"));
+        }
+
+        if (duplex) {
+            options.append(QPair<QByteArray, QByteArray>("sides", "two-sided-long-edge"));
+        }
+
+        QStringList::const_iterator it = cupsOptions.constBegin();
+        while (it != cupsOptions.constEnd()) {
+            options.append(QPair<QByteArray, QByteArray>((*it).toLocal8Bit(), (*(it+1)).toLocal8Bit()));
+            it += 2;
+        }
+
+        for (int c = 0; c < options.size(); ++c) {
+            cups_option_t opt;
+            opt.name = options[c].first.data();
+            opt.value = options[c].second.data();
+            cupsOptStruct.append(opt);
+        }
+
+        // Print the file.
+        QString title = djview->getDocumentFileName();
+        cups_option_t* optPtr = cupsOptStruct.size() ? &cupsOptStruct.first() : 0;
+        cupsPrintFile(prnName.constData(), file.fileName().toLocal8Bit().constData(),
+                title.toLocal8Bit().constData(), cupsOptStruct.size(), optPtr);
+        }
+                file.remove();
+     }
+#endif
   output = 0;
   outputfd = -1;
   printer = 0;
diff -Naur vendor\current/src/qdjvu.cpp trunk/src/qdjvu.cpp
--- vendor\current/src/qdjvu.cpp        2011-08-17 16:24:20.000000000 +0200
+++ trunk/src/qdjvu.cpp 2011-08-31 19:09:40.000000000 +0200
@@ -413,7 +413,7 @@
       qWarning("QDjVuDocument::setFileName: cannot read file");
       return false;
     }
-#if DDJVUAPI_VERSION >= 19
+#if DDJVUAPI_VERSION >= 19 && !defined(Q_WS_PM) // as our wcrtomb() is broken
   QByteArray b = f.toUtf8();
   document = ddjvu_document_create_by_filename_utf8(*ctx, b, cache);
 #else