diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ae04ba7..f2ad8162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,21 +62,28 @@ ENDIF(APPLE) add_subdirectory(backend) add_subdirectory(frontend) -find_package(Qt4) +find_package(Qt5Widgets) +find_package(Qt5Gui) +find_package(Qt5UiTools) -if (QT4_FOUND) - set( QT_USE_QTGUI TRUE ) - set( QT_USE_QTUITOOLS TRUE ) - set( QT_USE_QTXML TRUE ) - include( ${QT_USE_FILE} ) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${QT_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ) - add_subdirectory(backend_qt4) - add_subdirectory(frontend_qt4) -endif(QT4_FOUND) +if (Qt5Widgets_FOUND) + if (Qt5Gui_FOUND) + if (Qt5UiTools_FOUND) + set( QT_USE_QTGUI TRUE ) + set( QT_USE_QTUITOOLS TRUE ) + set( QT_USE_QTXML TRUE ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${Qt5Widgets_INCLUDES} + ${Qt5Gui_INCLUDES} + ${Qt5UiTools_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR} + ) + add_subdirectory(backend_qt) + add_subdirectory(frontend_qt) + endif(Qt5UiTools_FOUND) + endif(Qt5Gui_FOUND) +endif(Qt5Widgets_FOUND) CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/backend_qt4/CMakeLists.txt b/backend_qt/CMakeLists.txt similarity index 87% rename from backend_qt4/CMakeLists.txt rename to backend_qt/CMakeLists.txt index 98d529af..9a34e3b2 100644 --- a/backend_qt4/CMakeLists.txt +++ b/backend_qt/CMakeLists.txt @@ -15,8 +15,7 @@ add_dependencies(QZint zint) link_directories( "${CMAKE_BINARY_DIR}/backend" ) -target_link_libraries(QZint zint ${QT_QTGUI_LIBRARY} - ${QT_QTCORE_LIBRARY} ) +target_link_libraries(QZint zint Qt5::Widgets Qt5::Gui ) install(TARGETS QZint ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES qzint.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) diff --git a/backend_qt4/backend_qt4.pro b/backend_qt/backend_qt.pro similarity index 100% rename from backend_qt4/backend_qt4.pro rename to backend_qt/backend_qt.pro diff --git a/backend_qt4/backend_vc8.pro b/backend_qt/backend_vc8.pro similarity index 100% rename from backend_qt4/backend_vc8.pro rename to backend_qt/backend_vc8.pro diff --git a/backend_qt4/qzint.cpp b/backend_qt/qzint.cpp similarity index 98% rename from backend_qt4/qzint.cpp rename to backend_qt/qzint.cpp index 6a50ca4e..98323f40 100644 --- a/backend_qt4/qzint.cpp +++ b/backend_qt/qzint.cpp @@ -40,7 +40,7 @@ namespace Zint { m_input_mode = UNICODE_MODE; m_scale = 1.0; m_option_3 = 0; - m_hidetext = FALSE; + m_hidetext = 0; m_dot_size = 4.0 / 5.0; } @@ -75,7 +75,7 @@ namespace Zint { m_zintSymbol->option_3 = m_option_3; } QByteArray bstr = m_text.toUtf8(); - QByteArray pstr = m_primaryMessage.left(99).toAscii(); + QByteArray pstr = m_primaryMessage.left(99).toLatin1(); strcpy(m_zintSymbol->primary, pstr.data()); int error = ZBarcode_Encode(m_zintSymbol, (unsigned char*) bstr.data(), bstr.length()); if (error > ZINT_WARN_INVALID_OPTION) @@ -258,12 +258,12 @@ namespace Zint { } m_zintSymbol->scale = m_scale; QByteArray bstr = m_text.toUtf8(); - QByteArray pstr = m_primaryMessage.left(99).toAscii(); - QByteArray fstr = filename.left(255).toAscii(); + QByteArray pstr = m_primaryMessage.left(99).toLatin1(); + QByteArray fstr = filename.left(255).toLatin1(); strcpy(m_zintSymbol->primary, pstr.data()); strcpy(m_zintSymbol->outfile, fstr.data()); - QByteArray fgcol = fg_colour_hash.right(6).toAscii(); - QByteArray bgcol = bg_colour_hash.right(6).toAscii(); + QByteArray fgcol = fg_colour_hash.right(6).toLatin1(); + QByteArray bgcol = bg_colour_hash.right(6).toLatin1(); strcpy(m_zintSymbol->fgcolour, fgcol.data()); strcpy(m_zintSymbol->bgcolour, bgcol.data()); int error = ZBarcode_Encode(m_zintSymbol, (unsigned char*) bstr.data(), bstr.length()); diff --git a/backend_qt4/qzint.h b/backend_qt/qzint.h similarity index 100% rename from backend_qt4/qzint.h rename to backend_qt/qzint.h diff --git a/backend_qt4/readme b/backend_qt/readme similarity index 100% rename from backend_qt4/readme rename to backend_qt/readme diff --git a/frontend_qt4/CMakeLists.txt b/frontend_qt/CMakeLists.txt similarity index 66% rename from frontend_qt4/CMakeLists.txt rename to frontend_qt/CMakeLists.txt index 335831fb..5eef524f 100644 --- a/frontend_qt4/CMakeLists.txt +++ b/frontend_qt/CMakeLists.txt @@ -2,25 +2,24 @@ project(zint-qt) -include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend" "${CMAKE_SOURCE_DIR}/backend_qt4") +include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend" "${CMAKE_SOURCE_DIR}/backend_qt") set(zint-qt_SRCS barcodeitem.cpp main.cpp mainwindow.cpp datawindow.cpp sequencewindow.cpp exportwindow.cpp) -QT4_WRAP_CPP(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h) +QT5_WRAP_CPP(zint-qt_SRCS mainwindow.h datawindow.h sequencewindow.h exportwindow.h) -QT4_WRAP_UI(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui) +QT5_WRAP_UI(zint-qt_SRCS mainWindow.ui extData.ui extSequence.ui extExport.ui) # grpAztec.ui grpC39.ui grpDM.ui grpMSICheck.ui # grpC128.ui grpChannel.ui grpMicroPDF.ui grpPDF417.ui # grpC16k.ui grpCodablock.ui grpMQR.ui grpQR.ui # grpMaxicode.ui) -QT4_ADD_RESOURCES(zint-qt_SRCS resources.qrc) +QT5_ADD_RESOURCES(zint-qt_SRCS resources.qrc) add_executable(zint-qt ${zint-qt_SRCS}) add_dependencies(zint-qt QZint zint) -link_directories( "${CMAKE_BINARY_DIR}/backend" "${CMAKE_BINARY_DIR}/backend_qt4" ) +link_directories( "${CMAKE_BINARY_DIR}/backend" "${CMAKE_BINARY_DIR}/backend_qt" ) -target_link_libraries(zint-qt zint QZint ${QT_QTUITOOLS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} - ${QT_QTCORE_LIBRARY} ) +target_link_libraries(zint-qt zint QZint Qt5::UiTools ${QT_QTXML_LIBRARY} Qt5::Gui Qt5::Core ) install(TARGETS zint-qt DESTINATION "${BIN_INSTALL_DIR}" RUNTIME) diff --git a/frontend_qt4/barcodeitem.cpp b/frontend_qt/barcodeitem.cpp similarity index 100% rename from frontend_qt4/barcodeitem.cpp rename to frontend_qt/barcodeitem.cpp diff --git a/frontend_qt4/barcodeitem.h b/frontend_qt/barcodeitem.h similarity index 100% rename from frontend_qt4/barcodeitem.h rename to frontend_qt/barcodeitem.h diff --git a/frontend_qt4/datawindow.cpp b/frontend_qt/datawindow.cpp similarity index 100% rename from frontend_qt4/datawindow.cpp rename to frontend_qt/datawindow.cpp diff --git a/frontend_qt4/datawindow.h b/frontend_qt/datawindow.h similarity index 100% rename from frontend_qt4/datawindow.h rename to frontend_qt/datawindow.h diff --git a/frontend_qt4/exportwindow.cpp b/frontend_qt/exportwindow.cpp similarity index 96% rename from frontend_qt4/exportwindow.cpp rename to frontend_qt/exportwindow.cpp index c9c218fb..ab45f565 100644 --- a/frontend_qt4/exportwindow.cpp +++ b/frontend_qt/exportwindow.cpp @@ -103,7 +103,7 @@ void ExportWindow::process() for(m = 0; m < dataString.length(); m++) { name_qchar = dataString[m]; - name_char = name_qchar.toAscii(); + name_char = name_qchar.toLatin1(); switch(name_char) { case '\\': url_escaped += "%5C"; break; @@ -141,8 +141,8 @@ void ExportWindow::process() } break; } - barcode->bc.setText(dataString.toAscii().data()); - barcode->bc.save_to_file(fileName.toAscii().data()); + barcode->bc.setText(dataString.toLatin1().data()); + barcode->bc.save_to_file(fileName.toLatin1().data()); inputpos += datalen + 1; } close(); diff --git a/frontend_qt4/exportwindow.h b/frontend_qt/exportwindow.h similarity index 100% rename from frontend_qt4/exportwindow.h rename to frontend_qt/exportwindow.h diff --git a/frontend_qt4/extData.ui b/frontend_qt/extData.ui similarity index 100% rename from frontend_qt4/extData.ui rename to frontend_qt/extData.ui diff --git a/frontend_qt4/extExport.ui b/frontend_qt/extExport.ui similarity index 100% rename from frontend_qt4/extExport.ui rename to frontend_qt/extExport.ui diff --git a/frontend_qt4/extSequence.ui b/frontend_qt/extSequence.ui similarity index 100% rename from frontend_qt4/extSequence.ui rename to frontend_qt/extSequence.ui diff --git a/frontend_qt4/frontend_qt4.pro b/frontend_qt/frontend_qt.pro similarity index 76% rename from frontend_qt4/frontend_qt4.pro rename to frontend_qt/frontend_qt.pro index d3412141..7a213247 100644 --- a/frontend_qt4/frontend_qt4.pro +++ b/frontend_qt/frontend_qt.pro @@ -1,12 +1,9 @@ -###################################################################### -# Automatically generated by qmake (2.01a) sub 29. kol 22:15:57 2009 -###################################################################### - - TEMPLATE = app TARGET = qtZint DEPENDPATH += . debug release INCLUDEPATH += . +QT += gui +QT += uitools # Input HEADERS += barcodeitem.h \ @@ -37,7 +34,7 @@ FORMS += extData.ui \ grpQR.ui \ grpHX.ui \ mainWindow.ui \ - grpDotCode.ui + grpDotCode.ui SOURCES += barcodeitem.cpp \ datawindow.cpp \ @@ -57,12 +54,13 @@ CONFIG += warn_on thread qt uitools INCLUDEPATH += ../backend_qt4 ../backend -LIBS += -lqtzint -lQtCore +LIBS += -lQZint -lQtCore QMAKE_LIBDIR += ../backend_qt4/release !contains(DEFINES, NO_PNG) { - LIBS += -llibpng -lzlib - QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release ../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\zlib + LIBS += -lpng -zlib + QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/ +# QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release ../../lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\zlib # LIBS += -llibpng16 -lzlib1 # QMAKE_LIBDIR+=../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release ../../lpng\projects\visualc71_converted_to_9\Win32_DLL_Release\zlib } diff --git a/frontend_qt4/frontend_vc8.pro b/frontend_qt/frontend_vc8.pro similarity index 100% rename from frontend_qt4/frontend_vc8.pro rename to frontend_qt/frontend_vc8.pro diff --git a/frontend_qt4/grpAztec.ui b/frontend_qt/grpAztec.ui similarity index 100% rename from frontend_qt4/grpAztec.ui rename to frontend_qt/grpAztec.ui diff --git a/frontend_qt4/grpC128.ui b/frontend_qt/grpC128.ui similarity index 100% rename from frontend_qt4/grpC128.ui rename to frontend_qt/grpC128.ui diff --git a/frontend_qt4/grpC16k.ui b/frontend_qt/grpC16k.ui similarity index 100% rename from frontend_qt4/grpC16k.ui rename to frontend_qt/grpC16k.ui diff --git a/frontend_qt4/grpC39.ui b/frontend_qt/grpC39.ui similarity index 100% rename from frontend_qt4/grpC39.ui rename to frontend_qt/grpC39.ui diff --git a/frontend_qt4/grpC49.ui b/frontend_qt/grpC49.ui similarity index 100% rename from frontend_qt4/grpC49.ui rename to frontend_qt/grpC49.ui diff --git a/frontend_qt4/grpChannel.ui b/frontend_qt/grpChannel.ui similarity index 100% rename from frontend_qt4/grpChannel.ui rename to frontend_qt/grpChannel.ui diff --git a/frontend_qt4/grpCodablockF.ui b/frontend_qt/grpCodablockF.ui similarity index 100% rename from frontend_qt4/grpCodablockF.ui rename to frontend_qt/grpCodablockF.ui diff --git a/frontend_qt4/grpCodeOne.ui b/frontend_qt/grpCodeOne.ui similarity index 100% rename from frontend_qt4/grpCodeOne.ui rename to frontend_qt/grpCodeOne.ui diff --git a/frontend_qt4/grpDBExtend.ui b/frontend_qt/grpDBExtend.ui similarity index 100% rename from frontend_qt4/grpDBExtend.ui rename to frontend_qt/grpDBExtend.ui diff --git a/frontend_qt4/grpDM.ui b/frontend_qt/grpDM.ui similarity index 100% rename from frontend_qt4/grpDM.ui rename to frontend_qt/grpDM.ui diff --git a/frontend_qt4/grpDotCode.ui b/frontend_qt/grpDotCode.ui similarity index 100% rename from frontend_qt4/grpDotCode.ui rename to frontend_qt/grpDotCode.ui diff --git a/frontend_qt4/grpGrid.ui b/frontend_qt/grpGrid.ui similarity index 100% rename from frontend_qt4/grpGrid.ui rename to frontend_qt/grpGrid.ui diff --git a/frontend_qt4/grpHX.ui b/frontend_qt/grpHX.ui similarity index 100% rename from frontend_qt4/grpHX.ui rename to frontend_qt/grpHX.ui diff --git a/frontend_qt4/grpMQR.ui b/frontend_qt/grpMQR.ui similarity index 100% rename from frontend_qt4/grpMQR.ui rename to frontend_qt/grpMQR.ui diff --git a/frontend_qt4/grpMSICheck.ui b/frontend_qt/grpMSICheck.ui similarity index 100% rename from frontend_qt4/grpMSICheck.ui rename to frontend_qt/grpMSICheck.ui diff --git a/frontend_qt4/grpMaxicode.ui b/frontend_qt/grpMaxicode.ui similarity index 100% rename from frontend_qt4/grpMaxicode.ui rename to frontend_qt/grpMaxicode.ui diff --git a/frontend_qt4/grpMicroPDF.ui b/frontend_qt/grpMicroPDF.ui similarity index 100% rename from frontend_qt4/grpMicroPDF.ui rename to frontend_qt/grpMicroPDF.ui diff --git a/frontend_qt4/grpPDF417.ui b/frontend_qt/grpPDF417.ui similarity index 100% rename from frontend_qt4/grpPDF417.ui rename to frontend_qt/grpPDF417.ui diff --git a/frontend_qt4/grpQR.ui b/frontend_qt/grpQR.ui similarity index 100% rename from frontend_qt4/grpQR.ui rename to frontend_qt/grpQR.ui diff --git a/frontend_qt4/howto_build_qzint_using_msvs9.txt b/frontend_qt/howto_build_qzint_using_msvs9.txt similarity index 100% rename from frontend_qt4/howto_build_qzint_using_msvs9.txt rename to frontend_qt/howto_build_qzint_using_msvs9.txt diff --git a/frontend_qt4/images/rotateleft.png b/frontend_qt/images/rotateleft.png similarity index 100% rename from frontend_qt4/images/rotateleft.png rename to frontend_qt/images/rotateleft.png diff --git a/frontend_qt4/images/rotateright.png b/frontend_qt/images/rotateright.png similarity index 100% rename from frontend_qt4/images/rotateright.png rename to frontend_qt/images/rotateright.png diff --git a/frontend_qt4/images/zint.png b/frontend_qt/images/zint.png similarity index 100% rename from frontend_qt4/images/zint.png rename to frontend_qt/images/zint.png diff --git a/frontend_qt4/images/zoomin.png b/frontend_qt/images/zoomin.png similarity index 100% rename from frontend_qt4/images/zoomin.png rename to frontend_qt/images/zoomin.png diff --git a/frontend_qt4/images/zoomout.png b/frontend_qt/images/zoomout.png similarity index 100% rename from frontend_qt4/images/zoomout.png rename to frontend_qt/images/zoomout.png diff --git a/frontend_qt4/main.cpp b/frontend_qt/main.cpp similarity index 100% rename from frontend_qt4/main.cpp rename to frontend_qt/main.cpp diff --git a/frontend_qt4/mainWindow.ui b/frontend_qt/mainWindow.ui similarity index 100% rename from frontend_qt4/mainWindow.ui rename to frontend_qt/mainWindow.ui diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt/mainwindow.cpp similarity index 98% rename from frontend_qt4/mainwindow.cpp rename to frontend_qt/mainwindow.cpp index ed71a5ff..a8f76f05 100644 --- a/frontend_qt4/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -20,13 +20,16 @@ #include #include #include +#include +#include +#include #include "mainwindow.h" #include "datawindow.h" #include "sequencewindow.h" #include -MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) +MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags fl) : QWidget(parent, fl),m_optionWidget(0) { @@ -172,13 +175,14 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 2.5.1

" + tr("

Zint Barcode Studio 2.5.1

" "

A free barcode generator" "

Instruction manual is available from Sourceforge:" "

http://www.sourceforge.net/projects/zint" "

Copyright © 2006-2016 Robin Stuart.
" - "Qt4 code by BogDan Vatra, MS Windows port by \"tgotic\".
" - "With thanks to Norbert Szabó, Robert Elliott," + "Qt back end by BogDan Vatra, MS Windows port by \"tgotic\"." + "

Qt version " QT_VERSION_STR + "

With thanks to Norbert Szabó, Robert Elliott, " "Harald Oehlmann and many others at Sourceforge." "

Released under the GNU General Public License ver. 3 or later.
" "\"QR Code\" is a Registered Trademark of Denso Corp.
" @@ -189,7 +193,8 @@ void MainWindow::about() "ISO/IEC 16388:2007, ISO/IEC 18004:2006, ISO/IEC 24723:2010,
" "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,
" "ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,
" - "AIMD014 (v 1.63), USPS-B-3200" + "AIMD014 (v 1.63), USPS-B-3200" + )); } @@ -595,9 +600,9 @@ void MainWindow::update_preview() m_bc.bc.setSecurityLevel(0); m_bc.bc.setWidth(0); m_bc.bc.setInputMode(UNICODE_MODE); - m_bc.bc.setHideText(FALSE); + m_bc.bc.setHideText(0); if(chkHRTHide->isChecked() == false) { - m_bc.bc.setHideText(TRUE); + m_bc.bc.setHideText(1); } switch(metaObject()->enumerator(0).value(bstyle->currentIndex())) { diff --git a/frontend_qt4/mainwindow.h b/frontend_qt/mainwindow.h similarity index 98% rename from frontend_qt4/mainwindow.h rename to frontend_qt/mainwindow.h index 2374980c..cf47695f 100644 --- a/frontend_qt4/mainwindow.h +++ b/frontend_qt/mainwindow.h @@ -105,7 +105,7 @@ public: }; public: - MainWindow(QWidget* parent = 0, Qt::WFlags fl = 0); + MainWindow(QWidget* parent = 0, Qt::WindowFlags fl = 0); ~MainWindow(); diff --git a/frontend_qt4/res/qtZint.rc b/frontend_qt/res/qtZint.rc similarity index 100% rename from frontend_qt4/res/qtZint.rc rename to frontend_qt/res/qtZint.rc diff --git a/frontend_qt4/res/zint.ico b/frontend_qt/res/zint.ico similarity index 100% rename from frontend_qt4/res/zint.ico rename to frontend_qt/res/zint.ico diff --git a/frontend_qt4/resources.qrc b/frontend_qt/resources.qrc similarity index 100% rename from frontend_qt4/resources.qrc rename to frontend_qt/resources.qrc diff --git a/frontend_qt4/sequencewindow.cpp b/frontend_qt/sequencewindow.cpp similarity index 99% rename from frontend_qt4/sequencewindow.cpp rename to frontend_qt/sequencewindow.cpp index e0f7c5b9..f285e775 100644 --- a/frontend_qt4/sequencewindow.cpp +++ b/frontend_qt/sequencewindow.cpp @@ -73,7 +73,7 @@ QString SequenceWindow::apply_format(QString raw_number) for(i = format_len; i > 0; i--) { format_qchar = format[i - 1]; - format_char = format_qchar.toAscii(); + format_char = format_qchar.toLatin1(); switch(format_char) { case '#': if (inpos > 0) { diff --git a/frontend_qt4/sequencewindow.h b/frontend_qt/sequencewindow.h similarity index 100% rename from frontend_qt4/sequencewindow.h rename to frontend_qt/sequencewindow.h diff --git a/frontend_qt4/images/.directory b/frontend_qt4/images/.directory deleted file mode 100644 index 773296a4..00000000 --- a/frontend_qt4/images/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -ShowPreview=true -Timestamp=2010,5,29,7,36,6 diff --git a/frontend_qt4/res/.directory b/frontend_qt4/res/.directory deleted file mode 100644 index 1450a1d7..00000000 --- a/frontend_qt4/res/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -ShowPreview=true -Timestamp=2010,5,29,7,59,30