mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-12 22:25:59 -04:00
GUI: add CLI equivalent dialog (#163); use spinboxes in Sequence dialog
and restrict sequence to max 10,000, add button icons; make Export dialog sizable and show every 100 results, add button icon; fix saving CHANNEL option, fix Export painting main window (Windows), fix guard descent not-resetting qzint: add getAsCLI(), warnLevel(), extra isStackable()/isComposite() etc Add ZBarcode_BarcodeName() manual: doc above, some fixes, tweaks
This commit is contained in:
gitlost
parent
9d85c425f4
commit
739a64a6ff
34 changed files with 2264 additions and 1199 deletions
|
|
@ -23,24 +23,34 @@
|
|||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
#include <QSettings>
|
||||
#include <QStringBuilder>
|
||||
|
||||
#include "exportwindow.h"
|
||||
|
||||
ExportWindow::ExportWindow()
|
||||
// Shorthand
|
||||
#define QSL QStringLiteral
|
||||
|
||||
ExportWindow::ExportWindow(BarcodeItem *bc, const QString& output_data) : m_bc(bc), m_output_data(output_data)
|
||||
{
|
||||
setupUi(this);
|
||||
QSettings settings;
|
||||
#if QT_VERSION < 0x60000
|
||||
settings.setIniCodec("UTF-8");
|
||||
#endif
|
||||
setupUi(this);
|
||||
|
||||
linDestPath->setText(settings.value("studio/export/destination",
|
||||
QByteArray geometry = settings.value(QSL("studio/export/window_geometry")).toByteArray();
|
||||
restoreGeometry(geometry);
|
||||
|
||||
linDestPath->setText(settings.value(QSL("studio/export/destination"),
|
||||
QDir::toNativeSeparators(QDir::homePath())).toString());
|
||||
linPrefix->setText(settings.value("studio/export/file_prefix", "bcs_").toString());
|
||||
cmbFileName->setCurrentIndex(settings.value("studio/export/name_format", 0).toInt());
|
||||
cmbFileFormat->setCurrentIndex(settings.value("studio/export/filetype", 0).toInt());
|
||||
linPrefix->setText(settings.value(QSL("studio/export/file_prefix"), QSL("bcs_")).toString());
|
||||
cmbFileName->setCurrentIndex(settings.value(QSL("studio/export/name_format"), 0).toInt());
|
||||
cmbFileFormat->setCurrentIndex(settings.value(QSL("studio/export/filetype"), 0).toInt());
|
||||
|
||||
connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now()));
|
||||
QIcon closeIcon(QIcon::fromTheme(QSL("window-close"), QIcon(QSL(":res/x.svg"))));
|
||||
btnCancel->setIcon(closeIcon);
|
||||
|
||||
connect(btnCancel, SIGNAL( clicked( bool )), SLOT(close()));
|
||||
connect(btnOK, SIGNAL( clicked( bool )), SLOT(process()));
|
||||
connect(btnDestPath, SIGNAL( clicked( bool )), SLOT(get_directory()));
|
||||
}
|
||||
|
|
@ -51,16 +61,12 @@ ExportWindow::~ExportWindow()
|
|||
#if QT_VERSION < 0x60000
|
||||
settings.setIniCodec("UTF-8");
|
||||
#endif
|
||||
settings.setValue(QSL("studio/export/window_geometry"), saveGeometry());
|
||||
|
||||
settings.setValue("studio/export/destination", linDestPath->text());
|
||||
settings.setValue("studio/export/file_prefix", linPrefix->text());
|
||||
settings.setValue("studio/export/name_format", cmbFileName->currentIndex());
|
||||
settings.setValue("studio/export/filetype", cmbFileFormat->currentIndex());
|
||||
}
|
||||
|
||||
void ExportWindow::quit_now()
|
||||
{
|
||||
close();
|
||||
settings.setValue(QSL("studio/export/destination"), linDestPath->text());
|
||||
settings.setValue(QSL("studio/export/file_prefix"), linPrefix->text());
|
||||
settings.setValue(QSL("studio/export/name_format"), cmbFileName->currentIndex());
|
||||
settings.setValue(QSL("studio/export/filetype"), cmbFileFormat->currentIndex());
|
||||
}
|
||||
|
||||
void ExportWindow::get_directory()
|
||||
|
|
@ -73,116 +79,148 @@ void ExportWindow::get_directory()
|
|||
QFileDialog fdialog;
|
||||
|
||||
fdialog.setFileMode(QFileDialog::Directory);
|
||||
fdialog.setDirectory(settings.value("studio/default_dir", QDir::toNativeSeparators(QDir::homePath())).toString());
|
||||
fdialog.setDirectory(settings.value(QSL("studio/default_dir"),
|
||||
QDir::toNativeSeparators(QDir::homePath())).toString());
|
||||
|
||||
if(fdialog.exec()) {
|
||||
if (fdialog.exec()) {
|
||||
directory = fdialog.selectedFiles().at(0);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
linDestPath->setText(QDir::toNativeSeparators(directory));
|
||||
settings.setValue("studio/default_dir", directory);
|
||||
settings.setValue(QSL("studio/default_dir"), directory);
|
||||
}
|
||||
|
||||
void ExportWindow::process()
|
||||
{
|
||||
QString fileName;
|
||||
QString dataString;
|
||||
const QRegularExpression urlRE(QSL("[\\/:*?\"<>|%]"));
|
||||
|
||||
txtFeedback->setPlainText(tr("Processing..."));
|
||||
txtFeedback->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
|
||||
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
|
||||
|
||||
QStringList dataList = m_output_data.split('\n');
|
||||
int lines = dataList.size();
|
||||
if (lines && dataList[lines - 1].isEmpty()) {
|
||||
lines--;
|
||||
}
|
||||
|
||||
QString biggest;
|
||||
bool needUrlEscape = false;
|
||||
|
||||
const int fileNameIdx = cmbFileName->currentIndex();
|
||||
if (fileNameIdx == 1) {
|
||||
biggest = QString::number(lines + 1);
|
||||
} else {
|
||||
needUrlEscape = m_output_data.contains(urlRE);
|
||||
}
|
||||
|
||||
QString suffix;
|
||||
QString Feedback;
|
||||
int lines, i, j, inputpos;
|
||||
|
||||
lines = output_data.count(QChar('\n'), Qt::CaseInsensitive);
|
||||
inputpos = 0;
|
||||
|
||||
switch(cmbFileFormat->currentIndex()) {
|
||||
switch (cmbFileFormat->currentIndex()) {
|
||||
#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 5: suffix = ".emf"; break;
|
||||
case 6: suffix = ".tif"; break;
|
||||
case 0: suffix = QSL(".eps"); break;
|
||||
case 1: suffix = QSL(".gif"); break;
|
||||
case 2: suffix = QSL(".svg"); break;
|
||||
case 3: suffix = QSL(".bmp"); break;
|
||||
case 4: suffix = QSL(".pcx"); break;
|
||||
case 5: suffix = QSL(".emf"); break;
|
||||
case 6: suffix = QSL(".tif"); break;
|
||||
#else
|
||||
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 6: suffix = ".emf"; break;
|
||||
case 7: suffix = ".tif"; break;
|
||||
case 0: suffix = QSL(".png"); break;
|
||||
case 1: suffix = QSL(".eps"); break;
|
||||
case 2: suffix = QSL(".gif"); break;
|
||||
case 3: suffix = QSL(".svg"); break;
|
||||
case 4: suffix = QSL(".bmp"); break;
|
||||
case 5: suffix = QSL(".pcx"); break;
|
||||
case 6: suffix = QSL(".emf"); break;
|
||||
case 7: suffix = QSL(".tif"); break;
|
||||
#endif
|
||||
}
|
||||
txtFeedback->clear();
|
||||
Feedback = "";
|
||||
|
||||
for(i = 0; i < lines; i++) {
|
||||
int datalen = 0;
|
||||
for(j = inputpos; ((j < output_data.length()) && (output_data[j] != '\n') ); j++) {
|
||||
datalen++;
|
||||
}
|
||||
dataString = output_data.mid(inputpos, datalen);
|
||||
switch(cmbFileName->currentIndex()) {
|
||||
case 0: { /* Same as Data (URL Escaped) */
|
||||
QString filePathPrefix = linDestPath->text() % QDir::separator() % linPrefix->text();
|
||||
|
||||
QStringList Feedback;
|
||||
int successCount = 0, errorCount = 0;
|
||||
for (int i = 0; i < lines; i++) {
|
||||
const QString &dataString = dataList[i];
|
||||
QString fileName;
|
||||
switch (fileNameIdx) {
|
||||
case 0: /* Same as Data (URL Escaped) */
|
||||
if (needUrlEscape) {
|
||||
QString url_escaped;
|
||||
int m;
|
||||
QChar name_qchar;
|
||||
|
||||
for(m = 0; m < dataString.length(); m++) {
|
||||
name_qchar = dataString[m];
|
||||
for (int m = 0; m < dataString.length(); m++) {
|
||||
QChar name_qchar = dataString[m];
|
||||
char name_char = name_qchar.toLatin1();
|
||||
|
||||
switch(name_char) {
|
||||
case '\\': url_escaped += "%5C"; break;
|
||||
case '/': url_escaped += "%2F"; break;
|
||||
case ':': url_escaped += "%3A"; break;
|
||||
case '*': url_escaped += "%2A"; break;
|
||||
case '?': url_escaped += "%3F"; break;
|
||||
case '"': url_escaped += "%22"; break;
|
||||
case '<': url_escaped += "%3C"; break;
|
||||
case '>': url_escaped += "%3E"; break;
|
||||
case '|': url_escaped += "%7C"; break;
|
||||
case '%': url_escaped += "%25"; break;
|
||||
switch (name_char) {
|
||||
case '\\': url_escaped += QSL("%5C"); break;
|
||||
case '/': url_escaped += QSL("%2F"); break;
|
||||
case ':': url_escaped += QSL("%3A"); break;
|
||||
case '*': url_escaped += QSL("%2A"); break;
|
||||
case '?': url_escaped += QSL("%3F"); break;
|
||||
case '"': url_escaped += QSL("%22"); break;
|
||||
case '<': url_escaped += QSL("%3C"); break;
|
||||
case '>': url_escaped += QSL("%3E"); break;
|
||||
case '|': url_escaped += QSL("%7C"); break;
|
||||
case '%': url_escaped += QSL("%25"); break;
|
||||
default: url_escaped += name_qchar; break;
|
||||
}
|
||||
}
|
||||
fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + url_escaped + suffix;
|
||||
fileName = filePathPrefix % url_escaped % suffix;
|
||||
} else {
|
||||
fileName = filePathPrefix % dataString % suffix;
|
||||
}
|
||||
break;
|
||||
case 1: { /* Formatted Serial Number */
|
||||
QString biggest, this_val, outnumber;
|
||||
int number_size, val_size, m;
|
||||
QString this_val, pad;
|
||||
|
||||
biggest = QString::number(lines + 1);
|
||||
number_size = biggest.length();
|
||||
this_val = QString::number(i + 1);
|
||||
val_size = this_val.length();
|
||||
|
||||
for(m = 0; m < (number_size - val_size); m++) {
|
||||
outnumber += QChar('0');
|
||||
}
|
||||
pad.fill('0', biggest.length() - this_val.length());
|
||||
|
||||
outnumber += this_val;
|
||||
|
||||
fileName = linDestPath->text() + QDir::separator() + linPrefix->text() + outnumber + suffix;
|
||||
fileName = filePathPrefix % pad % this_val % suffix;
|
||||
}
|
||||
break;
|
||||
}
|
||||
barcode->bc.setText(dataString.toLatin1().data());
|
||||
barcode->bc.save_to_file(fileName.toLatin1().data());
|
||||
Feedback += "Line ";
|
||||
Feedback += QString::number(i + 1);
|
||||
Feedback += ": ";
|
||||
if (barcode->bc.hasErrors()) {
|
||||
Feedback += barcode->bc.error_message();
|
||||
Feedback += "\n";
|
||||
m_bc->bc.setText(dataString);
|
||||
m_bc->bc.save_to_file(fileName);
|
||||
if (m_bc->bc.hasErrors()) {
|
||||
/*: %1 is line number, %2 is error message */
|
||||
Feedback << tr("Line %1: %2").arg(i + 1).arg(m_bc->bc.error_message());
|
||||
errorCount++;
|
||||
} else {
|
||||
Feedback += "Success\n";
|
||||
/*: %1 is line number */
|
||||
Feedback << tr("Line %1: Success").arg(i + 1);
|
||||
successCount++;
|
||||
}
|
||||
if (i && (i % 100 == 0)) {
|
||||
txtFeedback->appendPlainText(Feedback.join('\n'));
|
||||
txtFeedback->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
|
||||
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
|
||||
Feedback.clear();
|
||||
}
|
||||
txtFeedback->document()->setPlainText(Feedback);
|
||||
inputpos += datalen + 1;
|
||||
}
|
||||
|
||||
QString summary;
|
||||
if (errorCount && successCount) {
|
||||
/*: %1 is total no. of items processed, %2 is no. of failures, %3 is no. of successes */
|
||||
summary = tr("Total %1, %2 failed, %3 succeeded.").arg(errorCount + successCount).arg(errorCount)
|
||||
.arg(successCount);
|
||||
} else if (errorCount) {
|
||||
/*: %1 is no. of failures */
|
||||
summary = tr("All %1 failed.").arg(errorCount);
|
||||
} else if (successCount) {
|
||||
/*: %1 is no. of successes */
|
||||
summary = tr("All %1 succeeded.").arg(successCount);
|
||||
} else {
|
||||
summary = tr("No items.");
|
||||
}
|
||||
if (Feedback.size()) {
|
||||
txtFeedback->appendPlainText(Feedback.join('\n') + '\n' + summary + '\n');
|
||||
} else {
|
||||
txtFeedback->appendPlainText(summary + '\n');
|
||||
}
|
||||
txtFeedback->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue