diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63572409..4ae04ba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set (ZINT_VERSION_MAJOR 2)
set (ZINT_VERSION_MINOR 5)
-set (ZINT_VERSION_RELEASE 0)
+set (ZINT_VERSION_RELEASE 1)
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 72186861..c3659478 100644
--- a/README
+++ b/README
@@ -76,6 +76,15 @@ Fix bugs in batch processing - this now works from the command line.
Version 2.4.3:
Some Windows-only fixes and changes
+Version 2.5.0:
+Support for DotCode and Han Xin code. ECI code processing. Output to BMP, GIF
+and PCX. Added bold and small text options. Reintroduction of Codablock-F.
+Many minor fixes and improvements.
+
+Version 2.5.1:
+Numerous bugfixes, especially with Data Matrix thanks to extensive testing
+by brunt@SF
+
CONTACT ME
----------
diff --git a/backend/ps.c b/backend/ps.c
index 75132b34..a223f4d5 100644
--- a/backend/ps.c
+++ b/backend/ps.c
@@ -291,7 +291,7 @@ int ps_plot(struct zint_symbol *symbol) {
/* Start writing the header */
fprintf(feps, "%%!PS-Adobe-3.0 EPSF-3.0\n");
- fprintf(feps, "%%%%Creator: Zint %s\n", ZINT_VERSION);
+ fprintf(feps, "%%%%Creator: Zint %d.%d.%d\n", ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE);
if ((ustrlen(local_text) != 0) && (symbol->show_hrt != 0)) {
fprintf(feps, "%%%%Title: %s\n", local_text);
} else {
diff --git a/backend/zint.h b/backend/zint.h
index f2d04d1d..c1734756 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -98,7 +98,10 @@ extern "C" {
struct zint_render *rendered;
};
-
+#define ZINT_VERSION_MAJOR 2
+#define ZINT_VERSION_MINOR 5
+#define ZINT_VERSION_RELEASE 1
+
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1
#define BARCODE_C25MATRIX 2
diff --git a/frontend/main.c b/frontend/main.c
index ae0520c2..e7f1fa11 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -72,7 +72,7 @@ void types(void) {
/* Output usage information */
void usage(void) {
- printf( "Zint version %s\n"
+ printf( "Zint version %d.%d.%d\n"
"Encode input data in a barcode and save as a PNG, BMP, GIF, PCX, EPS or SVG file.\n\n"
" -b, --barcode=NUMBER Number of barcode type (default is 20 (=Code128)).\n"
" --batch Treat each line of input file as a separate data set\n"
@@ -114,7 +114,7 @@ void usage(void) {
" -t, --types Display table of barcode types\n"
" --vers=NUMBER Set symbol version (QR Code/Han Xin)\n"
" -w, --whitesp=NUMBER Set Width of whitespace in multiples of x-dimension\n"
- , ZINT_VERSION);
+ , ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE);
}
/* Display supported ECI codes */
diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp
index b1a2ae80..ed71a5ff 100644
--- a/frontend_qt4/mainwindow.cpp
+++ b/frontend_qt4/mainwindow.cpp
@@ -172,7 +172,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
- tr("Zint Barcode Studio 2.5
"
+ tr("Zint Barcode Studio 2.5.1
"
"A free barcode generator"
"
Instruction manual is available from Sourceforge:"
"
http://www.sourceforge.net/projects/zint"
diff --git a/frontend_qt5/ZintUI/ZintUI.pro b/frontend_qt5/ZintUI/ZintUI.pro
new file mode 100644
index 00000000..06fa1d5f
--- /dev/null
+++ b/frontend_qt5/ZintUI/ZintUI.pro
@@ -0,0 +1,20 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-11-27T10:20:27
+#
+#-------------------------------------------------
+
+QT += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ZintUI
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+ mainwindow.cpp
+
+HEADERS += mainwindow.h
+
+FORMS += mainwindow.ui
diff --git a/frontend_qt5/ZintUI/main.cpp b/frontend_qt5/ZintUI/main.cpp
new file mode 100644
index 00000000..b48f94ec
--- /dev/null
+++ b/frontend_qt5/ZintUI/main.cpp
@@ -0,0 +1,11 @@
+#include "mainwindow.h"
+#include
+
+int main(int argc, char *argv[])
+{
+ QApplication a(argc, argv);
+ MainWindow w;
+ w.show();
+
+ return a.exec();
+}
diff --git a/frontend_qt5/ZintUI/mainwindow.cpp b/frontend_qt5/ZintUI/mainwindow.cpp
new file mode 100644
index 00000000..49d64fce
--- /dev/null
+++ b/frontend_qt5/ZintUI/mainwindow.cpp
@@ -0,0 +1,14 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::MainWindow)
+{
+ ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+ delete ui;
+}
diff --git a/frontend_qt5/ZintUI/mainwindow.h b/frontend_qt5/ZintUI/mainwindow.h
new file mode 100644
index 00000000..a3948a91
--- /dev/null
+++ b/frontend_qt5/ZintUI/mainwindow.h
@@ -0,0 +1,22 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit MainWindow(QWidget *parent = 0);
+ ~MainWindow();
+
+private:
+ Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H
diff --git a/frontend_qt5/ZintUI/mainwindow.ui b/frontend_qt5/ZintUI/mainwindow.ui
new file mode 100644
index 00000000..6050363f
--- /dev/null
+++ b/frontend_qt5/ZintUI/mainwindow.ui
@@ -0,0 +1,24 @@
+
+ MainWindow
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+
+
+
+