mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-23 11:36:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

#206 build: version to 2.9.1.9; ZINT_VERSION_BUILD (9 dev); tools/update_version.php

Browse source
This commit is contained in:
gitlost 2020-09-04 16:38:11 +01:00
parent caf46ed69b
commit ac7b5dd282
28 changed files with 532 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend_qt/frontend_qt.pro
View file

@ -56,6 +56,8 @@ TRANSLATIONS = frontend_de.ts
RESOURCES += resources.qrc
RC_FILE += res/qtZint.rc
# Static target following http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
CONFIG += static

2
frontend_qt/frontend_qt_zintdll.pro
View file

@ -48,6 +48,8 @@ SOURCES += barcodeitem.cpp \
RESOURCES += resources.qrc
RC_FILE += res/qtZint.rc
INCLUDEPATH += ../backend_qt ../backend
LIBS += -lQtZintDLL -lzint

14
frontend_qt/mainwindow.cpp
View file

@ -281,15 +281,23 @@ bool MainWindow::save()
void MainWindow::about()
{
QString zint_version;
if (ZINT_VERSION_BUILD) {
QTextStream(&zint_version) << ZINT_VERSION_MAJOR << "." << ZINT_VERSION_MINOR << "." << ZINT_VERSION_RELEASE << "." << ZINT_VERSION_BUILD;
} else {
QTextStream(&zint_version) << ZINT_VERSION_MAJOR << "." << ZINT_VERSION_MINOR << "." << ZINT_VERSION_RELEASE;
}
QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.9.0 </h2>"
/*: %1 is Zint version, %2 is Qt version */
tr("<h2>Zint Barcode Studio %1</h2>"
"<p>A free barcode generator"
"<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"
"<p>Copyright &copy; 2006-2020 Robin Stuart and others.<br>"
"Qt back end by BogDan Vatra<br>"
"Windows port by Harald Oehlmann</p>"
"<p>Qt version " QT_VERSION_STR
"<p>Qt version %2"
"<p>With thanks to Norbert Szab&oacute;, Robert Elliott, "
"Milton Neal, Git Lost and many others at Sourceforge."
"<p>Released under the GNU General Public License ver. 3 or later.<br>"
@ -302,7 +310,7 @@ void MainWindow::about()
"ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
"ISO/IEC 21471:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,<br>"
"ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200"
"</small></td></tr></table>"));
"</small></td></tr></table>").arg(zint_version).arg(QT_VERSION_STR));
}
int MainWindow::open_data_dialog()

14
frontend_qt/res/qtZint.rc
View file

@ -5,6 +5,8 @@
#include <winver.h>
#define VER_FILEVERSION 2,9,1,9
#define VER_FILEVERSION_STR "2,9,1,9\0"
#ifdef GCC_WINDRES
@ -16,9 +18,9 @@ VS_VERSION_INFO VERSIONINFO
#endif
FILEVERSION 2,3,0,0
FILEVERSION VER_FILEVERSION
PRODUCTVERSION 2,3,0,0
PRODUCTVERSION VER_FILEVERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
@ -52,11 +54,11 @@ BEGIN
VALUE "FileDescription", "qtZint barcode generator"
VALUE "FileVersion", "2.3.2.0"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "qtZint"
VALUE "LegalCopyright", "Copyright © 2010 Robin Stuart & BogDan Vatra"
VALUE "LegalCopyright", "Copyright © 2020 Robin Stuart & BogDan Vatra"
VALUE "License", "GNU General Public License version 3"
@ -64,7 +66,7 @@ BEGIN
VALUE "ProductName", "Zint Barcode Studio"
VALUE "ProductVersion", "2.3.2.0"
VALUE "ProductVersion", VER_FILEVERSION_STR
VALUE "WWW", "http://www.zint.org.uk"
@ -82,4 +84,4 @@ BEGIN
END
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint.ico"
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint.ico"