mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually change SVG font to "Arimo, Arial, sans-serif" ([607e4ed])

Browse Source 
Allow `--embedfont` for non-EAN/UPC SVG also (& update GUI)
SVG: add "fonts/normal_woff2.h"; use array syntax for it &
  "fonts/upcean_woff2.h" to avoid large strings
GUI: embed Arimo (via "fonts/normal_ttf.h"), same as OCRB
Change textgap max 5X -> 10X
README: make list of barcodes 2-col table for readability
win32/README: note Visual Studio 2022 re CMake
This commit is contained in:
gitlost
2023-06-13 18:12:20 +01:00
parent 55458cf659
commit acd52ac489
84 changed files with 2951 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend_qt/grpUPCA.ui
View File

@ -178,20 +178,6 @@ to default 5X</string>
</property>
<property name="toolTip">
<string>Add quiet zone indicators ("&lt;", "&gt;") to Human Readable Text (HRT)
(ignored if disabled)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkUPCAEmbedVectorFont">
<property name="text">
<string>Embed Font (SVG only)</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Embed OCR-B font in SVG output
(ignored if disabled)</string>
</property>
</widget>

14
frontend_qt/grpUPCEAN.ui
View File

@ -188,20 +188,6 @@ to default 5X</string>
</property>
<property name="toolTip">
<string>Add quiet zone indicators ("&lt;", "&gt;") to Human Readable Text (HRT)
(ignored if disabled)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkUPCEANEmbedVectorFont">
<property name="text">
<string>Embed Font (SVG only)</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Embed OCR-B font in SVG output
(ignored if disabled)</string>
</property>
</widget>

26
frontend_qt/mainWindow.ui
View File

@ -1887,7 +1887,7 @@ the barcode in X-dimensions</string>
(ignored if disabled)</string>
</property>
<property name="text">
<string>Text Gap:</string>
<string>Text &amp;Gap:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -1914,7 +1914,7 @@ the barcode in X-dimensions</string>
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
<double>10.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
@ -2089,7 +2089,7 @@ or decimal &quot;C,M,Y,K&quot; percentages (0-100)</string>
<string>Change colour of paper</string>
</property>
<property name="text">
<string>Back&amp;ground:</string>
<string>Bac&amp;kground:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -2193,7 +2193,7 @@ e.g. &quot;FFFFFF00&quot;</string>
<string>Use CMYK colour space in EPS/TIF output</string>
</property>
<property name="text">
<string>CMY&amp;K (EPS/TIF)</string>
<string>CMYK (EPS&amp;/TIF)</string>
</property>
<property name="checked">
<bool>false</bool>
@ -2258,6 +2258,20 @@ e.g. &quot;FFFFFF00&quot;</string>
</widget>
</item>
<item row="6" column="4" colspan="2">
<widget class="QCheckBox" name="chkEmbedVectorFont">
<property name="toolTip">
<string>Embed font in SVG output
(ignored if disabled)</string>
</property>
<property name="text">
<string>Embed Font &amp;(SVG)</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="7" column="4" colspan="2">
<widget class="QCheckBox" name="chkDotty">
<property name="toolTip">
<string>Use dots instead of squares for matrix symbols
@ -2271,7 +2285,7 @@ e.g. &quot;FFFFFF00&quot;</string>
</property>
</widget>
</item>
<item row="7" column="3">
<item row="8" column="3">
<widget class="QLabel" name="lblDotSize">
<property name="enabled">
<bool>false</bool>
@ -2291,7 +2305,7 @@ e.g. &quot;FFFFFF00&quot;</string>
</property>
</widget>
</item>
<item row="7" column="4" colspan="2">
<item row="8" column="4" colspan="2">
<widget class="QDoubleSpinBox" name="spnDotSize">
<property name="enabled">
<bool>false</bool>

55
frontend_qt/mainwindow.cpp
View File

@ -479,6 +479,7 @@ MainWindow::~MainWindow()
settings.setValue(QSL("studio/appearance/chk_cmyk"), chkCMYK->isChecked() ? 1 : 0);
settings.setValue(QSL("studio/appearance/chk_quiet_zones"), chkQuietZones->isChecked() ? 1 : 0);
settings.setValue(QSL("studio/appearance/rotate"), cmbRotate->currentIndex());
settings.setValue(QSL("studio/appearance/chk_embed_vector_font"), chkEmbedVectorFont->isChecked() ? 1 : 0);
settings.setValue(QSL("studio/appearance/chk_dotty"), chkDotty->isChecked() ? 1 : 0);
settings.setValue(QSL("studio/appearance/dot_size"), spnDotSize->value());
// These are "system-wide"
@ -550,6 +551,8 @@ void MainWindow::load_settings(QSettings &settings)
chkCMYK->setChecked(settings.value(QSL("studio/appearance/chk_cmyk"), 0).toInt() ? true : false);
chkQuietZones->setChecked(settings.value(QSL("studio/appearance/chk_quiet_zones"), 0).toInt() ? true : false);
cmbRotate->setCurrentIndex(settings.value(QSL("studio/appearance/rotate"), 0).toInt());
chkEmbedVectorFont->setChecked(settings.value(QSL("studio/appearance/chk_embed_vector_font"), 0).toInt()
? true : false);
chkDotty->setChecked(settings.value(QSL("studio/appearance/chk_dotty"), 0).toInt() ? true : false);
spnDotSize->setValue(settings.value(QSL("studio/appearance/dot_size"), 4.0 / 5.0).toFloat());
// These are "system-wide"
@ -1174,6 +1177,7 @@ void MainWindow::HRTShow_ui_set()
cmbFontSetting->setEnabled(enabled);
lblTextGap->setEnabled(enabled);
spnTextGap->setEnabled(enabled);
chkEmbedVectorFont->setEnabled(enabled);
text_gap_ui_set();
upcean_no_quiet_zones_ui_set();
upcae_no_quiet_zones_ui_set();
@ -1221,17 +1225,13 @@ void MainWindow::upcean_no_quiet_zones_ui_set()
return;
bool showHRT = chkHRTShow->isEnabled() && chkHRTShow->isChecked();
QCheckBox *noQZs, *guardWS, *embedFont;
QCheckBox *noQZs, *guardWS;
noQZs = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANNoQuietZones")) : nullptr;
guardWS = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANGuardWhitespace")) : nullptr;
embedFont = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANEmbedVectorFont")) : nullptr;
if (noQZs && guardWS) {
guardWS->setEnabled(!noQZs->isChecked() && showHRT);
}
if (embedFont) {
embedFont->setEnabled(showHRT);
}
}
void MainWindow::upcae_no_quiet_zones_ui_set()
@ -1243,15 +1243,13 @@ void MainWindow::upcae_no_quiet_zones_ui_set()
return;
bool showHRT = chkHRTShow->isEnabled() && chkHRTShow->isChecked();
QCheckBox *noQZs, *guardWS, *embedFont;
QCheckBox *noQZs, *guardWS;
if (is_upca) {
noQZs = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCANoQuietZones")) : nullptr;
guardWS = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCAGuardWhitespace")) : nullptr;
embedFont = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCAEmbedVectorFont")) : nullptr;
} else {
noQZs = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANNoQuietZones")) : nullptr;
guardWS = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANGuardWhitespace")) : nullptr;
embedFont = m_optionWidget ? m_optionWidget->findChild<QCheckBox*>(QSL("chkUPCEANEmbedVectorFont")) : nullptr;
}
if (noQZs && guardWS) {
@ -1259,13 +1257,10 @@ void MainWindow::upcae_no_quiet_zones_ui_set()
noQZs->setEnabled(true);
guardWS->setEnabled(!noQZs->isChecked() && showHRT);
} else {
noQZs->setEnabled(false);
noQZs->setEnabled(!showHRT);
guardWS->setEnabled(false);
}
}
if (embedFont) {
embedFont->setEnabled(showHRT);
}
}
void MainWindow::structapp_ui_set()
@ -2264,7 +2259,6 @@ void MainWindow::change_options()
connect(get_widget(QSL("chkUPCANoQuietZones")), SIGNAL(toggled( bool )), SLOT(upcae_no_quiet_zones_ui_set()));
connect(get_widget(QSL("chkUPCANoQuietZones")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkUPCAGuardWhitespace")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkUPCAEmbedVectorFont")), SIGNAL(toggled( bool )), SLOT(update_preview()));
} else if (symbology == BARCODE_EANX || symbology == BARCODE_EANX_CHK || symbology == BARCODE_EANX_CC
|| symbology == BARCODE_UPCE || symbology == BARCODE_UPCE_CHK || symbology == BARCODE_UPCE_CC
@ -2304,7 +2298,6 @@ void MainWindow::change_options()
}
connect(get_widget(QSL("chkUPCEANNoQuietZones")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkUPCEANGuardWhitespace")), SIGNAL(toggled( bool )), SLOT(update_preview()));
connect(get_widget(QSL("chkUPCEANEmbedVectorFont")), SIGNAL(toggled( bool )), SLOT(update_preview()));
} else if (symbology == BARCODE_VIN) {
QFile file(QSL(":/grpVIN.ui"));
@ -2699,7 +2692,6 @@ void MainWindow::update_preview()
m_bc.bc.setGSSep(false);
m_bc.bc.setNoQuietZones(false);
m_bc.bc.setGuardWhitespace(false);
m_bc.bc.setEmbedVectorFont(false);
m_bc.bc.setDotSize(0.4f / 0.5f);
m_bc.bc.setGuardDescent(5.0f);
m_bc.bc.clearStructApp();
@ -2734,9 +2726,6 @@ void MainWindow::update_preview()
} else if (get_chk_val(QSL("chkUPCEANGuardWhitespace"))) {
m_bc.bc.setGuardWhitespace(true);
}
if (get_chk_val(QSL("chkUPCEANEmbedVectorFont"))) {
m_bc.bc.setEmbedVectorFont(true);
}
break;
case BARCODE_ISBNX:
@ -2749,9 +2738,6 @@ void MainWindow::update_preview()
} else if (get_chk_val(QSL("chkUPCEANGuardWhitespace"))) {
m_bc.bc.setGuardWhitespace(true);
}
if (get_chk_val(QSL("chkUPCEANEmbedVectorFont"))) {
m_bc.bc.setEmbedVectorFont(true);
}
break;
case BARCODE_UPCA:
@ -2763,9 +2749,6 @@ void MainWindow::update_preview()
} else if (get_chk_val(QSL("chkUPCAGuardWhitespace"))) {
m_bc.bc.setGuardWhitespace(true);
}
if (get_chk_val(QSL("chkUPCAEmbedVectorFont"))) {
m_bc.bc.setEmbedVectorFont(true);
}
break;
case BARCODE_UPCE:
@ -2778,9 +2761,6 @@ void MainWindow::update_preview()
} else if (get_chk_val(QSL("chkUPCEANGuardWhitespace"))) {
m_bc.bc.setGuardWhitespace(true);
}
if (get_chk_val(QSL("chkUPCEANEmbedVectorFont"))) {
m_bc.bc.setEmbedVectorFont(true);
}
break;
case BARCODE_DBAR_OMN:
@ -3331,6 +3311,7 @@ void MainWindow::update_preview()
m_bc.bc.setFontSetting(cmbFontSetting->currentIndex());
m_bc.bc.setTextGap(spnTextGap->value());
m_bc.bc.setRotateAngle(cmbRotate->currentIndex());
m_bc.bc.setEmbedVectorFont(chkEmbedVectorFont->isEnabled() && chkEmbedVectorFont->isChecked());
m_bc.bc.setDotty(chkDotty->isEnabled() && chkDotty->isChecked());
if (m_symbology == BARCODE_DOTCODE || (chkDotty->isEnabled() && chkDotty->isChecked())) {
m_bc.bc.setDotSize(spnDotSize->value());
@ -4110,6 +4091,8 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
if (chkHRTShow->isEnabled()) {
settings.setValue(QSL("studio/bc/%1/appearance/font_setting").arg(name), cmbFontSetting->currentIndex());
settings.setValue(QSL("studio/bc/%1/appearance/text_gap").arg(name), spnTextGap->value());
settings.setValue(QSL("studio/bc/%1/appearance/chk_embed_vector_font").arg(name),
chkEmbedVectorFont->isChecked() ? 1 : 0);
settings.setValue(QSL("studio/bc/%1/appearance/chk_hrt_show").arg(name), chkHRTShow->isChecked() ? 1 : 0);
}
settings.setValue(QSL("studio/bc/%1/appearance/chk_cmyk").arg(name), chkCMYK->isChecked() ? 1 : 0);
@ -4417,8 +4400,6 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
QString::number(get_dspn_val(QSL("spnUPCAGuardDescent")), 'f', 3 /*precision*/));
settings.setValue(QSL("studio/bc/upca/chk_no_quiet_zones"), get_chk_val(QSL("chkUPCANoQuietZones")));
settings.setValue(QSL("studio/bc/upca/chk_guard_whitespace"), get_chk_val(QSL("chkUPCAGuardWhitespace")));
settings.setValue(QSL("studio/bc/upca/chk_embed_vector_font"),
get_chk_val(QSL("chkUPCAEmbedVectorFont")));
break;
case BARCODE_EANX:
@ -4430,8 +4411,6 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
settings.setValue(QSL("studio/bc/eanx/chk_no_quiet_zones"), get_chk_val(QSL("chkUPCEANNoQuietZones")));
settings.setValue(QSL("studio/bc/eanx/chk_guard_whitespace"),
get_chk_val(QSL("chkUPCEANGuardWhitespace")));
settings.setValue(QSL("studio/bc/eanx/chk_embed_vector_font"),
get_chk_val(QSL("chkUPCEANEmbedVectorFont")));
break;
case BARCODE_UPCE:
@ -4443,8 +4422,6 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
settings.setValue(QSL("studio/bc/upce/chk_no_quiet_zones"), get_chk_val(QSL("chkUPCEANNoQuietZones")));
settings.setValue(QSL("studio/bc/upce/chk_guard_whitespace"),
get_chk_val(QSL("chkUPCEANGuardWhitespace")));
settings.setValue(QSL("studio/bc/upce/chk_embed_vector_font"),
get_chk_val(QSL("chkUPCEANEmbedVectorFont")));
break;
case BARCODE_ISBNX:
@ -4454,8 +4431,6 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology)
settings.setValue(QSL("studio/bc/isnbx/chk_no_quiet_zones"), get_chk_val(QSL("chkUPCEANNoQuietZones")));
settings.setValue(QSL("studio/bc/isnbx/chk_guard_whitespace"),
get_chk_val(QSL("chkUPCEANGuardWhitespace")));
settings.setValue(QSL("studio/bc/isnbx/chk_embed_vector_font"),
get_chk_val(QSL("chkUPCEANEmbedVectorFont")));
break;
case BARCODE_VIN:
@ -4520,6 +4495,8 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
cmbFontSetting->setCurrentIndex(settings.value(
QSL("studio/bc/%1/appearance/font_setting").arg(name), 0).toInt());
spnTextGap->setValue(settings.value(QSL("studio/bc/%1/appearance/text_gap").arg(name), 0.0).toFloat());
chkEmbedVectorFont->setChecked(settings.value(
QSL("studio/bc/%1/appearance/chk_embed_vector_font").arg(name), 1).toInt() ? true : false);
chkHRTShow->setChecked(settings.value(
QSL("studio/bc/%1/appearance/chk_hrt_show").arg(name), 1).toInt() ? true : false);
}
@ -4859,8 +4836,6 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
set_dspn_from_setting(settings, QSL("studio/bc/upca/guard_descent"), QSL("spnUPCAGuardDescent"), 5.0f);
set_chk_from_setting(settings, QSL("studio/bc/upca/chk_no_quiet_zones"), QSL("chkUPCANoQuietZones"));
set_chk_from_setting(settings, QSL("studio/bc/upca/chk_guard_whitespace"), QSL("chkUPCAGuardWhitespace"));
set_chk_from_setting(settings, QSL("studio/bc/upca/chk_embed_vector_font"),
QSL("chkUPCAEmbedVectorFont"));
break;
case BARCODE_EANX:
@ -4871,8 +4846,6 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
set_chk_from_setting(settings, QSL("studio/bc/eanx/chk_no_quiet_zones"), QSL("chkUPCEANNoQuietZones"));
set_chk_from_setting(settings, QSL("studio/bc/eanx/chk_guard_whitespace"),
QSL("chkUPCEANGuardWhitespace"));
set_chk_from_setting(settings, QSL("studio/bc/eanx/chk_embed_vector_font"),
QSL("chkUPCEANEmbedVectorFont"));
break;
case BARCODE_UPCE:
@ -4883,8 +4856,6 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
set_chk_from_setting(settings, QSL("studio/bc/upce/chk_no_quiet_zones"), QSL("chkUPCEANNoQuietZones"));
set_chk_from_setting(settings, QSL("studio/bc/upce/chk_guard_whitespace"),
QSL("chkUPCEANGuardWhitespace"));
set_chk_from_setting(settings, QSL("studio/bc/upce/chk_embed_vector_font"),
QSL("chkUPCEANEmbedVectorFont"));
break;
case BARCODE_ISBNX:
@ -4893,8 +4864,6 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology)
set_chk_from_setting(settings, QSL("studio/bc/isbnx/chk_no_quiet_zones"), QSL("chkUPCEANNoQuietZones"));
set_chk_from_setting(settings, QSL("studio/bc/isbnx/chk_guard_whitespace"),
QSL("chkUPCEANGuardWhitespace"));
set_chk_from_setting(settings, QSL("studio/bc/isbnx/chk_embed_vector_font"),
QSL("chkUPCEANEmbedVectorFont"));
break;
case BARCODE_VIN: