mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

Browse Source
This commit is contained in:
Harald Oehlmann 2020-04-07 18:39:45 +02:00
commit 15eb21944c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#comment or remove the above line before release #comment or remove the above line before release
set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MAJOR 2)
set (ZINT_VERSION_MINOR 7) set (ZINT_VERSION_MINOR 8)
set (ZINT_VERSION_RELEASE 0) set (ZINT_VERSION_RELEASE 0)
set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )

2
TODO
View File

@ -5,7 +5,7 @@ Backend
* Create filters for more output file formats. * Create filters for more output file formats.
* The code was developed to be easy to understand rather than efficient so may * The code was developed to be easy to understand rather than efficient so may
benefit from some memory optimisation for embedded systems. benefit from some memory optimisation for embedded systems.
* Support for Ultra Code, Super Code and Data Strip desirable, and any other * Support for Super Code and Data Strip desirable, and any other
industry symbologies not currently included. industry symbologies not currently included.
GUI Frontend GUI Frontend

4
backend/zint.h
View File

@ -136,8 +136,8 @@ extern "C" {
}; };
#define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 7 #define ZINT_VERSION_MINOR 8
#define ZINT_VERSION_RELEASE 1 #define ZINT_VERSION_RELEASE 0
/* Tbarcode 7 codes */ /* Tbarcode 7 codes */
#define BARCODE_CODE11 1 #define BARCODE_CODE11 1

2
frontend_qt/mainWindow.ui
View File

@ -26,7 +26,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Zint Barcode Studio 2.7</string> <string>Zint Barcode Studio 2.8</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">

6
frontend_qt/mainwindow.cpp
View File

@ -265,16 +265,16 @@ bool MainWindow::save()
void MainWindow::about() void MainWindow::about()
{ {
QMessageBox::about(this, tr("About Zint"), QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.7.1</h2>" tr("<h2>Zint Barcode Studio 2.8.0</h2>"
"<p>A free barcode generator" "<p>A free barcode generator"
"<p>Instruction manual is available at the project homepage:<br>" "<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>" "<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"
"<p>Copyright &copy; 2006-2018 Robin Stuart and others.<br>" "<p>Copyright &copy; 2006-2020 Robin Stuart and others.<br>"
"Qt back end by BogDan Vatra<br>" "Qt back end by BogDan Vatra<br>"
"Windows port by Harald Oehlmann</p>" "Windows port by Harald Oehlmann</p>"
"<p>Qt version " QT_VERSION_STR "<p>Qt version " QT_VERSION_STR
"<p>With thanks to Norbert Szab&oacute;, Robert Elliott, " "<p>With thanks to Norbert Szab&oacute;, Robert Elliott, "
"Milton Neal and many others at Sourceforge." "Milton Neal, Git Lost and many others at Sourceforge."
"<p>Released under the GNU General Public License ver. 3 or later.<br>" "<p>Released under the GNU General Public License ver. 3 or later.<br>"
"\"QR Code\" is a Registered Trademark of Denso Corp.<br>" "\"QR Code\" is a Registered Trademark of Denso Corp.<br>"
"\"Telepen\" is a Registered Trademark of SB Electronics." "\"Telepen\" is a Registered Trademark of SB Electronics."