From cfcb586f4b800ad0ee9f220e15ef2b66f105f6dc Mon Sep 17 00:00:00 2001 From: gitlost Date: Thu, 20 May 2021 18:22:57 +0100 Subject: [PATCH] Use zint-64.svg from https://github.com/frhun/flathub for smoother icons, props frhun --- README | 9 +- frontend_qt/extData.ui | 4 +- frontend_qt/extExport.ui | 4 +- frontend_qt/extSequence.ui | 4 +- frontend_qt/images/rotateleft.png | Bin 1754 -> 0 bytes frontend_qt/images/rotateright.png | Bin 1732 -> 0 bytes frontend_qt/images/zint.png | Bin 458 -> 0 bytes frontend_qt/images/zoomin.png | Bin 1622 -> 0 bytes frontend_qt/images/zoomout.png | Bin 1601 -> 0 bytes frontend_qt/mainWindow.ui | 12 +- frontend_qt/mainwindow.cpp | 293 +++++++++------------- frontend_qt/res/qtZint.rc | 4 +- frontend_qt/res/zint.ico | Bin 25842 -> 0 bytes frontend_qt/resources.qrc | 38 ++- win32/zint_cmdline_vc6/zint_black_vc6.ico | Bin 2174 -> 14134 bytes zint-qt.desktop | 8 +- zint.png | Bin 458 -> 0 bytes 17 files changed, 158 insertions(+), 218 deletions(-) delete mode 100644 frontend_qt/images/rotateleft.png delete mode 100644 frontend_qt/images/rotateright.png delete mode 100644 frontend_qt/images/zint.png delete mode 100644 frontend_qt/images/zoomin.png delete mode 100644 frontend_qt/images/zoomout.png delete mode 100644 frontend_qt/res/zint.ico delete mode 100644 zint.png diff --git a/README b/README index f5abd0a7..4a62662b 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ 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, rMQR and Ultracode. -Output can be saved as BMP, EPS, GIF, PCX, TIF, EMF, PNG or SVG. +Output can be saved as BMP, EPS, GIF, PCX, TIF, EMF, PNG or SVG. PROJECT HISTORY --------------- @@ -275,6 +275,9 @@ Bugs: - Fix QPainterPath dependency for Visual Studio Version 2.9.2 not released yet: +***Incompatible change** +- Add halign to struct zint_vector_string NOTE: backward incompatible UPC/EAN + Changes: - Command line switches -d or -i for code data may now be at any position. - Add rotation for vector formats @@ -287,8 +290,8 @@ Changes: - Remove backend Qt interface and incorporate into frontend GUI - Add ZPL compatibility mode (preliminary) - Remove version info from zint.h and put in zintconfig.h via zintconfig.h.in -- Add halign to struct zint_vector_string NOTE: backward incompatible UPC/EAN - Add ZBarcode_Cap() +- Add GUI symbology filter, separate settings for each symbology - Require cmake 3.5, use PNG::PNG and add Qt6 build option - Make library fully stack-based so reentrant apart from file operations - Performance improvements (large data) for Aztec, Han Xin, Grid Matrix, PDF417 @@ -300,6 +303,8 @@ Changes: - png.c: Use palette for file size savings - tif.c: Use palette/bilevel/LZW to reduce file size, alpha/CMYK support - Option gs1parens (GS1PARENS_MODE) +- MAXICODE: Rejig raster output to more closely match ISO 16023:2000 +- C25STANDARD/C25INTER/C25IATA/C25LOGIC/C25IND: add check digit option (#216) Bugs: - Code16k selects GS1 mode by default in GUI diff --git a/frontend_qt/extData.ui b/frontend_qt/extData.ui index fb852138..3f104bc8 100644 --- a/frontend_qt/extData.ui +++ b/frontend_qt/extData.ui @@ -14,8 +14,8 @@ Input Data - - images/zint.pngimages/zint.png + + :res/zint-qt.ico:res/zint-qt.ico true diff --git a/frontend_qt/extExport.ui b/frontend_qt/extExport.ui index f8f3f1bb..6bccdc6e 100644 --- a/frontend_qt/extExport.ui +++ b/frontend_qt/extExport.ui @@ -32,8 +32,8 @@ Export Barcodes - - images/zint.pngimages/zint.png + + :res/zint-qt.ico:res/zint-qt.ico diff --git a/frontend_qt/extSequence.ui b/frontend_qt/extSequence.ui index 43deb3a5..dd90edc0 100644 --- a/frontend_qt/extSequence.ui +++ b/frontend_qt/extSequence.ui @@ -14,8 +14,8 @@ Sequence Export - - images/zint.pngimages/zint.png + + :res/zint-qt.ico:res/zint-qt.ico true diff --git a/frontend_qt/images/rotateleft.png b/frontend_qt/images/rotateleft.png deleted file mode 100644 index 8cfa931986b270eee022af8f2855226638008a35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1754 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 diff --git a/frontend_qt/images/zoomin.png b/frontend_qt/images/zoomin.png deleted file mode 100644 index 8b0daeea4801323d5ca253f7ee4d9215e60903ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1622 zcmV-c2C4apP);FX zK~z}7#g=VMQ)d*%`RX^m;|KQ!xFyT7eRJ8yGW}qdEiOh;V@zG<=0sK?NZlyd2@Kh+ z;0v3AP*9dXZNl`oeKwYp4EP*j4#GBc_h1@5@< zdKY)r($xo{yPrFyXQ8Jb?frwe-Z#L{lD!MA<~_=_-v^04XV%nv0iS`Yy6b$w~g6O7x`BUU{VfiHXWEj{#WCV5n{4 z>ZTqiMN=u-di&8eIK!1Cf!jC^cA?dz(6eAV^@8 za!RWho!AxRjP&7h3zUr31d{seIk0bfu7Qw{Xic`dkPDD{oj}AvL_JUSCxuhp9q!1< zIXNY9K3G`5{KJQQ?U?QzJOjuv!O)-~_?H$NeU0`Yt$H9Yg6?2M&giO21WP?^~MfKVJXgltY*2J|i#jamj zMwl)nyLX41C6Z7?$zlRGW7fbRvR{EUb}g<* zUlPKT>*BY8!a&|9U|!u2N(K?k9$$s&dp~4<6Zm3?HFZ7^&0BzsuL6D3z6=z4au|do z%MEdYLF~XJgD8*m!&%7-Ajq-75sNiS?*aHftla^=DZ2uMjtd_%2o-~dFfxb> zuc1WhhZ8#jRL_lE1Q5+zh@@=+zCUdZ5ZY8hz(gjNI7Bjo*vTMX$CVI2#DDP=gy{Hb zTWKZ~p9T2FeCjVWpZ|zKWMIif5Gf2|7l+9G+7Hp2{r`ekj(8O^AYM_M{Cy8?^cQSt zA2Nt^22qXqUIt;>h0c?2AZqj5Sal8jvcV?t0r0=tAHk~7 U)bUA|oB#j-07*qoM6N<$f<#*pbpQYW diff --git a/frontend_qt/images/zoomout.png b/frontend_qt/images/zoomout.png deleted file mode 100644 index 1575dd24f6da8f5db31756a07b3baf6a8329001d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1601 zcmV-H2EO@;P)3l5#GF3@18Rhi8-_G{OgAPDWSSX#iY!RF2EeuP$AFBZM(L#?h1&}vOqO@$t% z6-H>QuA!o`0lMl&=xZ(fY^-U-RZ}(CbM~^bD(Ndru2kx!>M|{qSM)q-O>;ZyT079t z)`iCQE?7Ex(A?FFmaaZNXR2>T`Bf82O7!MSmkckbMqy#Ow75hKWw{wuO#)BcbiJD= zYwhlb&@;f3(zVb#fR2G7T<;&`&uH}~u-^*>1?ApB$mOL07Yd6}tTFNAv|38iId}s- z))92y80KfXt`|D_eFAacr)Nvc^D8w)C>` z>1oV3owzqQ$Ac14;z_%mub7gOLclV3eUZemiC)nW2)nhCqq$P ztz+Xnk>mb-EG#Z!?!g1T;{MTFu-Rw1IyY^1aQn{RgXR?HijkC*>v;I^6AW!MJW zw9~n}z-`1~wmBWoI>}a@2%WALGMS1X>_%ggwEoxi@`mJhR<1^HaM)%BVof-b%s#O? zzP}R$0Z2u>#4-c~+Cj0*$5?Ri}PHdzvrWj;?_zex2M~ zH3C_fSs*$(7KzEJkV=yf8XC^pEL0%1cJKaiEj=3>oAdsYO)Xzlo*4q+%vW&ezrh{F zS~UIS1C3;z{H6XaF;&*GgaPdQuMWQu{(-7lz72~GGv<5J;4mF3}Od^cng>J`XK4+XCNqs zBWlxoSoO|0u)$Z%La5IA7?_Z82&*v;(k&k%B_VzF0hU7)9a@jujfqIy{t?s{OV}Tm zRJ-WEI@}QZH@=Ic!@tm<7W>w%(SafW|7-jSM=!S;*hl9L00000NkvXXu0mjfZ{hZ; diff --git a/frontend_qt/mainWindow.ui b/frontend_qt/mainWindow.ui index 60841693..9eb2b282 100644 --- a/frontend_qt/mainWindow.ui +++ b/frontend_qt/mainWindow.ui @@ -30,7 +30,7 @@ - :/images/zint.png:/images/zint.png + :/res/zint-qt.ico:/res/zint-qt.ico false @@ -878,11 +878,11 @@ to delimit GS1 application identifiers - Show text in image + Show Human Readable Text in image (ignored if disabled) - Show H&uman Readable Text + Show Te&xt true @@ -1083,7 +1083,7 @@ to delimit GS1 application identifiers About Zint - &About + Abo&ut @@ -1133,10 +1133,10 @@ to delimit GS1 application identifiers - Quit Zint Barcode Studio + Exit Zint Barcode Studio - E&xit + &Quit diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index a01efb96..d006cc13 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -143,7 +143,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags fl) int cnt = metaObject()->enumerator(0).keyCount(); for (int i = 0; i < cnt; i++) { bstyle->addItem(metaObject()->enumerator(0).key(i)); - bstyle->setItemText(i, bstyle_text[i]); + bstyle->setItemText(i, tr(bstyle_text[i])); } #ifdef _WIN32 bstyle->setMaxVisibleItems(cnt); /* Apart from increasing combo size, seems to be needed for filter to work */ @@ -155,8 +155,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags fl) bstyle->setCurrentIndex(settings.value("studio/symbology", 10).toInt()); - txtData->setText(settings.value("studio/data", "Your Data Here!").toString()); - txtComposite->setText(settings.value("studio/composite_text", "Your Data Here!").toString()); + txtData->setText(settings.value("studio/data", tr("Your Data Here!")).toString()); + txtComposite->setText(settings.value("studio/composite_text", tr("Your Data Here!")).toString()); chkComposite->setChecked(settings.value("studio/chk_composite").toInt() ? true : false); cmbCompType->setCurrentIndex(settings.value("studio/comp_type", 0).toInt()); cmbECI->setCurrentIndex(settings.value("studio/appearance/eci", 0).toInt()); @@ -293,7 +293,7 @@ bool MainWindow::save() QString suffix; save_dialog.setAcceptMode(QFileDialog::AcceptSave); - save_dialog.setWindowTitle("Save Barcode Image"); + save_dialog.setWindowTitle(tr("Save Barcode Image")); save_dialog.setDirectory(settings.value("studio/default_dir", QDir::toNativeSeparators(QDir::homePath())).toString()); #ifdef NO_PNG @@ -305,21 +305,21 @@ bool MainWindow::save() #endif if (QString::compare(suffix, "png", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Portable Network Graphic (*.png)"); + save_dialog.selectNameFilter(tr("Portable Network Graphic (*.png)")); if (QString::compare(suffix, "eps", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Encapsulated PostScript (*.eps)"); + save_dialog.selectNameFilter(tr("Encapsulated PostScript (*.eps)")); if (QString::compare(suffix, "gif", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Graphics Interchange Format (*.gif)"); + save_dialog.selectNameFilter(tr("Graphics Interchange Format (*.gif)")); if (QString::compare(suffix, "svg", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Scalable Vector Graphic (*.svg)"); + save_dialog.selectNameFilter(tr("Scalable Vector Graphic (*.svg)")); if (QString::compare(suffix, "bmp", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Windows Bitmap (*.bmp)"); + save_dialog.selectNameFilter(tr("Windows Bitmap (*.bmp)")); if (QString::compare(suffix, "pcx", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("ZSoft PC Painter Image (*.pcx)"); + save_dialog.selectNameFilter(tr("ZSoft PC Painter Image (*.pcx)")); if (QString::compare(suffix, "emf", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Enhanced Metafile (*.emf)"); + save_dialog.selectNameFilter(tr("Enhanced Metafile (*.emf)")); if (QString::compare(suffix, "tif", Qt::CaseInsensitive) == 0) - save_dialog.selectNameFilter("Tagged Image File Format (*.tif)"); + save_dialog.selectNameFilter(tr("Tagged Image File Format (*.tif)")); if (save_dialog.exec()) { filename = save_dialog.selectedFiles().at(0); @@ -335,7 +335,7 @@ bool MainWindow::save() return false; } - if(m_bc.bc.save_to_file(filename) == false) { + if (m_bc.bc.save_to_file(filename) == false) { if (m_bc.bc.getError() >= ZINT_ERROR) { QMessageBox::critical(this, tr("Save Error"), m_bc.bc.error_message()); return false; @@ -353,13 +353,13 @@ bool MainWindow::save() void MainWindow::about() { QString zint_version; - + int lib_version = ZBarcode_Version(); int version_major = lib_version / 10000; int version_minor = (lib_version % 10000) / 100; int version_release = lib_version % 100; int version_build; - + if (version_release > 10) { /* This is a test release */ version_release = version_release / 10; @@ -415,7 +415,7 @@ int MainWindow::open_sequence_dialog() void MainWindow::on_fgcolor_clicked() { QColor temp = m_fgcolor; - m_fgcolor=QColorDialog::getColor(m_fgcolor,this,"Set foreground colour",QColorDialog::ShowAlphaChannel); + m_fgcolor = QColorDialog::getColor(m_fgcolor, this, tr("Set foreground colour"), QColorDialog::ShowAlphaChannel); if (m_fgcolor.isValid()) { update_preview(); } else { @@ -426,7 +426,7 @@ void MainWindow::on_fgcolor_clicked() void MainWindow::on_bgcolor_clicked() { QColor temp = m_bgcolor; - m_bgcolor=QColorDialog::getColor(m_bgcolor,this,"Set background colour",QColorDialog::ShowAlphaChannel); + m_bgcolor = QColorDialog::getColor(m_bgcolor, this, tr("Set background colour"), QColorDialog::ShowAlphaChannel); if (m_bgcolor.isValid()) { update_preview(); } else { @@ -605,7 +605,7 @@ void MainWindow::change_options() save_sub_settings(settings, m_symbology); } - if (tabMain->count()==3) + if (tabMain->count() == 3) tabMain->removeTab(1); chkComposite->setText(tr("Add &2D Component")); @@ -613,72 +613,62 @@ void MainWindow::change_options() btype->setItemText(0, tr("No border")); combobox_item_enabled(cmbFontSetting, 1, true); - if (symbology == BARCODE_CODE128) - { + if (symbology == BARCODE_CODE128) { QFile file(":/grpC128.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 128")); + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 128")); chkComposite->setText(tr("Add &2D Component (GS1-128 only)")); connect(m_optionWidget->findChild("radC128EAN"), SIGNAL(toggled( bool )), SLOT(composite_ean_check())); connect(m_optionWidget->findChild("radC128Stand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC128CSup"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC128EAN"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC128HIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_PDF417) - { + } else if (symbology == BARCODE_PDF417) { QFile file(":/grpPDF417.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("PDF41&7")); + tabMain->insertTab(1, m_optionWidget, tr("PDF41&7")); connect(m_optionWidget->findChild("cmbPDFECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbPDFCols"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radPDFTruncated"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radPDFStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radPDFHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - - if (symbology == BARCODE_MICROPDF417) - { + } else if (symbology == BARCODE_MICROPDF417) { QFile file(":/grpMicroPDF.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Micro PDF41&7")); + tabMain->insertTab(1, m_optionWidget, tr("Micro PDF41&7")); connect(m_optionWidget->findChild("cmbMPDFCols"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radMPDFStand"), SIGNAL(toggled( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_DOTCODE) - { + } else if (symbology == BARCODE_DOTCODE) { QFile file(":/grpDotCode.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("DotCod&e")); + tabMain->insertTab(1, m_optionWidget, tr("DotCod&e")); connect(m_optionWidget->findChild("cmbDotCols"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbDotMask"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radDotStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radDotGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_AZTEC) - { + } else if (symbology == BARCODE_AZTEC) { QFile file(":/grpAztec.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Aztec Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("Aztec Cod&e")); connect(m_optionWidget->findChild("radAztecAuto"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radAztecSize"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radAztecECC"), SIGNAL(clicked( bool )), SLOT(update_preview())); @@ -687,35 +677,29 @@ void MainWindow::change_options() connect(m_optionWidget->findChild("radAztecStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radAztecGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radAztecHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_MSI_PLESSEY) - { + } else if (symbology == BARCODE_MSI_PLESSEY) { QFile file(":/grpMSICheck.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("MSI Pless&ey")); + tabMain->insertTab(1, m_optionWidget, tr("MSI Pless&ey")); connect(m_optionWidget->findChild("cmbMSICheck"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODE11) - { + } else if (symbology == BARCODE_CODE11) { QFile file(":/grpC11.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 11")); + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 11")); connect(m_optionWidget->findChild("radC11TwoCheckDigits"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC11OneCheckDigit"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC11NoCheckDigits"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_C25STANDARD || symbology == BARCODE_C25INTER || symbology == BARCODE_C25IATA - || symbology == BARCODE_C25LOGIC || symbology == BARCODE_C25IND) - { + } else if (symbology == BARCODE_C25STANDARD || symbology == BARCODE_C25INTER || symbology == BARCODE_C25IATA + || symbology == BARCODE_C25LOGIC || symbology == BARCODE_C25IND) { QFile file(":/grpC25.ui"); if (file.open(QIODevice::ReadOnly)) { m_optionWidget = uiload.load(&file); @@ -726,94 +710,79 @@ void MainWindow::change_options() connect(m_optionWidget->findChild("radC25Check"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC25CheckHide"), SIGNAL(clicked( bool )), SLOT(update_preview())); } - } - if ((symbology == BARCODE_CODE39) || (symbology == BARCODE_EXCODE39)) - { + } else if (symbology == BARCODE_CODE39 || symbology == BARCODE_EXCODE39) { QFile file(":/grpC39.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); connect(m_optionWidget->findChild("radC39Stand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC39Check"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC39HIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - if (symbology == BARCODE_EXCODE39) - { - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 39 Extended")); - if(m_optionWidget->findChild("radC39HIBC")->isChecked() == true) - { + if (symbology == BARCODE_EXCODE39) { + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 39 Extended")); + if (m_optionWidget->findChild("radC39HIBC")->isChecked()) { m_optionWidget->findChild("radC39HIBC")->setChecked(false); m_optionWidget->findChild("radC39Stand")->setChecked(true); } m_optionWidget->findChild("radC39HIBC")->setEnabled(false); - } - else { - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 39")); + } else { + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 39")); m_optionWidget->findChild("radC39HIBC")->setEnabled(true); } - } - if (symbology == BARCODE_LOGMARS) - { + } else if (symbology == BARCODE_LOGMARS) { QFile file(":/grpLOGMARS.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("LOGMARS")); + tabMain->insertTab(1, m_optionWidget, tr("LOGM&ARS")); connect(m_optionWidget->findChild("radLOGMARSStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radLOGMARSCheck"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODE16K) - { + } else if (symbology == BARCODE_CODE16K) { QFile file(":/grpC16k.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 16K")); + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 16K")); btype->setItemText(0, tr("Default (bind)")); connect(m_optionWidget->findChild("cmbC16kRowSepHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC16kStand"), SIGNAL(toggled( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODABAR) - { + } else if (symbology == BARCODE_CODABAR) { QFile file(":/grpCodabar.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Codabar")); + tabMain->insertTab(1, m_optionWidget, tr("Cod&abar")); connect(m_optionWidget->findChild("chkCodabarCheck"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODABLOCKF) - { + } else if (symbology == BARCODE_CODABLOCKF) { QFile file (":/grpCodablockF.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Codablock&-F")); + tabMain->insertTab(1, m_optionWidget, tr("Codablock&-F")); btype->setItemText(0, tr("Default (bind)")); connect(m_optionWidget->findChild("cmbCbfWidth"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbCbfHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbCbfRowSepHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radCbfStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radCbfHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_DATAMATRIX) - { + } else if (symbology == BARCODE_DATAMATRIX) { QFile file(":/grpDM.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Data Matrix")); + tabMain->insertTab(1, m_optionWidget, tr("D&ata Matrix")); connect(m_optionWidget->findChild("radDM200Stand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radDM200GS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radDM200HIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); @@ -821,21 +790,17 @@ void MainWindow::change_options() connect(m_optionWidget->findChild("chkDMRectangle"), SIGNAL(stateChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkDMRE"), SIGNAL(stateChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkDMGSSep"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_ITF14) - { + } else if (symbology == BARCODE_ITF14) { btype->setItemText(0, tr("Default (box, non-zero width)")); - } - if (symbology == BARCODE_QRCODE) - { + } else if (symbology == BARCODE_QRCODE) { QFile file(":/grpQR.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("QR Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("QR Cod&e")); connect(m_optionWidget->findChild("cmbQRSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbQRECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbQRMask"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); @@ -843,165 +808,140 @@ void MainWindow::change_options() connect(m_optionWidget->findChild("radQRGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radQRHIBC"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkQRFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_RMQR) - { + } else if (symbology == BARCODE_RMQR) { QFile file(":/grpRMQR.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("rMQR Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("rMQR Cod&e")); connect(m_optionWidget->findChild("cmbRMQRSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbRMQRECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radRMQRStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radRMQRGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkRMQRFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_HANXIN) - { - QFile file (":/grpHX.ui"); + } else if (symbology == BARCODE_HANXIN) { + QFile file(":/grpHX.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Han Xin Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("Han Xin Cod&e")); cmbECI->setItemText(25, tr("29: GB 18030 (PRC)")); connect(m_optionWidget->findChild("cmbHXSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbHXECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbHXMask"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkHXFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_MICROQR) - { + } else if (symbology == BARCODE_MICROQR) { QFile file(":/grpMQR.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Micro QR Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("Micro QR Cod&e")); connect(m_optionWidget->findChild("cmbMQRSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbMQRECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbMQRMask"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkMQRFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_GRIDMATRIX) - { + } else if (symbology == BARCODE_GRIDMATRIX) { QFile file(":/grpGrid.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Grid Matrix")); + tabMain->insertTab(1, m_optionWidget, tr("Grid M&atrix")); connect(m_optionWidget->findChild("cmbGridSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbGridECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkGridFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_MAXICODE) - { + } else if (symbology == BARCODE_MAXICODE) { QFile file(":/grpMaxicode.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("MaxiCod&e")); + tabMain->insertTab(1, m_optionWidget, tr("MaxiCod&e")); connect(m_optionWidget->findChild("cmbMaxiMode"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbMaxiMode"), SIGNAL(currentIndexChanged( int )), SLOT(maxi_primary())); connect(m_optionWidget->findChild("txtMaxiPrimary"), SIGNAL(textChanged( const QString& )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkMaxiSCMVV"), SIGNAL(stateChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("chkMaxiSCMVV"), SIGNAL(stateChanged( int )), SLOT(maxi_primary())); connect(m_optionWidget->findChild("spnMaxiSCMVV"), SIGNAL(valueChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_CHANNEL) - { + } else if (symbology == BARCODE_CHANNEL) { QFile file(":/grpChannel.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Channel Cod&e")); + tabMain->insertTab(1, m_optionWidget, tr("Channel Cod&e")); connect(m_optionWidget->findChild("cmbChannel"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODEONE) - { + } else if (symbology == BARCODE_CODEONE) { QFile file(":/grpCodeOne.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Code On&e")); + tabMain->insertTab(1, m_optionWidget, tr("Code On&e")); connect(m_optionWidget->findChild("cmbC1Size"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC1GS1"), SIGNAL(toggled( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_CODE49) - { + } else if (symbology == BARCODE_CODE49) { QFile file(":/grpC49.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Cod&e 49")); + tabMain->insertTab(1, m_optionWidget, tr("Cod&e 49")); connect(m_optionWidget->findChild("cmbC49RowSepHeight"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radC49GS1"), SIGNAL(toggled( bool )), SLOT(update_preview())); - } - - if (symbology == BARCODE_DBAR_EXPSTK) - { + } else if (symbology == BARCODE_DBAR_EXPSTK) { QFile file(":/grpDBExtend.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("GS1 DataBar Stack&ed")); + tabMain->insertTab(1, m_optionWidget, tr("GS1 DataBar Stack&ed")); connect(m_optionWidget->findChild("cmbCols"), SIGNAL(currentIndexChanged ( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_ULTRA) - { + } else if (symbology == BARCODE_ULTRA) { QFile file(":/grpUltra.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("Ultracod&e")); + tabMain->insertTab(1, m_optionWidget, tr("Ultracod&e")); connect(m_optionWidget->findChild("radUltraAuto"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radUltraEcc"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("cmbUltraEcc"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); connect(m_optionWidget->findChild("radUltraStand"), SIGNAL(clicked( bool )), SLOT(update_preview())); connect(m_optionWidget->findChild("radUltraGS1"), SIGNAL(clicked( bool )), SLOT(update_preview())); - } - if (symbology == BARCODE_UPCA || symbology == BARCODE_UPCA_CHK || symbology == BARCODE_UPCA_CC) - { + } else if (symbology == BARCODE_UPCA || symbology == BARCODE_UPCA_CHK || symbology == BARCODE_UPCA_CC) { QFile file(":/grpUPCA.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1, m_optionWidget, tr("UPC-A")); + tabMain->insertTab(1, m_optionWidget, tr("UPC-&A")); combobox_item_enabled(cmbFontSetting, 1, false); if (cmbFontSetting->currentIndex() == 1) { cmbFontSetting->setCurrentIndex(0); } connect(m_optionWidget->findChild("cmbUPCAAddonGap"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_EANX || symbology == BARCODE_EANX_CHK || symbology == BARCODE_EANX_CC + } else if (symbology == BARCODE_EANX || symbology == BARCODE_EANX_CHK || symbology == BARCODE_EANX_CC || symbology == BARCODE_UPCE || symbology == BARCODE_UPCE_CHK || symbology == BARCODE_UPCE_CC - || symbology == BARCODE_ISBNX) - { + || symbology == BARCODE_ISBNX) { QFile file(":/grpUPCEAN.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); if (symbology == BARCODE_UPCE || symbology == BARCODE_UPCE_CHK || symbology == BARCODE_UPCE_CC) { tabMain->insertTab(1, m_optionWidget, tr("UPC-&E")); @@ -1015,21 +955,18 @@ void MainWindow::change_options() cmbFontSetting->setCurrentIndex(0); } connect(m_optionWidget->findChild("cmbUPCEANAddonGap"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview())); - } - if (symbology == BARCODE_VIN) - { + } else if (symbology == BARCODE_VIN) { QFile file(":/grpVIN.ui"); if (!file.open(QIODevice::ReadOnly)) return; - m_optionWidget=uiload.load(&file); + m_optionWidget = uiload.load(&file); file.close(); - tabMain->insertTab(1,m_optionWidget,tr("&VIN")); + tabMain->insertTab(1, m_optionWidget, tr("&VIN")); connect(m_optionWidget->findChild("chkVINImportChar"), SIGNAL(clicked( bool )), SLOT(update_preview())); } - switch (symbology) - { + switch (symbology) { case BARCODE_CODE128: case BARCODE_EANX: case BARCODE_UPCA: @@ -1046,6 +983,7 @@ void MainWindow::change_options() grpComposite->hide(); break; } + cmbECI->setEnabled(m_bc.bc.supportsECI(symbology)); /* Will need checking again in update_preview() as encoding mode dependent (HIBC) */ chkGS1Parens->setEnabled(m_bc.bc.supportsGS1(symbology)); /* Ditto (GS1) */ chkRInit->setEnabled(m_bc.bc.supportsReaderInit(symbology)); /* Ditto (HIBC and GS1) */ @@ -1073,8 +1011,7 @@ void MainWindow::change_options() void MainWindow::composite_ui_set() { - if (!grpComposite->isHidden() && chkComposite->isChecked()) - { + if (!grpComposite->isHidden() && chkComposite->isChecked()) { lblCompType->setEnabled(true); cmbCompType->setEnabled(true); lblComposite->setEnabled(true); @@ -1085,9 +1022,7 @@ void MainWindow::composite_ui_set() radioButton->setChecked(true); } } - } - else - { + } else { lblCompType->setEnabled(false); cmbCompType->setEnabled(false); lblComposite->setEnabled(false); @@ -1097,7 +1032,7 @@ void MainWindow::composite_ui_set() void MainWindow::composite_ean_check() { - if (metaObject()->enumerator(0).value(bstyle->currentIndex())!=BARCODE_CODE128) + if (metaObject()->enumerator(0).value(bstyle->currentIndex()) != BARCODE_CODE128) return; QRadioButton *radioButton = m_optionWidget->findChild("radC128EAN"); if (radioButton && !radioButton->isChecked()) @@ -1106,10 +1041,10 @@ void MainWindow::composite_ean_check() void MainWindow::maxi_primary() { - if (metaObject()->enumerator(0).value(bstyle->currentIndex())!=BARCODE_MAXICODE) + if (metaObject()->enumerator(0).value(bstyle->currentIndex()) != BARCODE_MAXICODE) return; QCheckBox *chkMaxiSCMVV = m_optionWidget->findChild("chkMaxiSCMVV"); - if(m_optionWidget->findChild("cmbMaxiMode")->currentIndex() == 0) { + if (m_optionWidget->findChild("cmbMaxiMode")->currentIndex() == 0) { m_optionWidget->findChild("lblMaxiPrimary")->setEnabled(true); m_optionWidget->findChild("txtMaxiPrimary")->setEnabled(true); chkMaxiSCMVV->setEnabled(true); diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index d2ab4a91..9e7342e9 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -58,7 +58,7 @@ BEGIN VALUE "InternalName", "qtZint" - VALUE "LegalCopyright", "Copyright © 2020 Robin Stuart & BogDan Vatra" + VALUE "LegalCopyright", "Copyright © 2021 Robin Stuart & BogDan Vatra" VALUE "License", "GNU General Public License version 3" @@ -84,4 +84,4 @@ BEGIN END -100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint.ico" +100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint-qt.ico" diff --git a/frontend_qt/res/zint.ico b/frontend_qt/res/zint.ico deleted file mode 100644 index c952376a964a7030ea5eb5a58ecdad7cfd127900..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25842 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 - images/zoomout.png - images/rotateleft.png - images/rotateright.png - images/zoomin.png grpAztec.ui grpC11.ui + grpC128.ui + grpC16k.ui grpC25.ui grpC39.ui - grpDM.ui - grpMSICheck.ui - grpC128.ui - grpChannel.ui - grpLOGMARS.ui - grpMicroPDF.ui - grpMaxicode.ui - grpPDF417.ui - grpC16k.ui - grpMQR.ui - grpQR.ui - grpCodeOne.ui grpC49.ui - grpGrid.ui - grpDBExtend.ui - images/zint.png - grpHX.ui - grpDotCode.ui + grpChannel.ui grpCodabar.ui grpCodablockF.ui + grpCodeOne.ui + grpDBExtend.ui + grpDM.ui + grpDotCode.ui + grpGrid.ui + grpHX.ui + grpLOGMARS.ui + grpMaxicode.ui + grpMicroPDF.ui + grpMQR.ui + grpMSICheck.ui + grpPDF417.ui + grpQR.ui grpRMQR.ui grpUltra.ui grpUPCA.ui grpUPCEAN.ui grpVIN.ui + res/zint-qt.ico diff --git a/win32/zint_cmdline_vc6/zint_black_vc6.ico b/win32/zint_cmdline_vc6/zint_black_vc6.ico index 387c650d42d00a29591e1612aec2237992a6923e..9f0ae7a2aa7714d8932816dd9be017426d324582 100644 GIT binary patch literal 14134 zcmeI2ONbm*6o&6iOVS`t+KmhtodyxyIiO^l2!h~FUARnKiTEJ8@qwg|GDuctBcdz8 zl`D<95QNKdMF_E~Q<7ercc0eyn z7jrYGV=@2Y`ggGgQr6#}a%w{x_q?Mnzx%b-UQyyQ4ci(!(ALCR-b)qpU)I<&Vw)N+ zRLoCZ&=6m*!#aLj{4pc1A^IGg4`b)Wr^R?ohkwJf>e&*@u7URxc!Nm(cwJ)C=kvHf zEqQ+x&xi-bBCM(NH!+SYvWb01jOTVg`p)7YcwgM2;dAji918G~`sy?g#(BnhW1E_T zxG%Q<&=?wu>M&G4>j0lPCbl(HIsZ>M2ysl__G>Zo-20c>d?DhKkK-7;E0)!tH3^Dh z<394Uj*37X{95GKB>qj;Up%kdzbnsEB&)!U8som89$a(iKm&E4k894FjL(OA^|I*m z6}9Iz-WGUPO~fh}r``wl6<$eEUTXdhq`F;MlZ=UvI z{#ga)S@U?VMg3nohUGZE>eMr{>huQ}!uF;#g!qqisxe6-?7O&*&Jw@L&iVH-&Ic{PqDojP*$d zx*sjE=v^02i2Gn)MJoRl#){q$Pwyk%DXorEGIZ7U70tz~#a`&2Zw;uq!(=S#Ki?Wq zbBD=T)PKG;pym#fv8exiYe3B%CgcB7f4-0R;avI5;4m3YG`%nXCp+d?^E*sN6aD!2 z2@{EFqW`%*iI z@+Qv!))FwWEHC|BH`eMz)XqdLK9EP#YhYQ{Pu2Q5snf*$08Fg%jmP+{r4F~r0sVe| z#_?sgWl76^ODc-{C5s`pXuPcNp)9Vdd8}bh%aS$Gk1sH>Ol!WMn)2?sRjk7+a>&P* z9b1;{GqtJf=aVdk*s{Du{j81mve>F-S%VuQ=Uk`B~~k@$_syZ^WtgW9r|xF7hPAM$MF{or+%xeH?b zx_XLu@+hSl>#w;#S{`cQ{r%C6CT)x_NSCw`CTNh0TJt_4Ci_ I%lw@0U(6_H4gdfE literal 2174 zcmeHHy-vbV7(JJ^6eOYOpiI!<;@HV_Fu_XK)+`7hT_6{M*Q6g4U#h+=#iydK~>lUrc?l>f6Tm*chjcE31W%Rb!9we2-dV zscCZyW5rIOyW=@JYC2&0ZfjB-xr*Ca?mPkSOPPg#ii4|H&i|9TWu971J?0h!oiU{&f`)Z=-;e9bzyLc*)WEN?mb6Qqz6zZOIHgzndOMW_`WO z=)nC*%h`6` x9dF;M7kjz%zv-gecP7SFT`hjW;q3W?ac*?k?yMvo8Pu