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

Update to version 2.6.0 and update copyright to 2017

Browse Source
This commit is contained in:
Robin Stuart 2017-05-11 21:14:38 +01:00
parent eef59d150e
commit 19ba8a34c4
42 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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)

24
README
View File

@ -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:

2
backend/aztec.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/bmp.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/bmp.h
View File

@ -1,7 +1,7 @@
/* bmp.h - header structure for Windows bitmap files
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/code1.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/code1.h
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/code49.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/code49.h
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/common.h
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/dmatrix.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
developed from and including some functions from:
IEC16022 bar code generation

2
backend/dmatrix.h
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/eci.c
View File

@ -1,7 +1,7 @@
/* eci.c - Extended Channel Interpretations
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/eci.h
View File

@ -1,7 +1,7 @@
/* eci.c - Extended Channel Interpretations to Unicode tables
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gb18030.h
View File

@ -1,7 +1,7 @@
/* gb18030.h - Unicode to GB 18030 lookup table
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gb2312.h
View File

@ -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 <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gif.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gridmtx.c
View File

@ -1,7 +1,7 @@
/* gridmtx.c - Grid Matrix
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gridmtx.h
View File

@ -1,7 +1,7 @@
/* gridmtx.h - definitions for Grid Matrix
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gs1.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/gs1.h
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/hanxin.c
View File

@ -1,7 +1,7 @@
/* hanxin.c - Han Xin Code
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/hanxin.h
View File

@ -1,7 +1,7 @@
/* hanxin.h - definitions for Han Xin code
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2016 Zoe Stuart
Redistribution and use in source and binary forms, with or without

2
backend/library.c
View File

@ -1,7 +1,7 @@
/* library.c - external functions of libzint
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/pcx.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/png.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/ps.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/raster.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/render.c
View File

@ -8,7 +8,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/sjis.h
View File

@ -1,7 +1,7 @@
/* sjis.h - Unicode to Shift JIS lookup table
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/stdint_msvc.h
View File

@ -1,7 +1,7 @@
/* stdint_msvc.h - definitions for libzint
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

2
backend/svg.c
View File

@ -2,7 +2,7 @@
/*
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

6
backend/zint.h
View File

@ -1,7 +1,7 @@
/* zint.h - definitions for libzint
libzint - the open source barcode library
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
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

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
zint (2.6.0) stable; urgency=medium
* Update to Qt5
* Ouput to EMF and TIF
-- Robin Stuart <rstuart114@gmail.com> Fri, 12 May 2017 09:00:00 +0000
zint (2.5.1) UNRELEASED; urgency=medium
* Include support for DotCode

6
docs/manual.txt
View File

@ -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
--------------------------

2
frontend_qt/datawindow.h
View File

@ -1,6 +1,6 @@
/*
Zint Barcode Generator - the open source barcode generator
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
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

22
frontend_qt/exportwindow.cpp
View File

@ -21,23 +21,29 @@
#include <QUiLoader>
#include <QFileDialog>
#include <QMessageBox>
#include <QSettings>
#include "exportwindow.h"
#include <stdio.h>
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;

2
frontend_qt/exportwindow.h
View File

@ -1,6 +1,6 @@
/*
Zint Barcode Generator - the open source barcode generator
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
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

2
frontend_qt/mainWindow.ui
View File

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

2
frontend_qt/mainwindow.cpp
View File

@ -206,7 +206,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.5.1</h2>"
tr("<h2>Zint Barcode Studio 2.6.0</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>"

2
frontend_qt/sequencewindow.h
View File

@ -1,6 +1,6 @@
/*
Zint Barcode Generator - the open source barcode generator
Copyright (C) 2009-2016 Robin Stuart <rstuart114@gmail.com>
Copyright (C) 2009-2017 Robin Stuart <rstuart114@gmail.com>
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

5
zint.spec
View File

@ -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 <rstuart114@gmail.com> - 2.6.0
- Update version number
* Sat May 22 2010 Martin Gieseking <martin.gieseking@uos.de> - 2.3.1-2
- Added patch to fix export issue