mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-27 13:34:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge /u/gitlost/zint/ branch eci_part3_2022 into master

Browse source 
https://sourceforge.net/p/zint/code/merge-requests/149/
This commit is contained in:
b'Git Lost 2022-04-12 13:23:23 +00:00
commit 3b9d989894
38 changed files with 5761 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

35
frontend_qt/mainWindow.ui
View file

@ -425,6 +425,9 @@ Remember to place [square brackets] around AI identifiers</string>
<height>0</height>
</size>
</property>
<property name="maxVisibleItems">
<number>34</number>
</property>
<property name="toolTip">
<string>Set the ECI (Extended Channel Interpretation) code
(ignored if disabled)</string>
@ -536,7 +539,7 @@ Remember to place [square brackets] around AI identifiers</string>
</item>
<item>
<property name="text">
<string>25: UCS-2BE</string>
<string>25: UTF-16BE</string>
</property>
</item>
<item>
@ -564,6 +567,36 @@ Remember to place [square brackets] around AI identifiers</string>
<string>30: Korean EUC-KR</string>
</property>
</item>
<item>
<property name="text">
<string>31: GBK</string>
</property>
</item>
<item>
<property name="text">
<string>32: GB 18030</string>
</property>
</item>
<item>
<property name="text">
<string>33: UTF-16LE</string>
</property>
</item>
<item>
<property name="text">
<string>34: UTF-32BE</string>
</property>
</item>
<item>
<property name="text">
<string>35: UTF-32LE</string>
</property>
</item>
<item>
<property name="text">
<string>170: ISO 646 Invariant</string>
</property>
</item>
<item>
<property name="text">
<string>899: 8-bit binary data</string>

9
frontend_qt/mainwindow.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> *
* Copyright (C) 2009-2021 by Robin Stuart <rstuart114@gmail.com> *
* Copyright (C) 2009-2022 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 *
@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
/* vim: set ts=4 sw=4 et : */
//#include <QDebug>
#include <QGraphicsScene>
@ -461,7 +460,7 @@ void MainWindow::about()
"<p>A free barcode generator</p>"
"<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"
"<p>Copyright &copy; 2006-2021 Robin Stuart and others.<br>"
"<p>Copyright &copy; 2006-2022 Robin Stuart and others.<br>"
"Qt backend by BogDan Vatra</p>"
"<p>Qt version %2</p>"
"<p>With thanks to Harald Oehlmann, Norbert Szab&oacute;, Robert Elliott, Milton Neal, "
@ -953,7 +952,6 @@ void MainWindow::change_options()
chkComposite->setText(tr("Add &2D Component"));
combobox_item_enabled(cmbCompType, 3, false); // CC-C
cmbECI->setItemText(25, tr("29: GB 2312 (PRC)"));
btype->setItemText(0, tr("No border"));
combobox_item_enabled(cmbFontSetting, 1, true);
m_lblHeightPerRow = nullptr;
@ -1294,7 +1292,6 @@ void MainWindow::change_options()
file.close();
load_sub_settings(settings, symbology);
tabMain->insertTab(1, m_optionWidget, tr("Han Xin Cod&e"));
cmbECI->setItemText(25, tr("29: GB 18030 (PRC)"));
connect(get_widget(QSL("cmbHXSize")), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(get_widget(QSL("cmbHXECC")), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(get_widget(QSL("cmbHXMask")), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
@ -3415,3 +3412,5 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
break;
}
}
/* vim: set ts=4 sw=4 et : */