From 19ba8a34c4106088a60f007ff4e9767ad5a16075 Mon Sep 17 00:00:00 2001 From: Robin Stuart Date: Thu, 11 May 2017 21:14:38 +0100 Subject: [PATCH] Update to version 2.6.0 and update copyright to 2017 --- CMakeLists.txt | 4 ++-- README | 24 ++++++++---------------- backend/aztec.c | 2 +- backend/bmp.c | 2 +- backend/bmp.h | 2 +- backend/code1.c | 2 +- backend/code1.h | 2 +- backend/code49.c | 2 +- backend/code49.h | 2 +- backend/common.h | 2 +- backend/dmatrix.c | 2 +- backend/dmatrix.h | 2 +- backend/eci.c | 2 +- backend/eci.h | 2 +- backend/gb18030.h | 2 +- backend/gb2312.h | 2 +- backend/gif.c | 2 +- backend/gridmtx.c | 2 +- backend/gridmtx.h | 2 +- backend/gs1.c | 2 +- backend/gs1.h | 2 +- backend/hanxin.c | 2 +- backend/hanxin.h | 2 +- backend/library.c | 2 +- backend/pcx.c | 2 +- backend/png.c | 2 +- backend/ps.c | 2 +- backend/raster.c | 2 +- backend/render.c | 2 +- backend/sjis.h | 2 +- backend/stdint_msvc.h | 2 +- backend/svg.c | 2 +- backend/zint.h | 6 +++--- debian/changelog | 7 +++++++ docs/manual.txt | 6 +++++- frontend_qt/datawindow.h | 2 +- frontend_qt/exportwindow.cpp | 26 ++++++++++++++++---------- frontend_qt/exportwindow.h | 2 +- frontend_qt/mainWindow.ui | 2 +- frontend_qt/mainwindow.cpp | 2 +- frontend_qt/sequencewindow.h | 2 +- zint.spec | 5 ++++- 42 files changed, 80 insertions(+), 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ad8162..cc770171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) #comment or remove the above line before release set (ZINT_VERSION_MAJOR 2) -set (ZINT_VERSION_MINOR 5) -set (ZINT_VERSION_RELEASE 1) +set (ZINT_VERSION_MINOR 6) +set (ZINT_VERSION_RELEASE 0) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) diff --git a/README b/README index c3659478..3cb3d083 100644 --- a/README +++ b/README @@ -20,22 +20,10 @@ HIBC PDF417, HIBC MicroPDF417, HIBC QR Code, HIBC Aztec Code, Japanese Postal Code, Code 49, Channel Code, Code One, Grid Matrix, FIM and Flattermarken, Codablock-F, DotCode, Han Xin Code. -Output can be saved as BMP, EPS, GIF, PCX, PNG or SVG. - -PROJECT STATUS --------------- -Version 2.5.0: -After a long period of inaction, many new features and bugfixes, including: - -* Reintroduction of Codablock-F -* Introduction of symbologies DotCode and Han Xin Code -* New output formats: GIF, BMP and PCX -* ECI handling -* Redesigned handling of batch files at the command line -* Integrate DMRE handling in Data Matrix -* New licensing model - +Output can be saved as BMP, EPS, GIF, PCX, TIF, EMF, PNG or SVG. +PROJECT HISTORY +--------------- Version 2.3.0: This release features a complete rebuild of QR Code and Micro QR Code functionality which now: @@ -85,8 +73,12 @@ Version 2.5.1: Numerous bugfixes, especially with Data Matrix thanks to extensive testing by brunt@SF +Version 2.6.0: +Update front end to Qt5. Output to EMF and TIF. Copy to clipboard. Update +to latest draft of DMRE. Usual bugfixes. -CONTACT ME + +CONTACT US ---------- The home of libzint is: diff --git a/backend/aztec.c b/backend/aztec.c index 3587a8a9..3aa50f1a 100644 --- a/backend/aztec.c +++ b/backend/aztec.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/bmp.c b/backend/bmp.c index a5308e2e..cbdf4005 100644 --- a/backend/bmp.c +++ b/backend/bmp.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/bmp.h b/backend/bmp.h index dfee3ae7..ed88f864 100644 --- a/backend/bmp.h +++ b/backend/bmp.h @@ -1,7 +1,7 @@ /* bmp.h - header structure for Windows bitmap files libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code1.c b/backend/code1.c index 62b14830..410e59e0 100644 --- a/backend/code1.c +++ b/backend/code1.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code1.h b/backend/code1.h index 3bdc4f31..af27016b 100644 --- a/backend/code1.h +++ b/backend/code1.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code49.c b/backend/code49.c index 49347979..ff5d97ea 100644 --- a/backend/code49.c +++ b/backend/code49.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/code49.h b/backend/code49.h index a4f053fd..32027cb4 100644 --- a/backend/code49.h +++ b/backend/code49.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/common.h b/backend/common.h index 9d3ec7fd..d0a763a8 100644 --- a/backend/common.h +++ b/backend/common.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/dmatrix.c b/backend/dmatrix.c index fff417a9..6850fb32 100644 --- a/backend/dmatrix.c +++ b/backend/dmatrix.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart developed from and including some functions from: IEC16022 bar code generation diff --git a/backend/dmatrix.h b/backend/dmatrix.h index 8b017f3a..94335af2 100644 --- a/backend/dmatrix.h +++ b/backend/dmatrix.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/eci.c b/backend/eci.c index 9248341d..495273cc 100644 --- a/backend/eci.c +++ b/backend/eci.c @@ -1,7 +1,7 @@ /* eci.c - Extended Channel Interpretations libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/eci.h b/backend/eci.h index ac098287..391625e3 100644 --- a/backend/eci.h +++ b/backend/eci.h @@ -1,7 +1,7 @@ /* eci.c - Extended Channel Interpretations to Unicode tables libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gb18030.h b/backend/gb18030.h index 25d6abf6..9ce208ec 100644 --- a/backend/gb18030.h +++ b/backend/gb18030.h @@ -1,7 +1,7 @@ /* gb18030.h - Unicode to GB 18030 lookup table libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gb2312.h b/backend/gb2312.h index dfd72409..ba2ca0a7 100644 --- a/backend/gb2312.h +++ b/backend/gb2312.h @@ -1,7 +1,7 @@ /* gb2312.h - Unicode to GB 2312-1980 lookup table libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gif.c b/backend/gif.c index 089b0a89..858bfc81 100644 --- a/backend/gif.c +++ b/backend/gif.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gridmtx.c b/backend/gridmtx.c index 9996b251..415ff23e 100644 --- a/backend/gridmtx.c +++ b/backend/gridmtx.c @@ -1,7 +1,7 @@ /* gridmtx.c - Grid Matrix libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gridmtx.h b/backend/gridmtx.h index 5298728f..d881a307 100644 --- a/backend/gridmtx.h +++ b/backend/gridmtx.h @@ -1,7 +1,7 @@ /* gridmtx.h - definitions for Grid Matrix libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gs1.c b/backend/gs1.c index 785bfc08..6e12d566 100644 --- a/backend/gs1.c +++ b/backend/gs1.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/gs1.h b/backend/gs1.h index f633bb5c..0dba0841 100644 --- a/backend/gs1.h +++ b/backend/gs1.h @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/hanxin.c b/backend/hanxin.c index 187e61dc..2af45ed1 100644 --- a/backend/hanxin.c +++ b/backend/hanxin.c @@ -1,7 +1,7 @@ /* hanxin.c - Han Xin Code libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/hanxin.h b/backend/hanxin.h index 94eb1279..27006fac 100644 --- a/backend/hanxin.h +++ b/backend/hanxin.h @@ -1,7 +1,7 @@ /* hanxin.h - definitions for Han Xin code libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Copyright (C) 2016 Zoe Stuart Redistribution and use in source and binary forms, with or without diff --git a/backend/library.c b/backend/library.c index 4619f10c..696f9677 100644 --- a/backend/library.c +++ b/backend/library.c @@ -1,7 +1,7 @@ /* library.c - external functions of libzint libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/pcx.c b/backend/pcx.c index 0eb8cad0..b4d683a6 100644 --- a/backend/pcx.c +++ b/backend/pcx.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/png.c b/backend/png.c index 3570b9af..67f09d5f 100644 --- a/backend/png.c +++ b/backend/png.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/ps.c b/backend/ps.c index a223f4d5..755c7eff 100644 --- a/backend/ps.c +++ b/backend/ps.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/raster.c b/backend/raster.c index d6c61d72..88d44e2f 100644 --- a/backend/raster.c +++ b/backend/raster.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/render.c b/backend/render.c index 92dcbdb3..3fa52dcf 100644 --- a/backend/render.c +++ b/backend/render.c @@ -8,7 +8,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/sjis.h b/backend/sjis.h index 237f2476..9ab30f9d 100644 --- a/backend/sjis.h +++ b/backend/sjis.h @@ -1,7 +1,7 @@ /* sjis.h - Unicode to Shift JIS lookup table libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/stdint_msvc.h b/backend/stdint_msvc.h index 52f4e05c..083d9f03 100644 --- a/backend/stdint_msvc.h +++ b/backend/stdint_msvc.h @@ -1,7 +1,7 @@ /* stdint_msvc.h - definitions for libzint libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/svg.c b/backend/svg.c index ced19a45..ce6e0900 100644 --- a/backend/svg.c +++ b/backend/svg.c @@ -2,7 +2,7 @@ /* libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/backend/zint.h b/backend/zint.h index a16dee9a..4dd98e06 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -1,7 +1,7 @@ /* zint.h - definitions for libzint libzint - the open source barcode library - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -100,8 +100,8 @@ extern "C" { }; #define ZINT_VERSION_MAJOR 2 -#define ZINT_VERSION_MINOR 5 -#define ZINT_VERSION_RELEASE 1 +#define ZINT_VERSION_MINOR 6 +#define ZINT_VERSION_RELEASE 0 /* Tbarcode 7 codes */ #define BARCODE_CODE11 1 diff --git a/debian/changelog b/debian/changelog index bc69cbd5..764f1cc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zint (2.6.0) stable; urgency=medium + + * Update to Qt5 + * Ouput to EMF and TIF + + -- Robin Stuart Fri, 12 May 2017 09:00:00 +0000 + zint (2.5.1) UNRELEASED; urgency=medium * Include support for DotCode diff --git a/docs/manual.txt b/docs/manual.txt index 6bf5e04f..c6d6ebd9 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -2464,7 +2464,11 @@ v2.4.3 - Includes minor bugfixes 16/5/2011 v2.5 – Support for DotCode and Han Xin code. ECI code processing. Output to BMP, GIF and PCX. Added bold text option. Many minor bugfixes and improvements. -(Due for release November 2016). +13/11/2016 + +v2.6 - Output to EMF and TIF. Update frontend to Qt5. Copy to clipboard on +KDE and Windows. +12/5/2017 7.4 Sources of Information -------------------------- diff --git a/frontend_qt/datawindow.h b/frontend_qt/datawindow.h index fabddd14..d5d45d89 100644 --- a/frontend_qt/datawindow.h +++ b/frontend_qt/datawindow.h @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/frontend_qt/exportwindow.cpp b/frontend_qt/exportwindow.cpp index d4b13ec2..3357e549 100644 --- a/frontend_qt/exportwindow.cpp +++ b/frontend_qt/exportwindow.cpp @@ -21,23 +21,29 @@ #include #include #include +#include #include "exportwindow.h" #include ExportWindow::ExportWindow() { + QSettings settings; setupUi(this); linDestPath->setText(QDir::toNativeSeparators(QDir::homePath())); connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); connect(btnOK, SIGNAL( clicked( bool )), SLOT(process())); connect(btnDestPath, SIGNAL( clicked( bool )), SLOT(get_directory())); + + cmbFileFormat->setCurrentIndex(settings.value("studio/export/filetype", 0).toInt()); } ExportWindow::~ExportWindow() { - + QSettings settings; + + settings.setValue("studio/export/filetype", cmbFileFormat->currentIndex()); } void ExportWindow::quit_now() @@ -75,22 +81,22 @@ void ExportWindow::process() #ifdef NO_PNG case 0: suffix = ".eps"; break; case 1: suffix = ".gif"; break; - case 2: suffix = ".svg"; break; - case 3: suffix = ".bmp"; break; - case 4: suffix = ".pcx"; break; + case 2: suffix = ".svg"; break; + case 3: suffix = ".bmp"; break; + case 4: suffix = ".pcx"; break; case 5: suffix = ".emf"; break; case 6: suffix = ".tif"; break; #else - case 0: suffix = ".png"; break; + case 0: suffix = ".png"; break; case 1: suffix = ".eps"; break; case 2: suffix = ".gif"; break; - case 3: suffix = ".svg"; break; - case 4: suffix = ".bmp"; break; - case 5: suffix = ".pcx"; break; + case 3: suffix = ".svg"; break; + case 4: suffix = ".bmp"; break; + case 5: suffix = ".pcx"; break; case 6: suffix = ".emf"; break; case 7: suffix = ".tif"; break; #endif - } + } for(i = 0; i < lines; i++) { datalen = 0; @@ -150,4 +156,4 @@ void ExportWindow::process() inputpos += datalen + 1; } close(); -} \ No newline at end of file +} diff --git a/frontend_qt/exportwindow.h b/frontend_qt/exportwindow.h index 64bafc49..c6ac7c84 100644 --- a/frontend_qt/exportwindow.h +++ b/frontend_qt/exportwindow.h @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/frontend_qt/mainWindow.ui b/frontend_qt/mainWindow.ui index 3566532e..f09f5c02 100644 --- a/frontend_qt/mainWindow.ui +++ b/frontend_qt/mainWindow.ui @@ -26,7 +26,7 @@ - Zint Barcode Studio 2.5 + Zint Barcode Studio 2.6 diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 0aef858c..f5beec89 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -206,7 +206,7 @@ bool MainWindow::save() void MainWindow::about() { QMessageBox::about(this, tr("About Zint"), - tr("

Zint Barcode Studio 2.5.1

" + tr("

Zint Barcode Studio 2.6.0

" "

A free barcode generator" "

Instruction manual is available at the project homepage:
" "http://www.zint.org.uk" diff --git a/frontend_qt/sequencewindow.h b/frontend_qt/sequencewindow.h index e12845fd..a8cc6988 100644 --- a/frontend_qt/sequencewindow.h +++ b/frontend_qt/sequencewindow.h @@ -1,6 +1,6 @@ /* Zint Barcode Generator - the open source barcode generator - Copyright (C) 2009-2016 Robin Stuart + Copyright (C) 2009-2017 Robin Stuart This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/zint.spec b/zint.spec index 2a2a8a88..9404f64e 100644 --- a/zint.spec +++ b/zint.spec @@ -1,5 +1,5 @@ Name: zint -Version: 2.5.0 +Version: 2.6.0 Release: 2%{?dist} Summary: A barcode generator and library License: GPLv3+ @@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 11 2017 Robin Stuart - 2.6.0 +- Update version number + * Sat May 22 2010 Martin Gieseking - 2.3.1-2 - Added patch to fix export issue