mirror of
https://git.code.sf.net/p/zint/code
synced 2025-06-05 01:04:07 -04:00
Make command line version compile with MS-VC6 and QT-Version with MS-VC8
This commit is contained in:
parent
2e5fe31ebf
commit
b7b7564457
14 changed files with 198 additions and 52 deletions
|
@ -72,9 +72,14 @@ void ExportWindow::process()
|
|||
inputpos = 0;
|
||||
|
||||
switch(cmbFileFormat->currentIndex()) {
|
||||
case 0: suffix = ".png"; break;
|
||||
#ifdef NO_PNG
|
||||
case 0: suffix = ".eps"; break;
|
||||
case 1: suffix = ".svg"; break;
|
||||
#else
|
||||
case 0: suffix = ".png"; break;
|
||||
case 1: suffix = ".eps"; break;
|
||||
case 2: suffix = ".svg"; break;
|
||||
#endif
|
||||
}
|
||||
|
||||
for(i = 0; i < lines; i++) {
|
||||
|
|
|
@ -4,21 +4,31 @@
|
|||
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET =
|
||||
TARGET = qtZint
|
||||
DEPENDPATH += . debug release
|
||||
INCLUDEPATH += .
|
||||
DEFINES += NO_PNG
|
||||
|
||||
# Input
|
||||
HEADERS += barcodeitem.h mainwindow.h
|
||||
FORMS += grpAztec.ui \
|
||||
HEADERS += barcodeitem.h \
|
||||
datawindow.h \
|
||||
exportwindow.h \
|
||||
mainwindow.h \
|
||||
sequencewindow.h
|
||||
|
||||
FORMS += extData.ui \
|
||||
extExport.ui \
|
||||
extSequence.ui \
|
||||
grpAztec.ui \
|
||||
grpC128.ui \
|
||||
grpC16k.ui \
|
||||
grpC39.ui \
|
||||
grpC49.ui \
|
||||
grpChannel.ui \
|
||||
grpCodablock.ui \
|
||||
grpCodeOne.ui \
|
||||
grpDBExtend.ui \
|
||||
grpDM.ui \
|
||||
grpGrid.ui \
|
||||
grpMaxicode.ui \
|
||||
grpMicroPDF.ui \
|
||||
grpMQR.ui \
|
||||
|
@ -26,6 +36,24 @@ FORMS += grpAztec.ui \
|
|||
grpPDF417.ui \
|
||||
grpQR.ui \
|
||||
mainWindow.ui
|
||||
|
||||
SOURCES += barcodeitem.cpp \
|
||||
datawindow.cpp \
|
||||
exportwindow.cpp \
|
||||
main.cpp \
|
||||
mainwindow.cpp \
|
||||
sequencewindow.cpp
|
||||
|
||||
TRANSLATIONS = frontend_de.ts
|
||||
SOURCES += barcodeitem.cpp main.cpp mainwindow.cpp
|
||||
|
||||
RESOURCES += resources.qrc
|
||||
|
||||
# Static target following http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
|
||||
CONFIG += static
|
||||
|
||||
CONFIG += warn_on thread qt uitools
|
||||
|
||||
INCLUDEPATH += ../backend_qt4 ../backend
|
||||
|
||||
LIBS += -lqtzint -lQtCore
|
||||
QMAKE_LIBDIR += ../backend_qt4/release
|
|
@ -207,6 +207,91 @@
|
|||
<string>16 x 48</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>8 x 48</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>8 x 64</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>12 x 48</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>12 x 64</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>16 x 64</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>24 x 32</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>24 x 40</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>24 x 48</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>24 x 64</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 32</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 40</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 48</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>26 x 64</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>36 x 120</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>36 x 144</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>72 x 120</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>72 x 144</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
|
|
@ -146,9 +146,15 @@ bool MainWindow::save()
|
|||
{
|
||||
bool status;
|
||||
|
||||
#ifdef NO_PNG
|
||||
QString fileName = QFileDialog::getSaveFileName(this,
|
||||
tr("Save Barcode Image"), ".",
|
||||
tr("Encapsulated Post Script (*.eps);;Scalable Vector Graphic (*.svg)"));
|
||||
#else
|
||||
QString fileName = QFileDialog::getSaveFileName(this,
|
||||
tr("Save Barcode Image"), ".",
|
||||
tr("Portable Network Graphic (*.png);;Encapsulated Post Script (*.eps);;Scalable Vector Graphic (*.svg)"));
|
||||
#endif
|
||||
|
||||
if (fileName.isEmpty())
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue