mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
Add rMQR to Barcode Studio
and perform some code beautifying at the same time
This commit is contained in:
parent
ad28de1819
commit
ac00e381a6
@ -1,7 +1,7 @@
|
||||
/* qr.h Data for QR Code, Micro QR Code and rMQR
|
||||
|
||||
libzint - the open source barcode library
|
||||
Copyright (C) 2008-2017 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2008-2019 Robin Stuart <rstuart114@gmail.com>
|
||||
Copyright (C) 2006 Kentaro Fukuchi <fukuchi@megaui.net>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
@ -1,6 +1,6 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> *
|
||||
* Copyright (C) 2009-2017 by Robin Stuart <rstuart114@gmail.com> *
|
||||
* Copyright (C) 2009-2019 by 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 *
|
||||
@ -101,6 +101,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags fl)
|
||||
"PLANET",
|
||||
"Postnet",
|
||||
"QR Code (ISO 18004)",
|
||||
"Reduced Micro QR (rMQR)",
|
||||
"Royal Mail 4-state Barcode",
|
||||
"Royal Mail 4-state Mailmark",
|
||||
"Telepen",
|
||||
@ -112,9 +113,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags fl)
|
||||
"USPS Intelligent Mail"
|
||||
};
|
||||
|
||||
/* createActions();
|
||||
createMenus(); */
|
||||
|
||||
scene = new QGraphicsScene(this);
|
||||
|
||||
setupUi(this);
|
||||
@ -286,9 +284,7 @@ void MainWindow::about()
|
||||
"ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
|
||||
"ISO/IEC 21471:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,<br>"
|
||||
"ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200"
|
||||
"</small></td></tr></table>"
|
||||
|
||||
));
|
||||
"</small></td></tr></table>"));
|
||||
}
|
||||
|
||||
int MainWindow::open_data_dialog()
|
||||
@ -415,7 +411,6 @@ void MainWindow::change_options()
|
||||
else
|
||||
chkComposite->setText(tr("Add 2D Component"));
|
||||
|
||||
|
||||
if(metaObject()->enumerator(0).value(bstyle->currentIndex()) == BARCODE_PDF417)
|
||||
{
|
||||
QFile file(":/grpPDF417.ui");
|
||||
@ -749,7 +744,6 @@ void MainWindow::update_preview()
|
||||
m_bc.bc.setText(txtComposite->toPlainText());
|
||||
} else {
|
||||
m_bc.bc.setText(txtData->text());
|
||||
/*m_bc.bc.setPrimaryMessage(txtComposite->text());*/
|
||||
}
|
||||
m_bc.bc.setSecurityLevel(0);
|
||||
m_bc.bc.setWidth(0);
|
||||
@ -1058,4 +1052,3 @@ void MainWindow::update_preview()
|
||||
scene->setSceneRect(0, 0, width - 10, height - 10);
|
||||
scene->update();
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> *
|
||||
* Copyright (C) 2009-2016 by Robin Stuart <rstuart114@gmail.com> *
|
||||
* Copyright (C) 2009-2019 by 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 *
|
||||
@ -96,6 +96,7 @@ public:
|
||||
PLANET = 82,
|
||||
POSTNET = 40,
|
||||
QRCODE = 58,
|
||||
RMQR = 145,
|
||||
RM4SCC = 70,
|
||||
MAILMARK = 121,
|
||||
TELEPEN = 32,
|
||||
@ -137,20 +138,10 @@ private slots:
|
||||
void copy_to_clipboard_bmp();
|
||||
|
||||
private:
|
||||
/* void createActions();
|
||||
void createMenus(); */
|
||||
|
||||
QColor m_fgcolor,m_bgcolor;
|
||||
BarcodeItem m_bc;
|
||||
QWidget *m_optionWidget;
|
||||
QGraphicsScene *scene;
|
||||
/* QMenu *fileMenu;
|
||||
QMenu *helpMenu;
|
||||
QAction *saveAct;
|
||||
QAction *aboutQtAct; */
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user