Update to version 2.6.0 and update copyright to 2017

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

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

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;
@ -150,4 +156,4 @@ void ExportWindow::process()
inputpos += datalen + 1;
}
close();
}
}

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

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

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

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