mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-14 23:24:39 -04:00
CODABLOCKF: prevent cols > 62; fix pTestList buffer overflow
RMQR: update to new draft ISO/IEC JTC1/SC31N000 (Draft 2019-6-24); allow for righthand vertical timing pattern in populate_grid() ULTRA: update max size and min cols based on BWIPP 2021-07-14 update backend_tcl/zint_tcl.dsp: use /MD instead of /MT for tcl lib compat; change include/lib path to more standard one manual.txt: highlight that rMQR is still in development GUI: use cross-platform smaller font func instead of explicit values for notes
This commit is contained in:
parent
4d0fff7cf5
commit
14d1140d09
49 changed files with 1828 additions and 739 deletions
|
@ -132,6 +132,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags fl)
|
|||
scene = new QGraphicsScene(this);
|
||||
|
||||
setupUi(this);
|
||||
view->setMinimumHeight(20);
|
||||
view->setScene(scene);
|
||||
|
||||
restoreGeometry(settings.value("studio/window_geometry").toByteArray());
|
||||
|
@ -635,6 +636,7 @@ void MainWindow::change_options()
|
|||
tabMain->insertTab(1, m_optionWidget, tr("Cod&e 128"));
|
||||
chkComposite->setText(tr("Add &2D Component (GS1-128 only)"));
|
||||
combobox_item_enabled(cmbCompType, 3, true); // CC-C
|
||||
set_smaller_font(m_optionWidget->findChild<QLabel*>("noteC128CompositeEAN"));
|
||||
connect(m_optionWidget->findChild<QObject*>("radC128EAN"), SIGNAL(toggled( bool )), SLOT(composite_ean_check()));
|
||||
connect(m_optionWidget->findChild<QObject*>("radC128Stand"), SIGNAL(clicked( bool )), SLOT(update_preview()));
|
||||
connect(m_optionWidget->findChild<QObject*>("radC128CSup"), SIGNAL(clicked( bool )), SLOT(update_preview()));
|
||||
|
@ -799,6 +801,7 @@ void MainWindow::change_options()
|
|||
m_optionWidget = uiload.load(&file);
|
||||
file.close();
|
||||
tabMain->insertTab(1, m_optionWidget, tr("DAFT"));
|
||||
set_smaller_font(m_optionWidget->findChild<QLabel*>("noteTrackerRatios"));
|
||||
connect(m_optionWidget->findChild<QObject*>("spnDAFTTrackerRatio"), SIGNAL(valueChanged( double )), SLOT(update_preview()));
|
||||
}
|
||||
|
||||
|
@ -880,6 +883,7 @@ void MainWindow::change_options()
|
|||
m_optionWidget = uiload.load(&file);
|
||||
file.close();
|
||||
tabMain->insertTab(1, m_optionWidget, tr("Grid M&atrix"));
|
||||
set_smaller_font(m_optionWidget->findChild<QLabel*>("noteGridECC"));
|
||||
connect(m_optionWidget->findChild<QObject*>("cmbGridSize"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
|
||||
connect(m_optionWidget->findChild<QObject*>("cmbGridECC"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
|
||||
connect(m_optionWidget->findChild<QObject*>("chkGridFullMultibyte"), SIGNAL(stateChanged( int )), SLOT(update_preview()));
|
||||
|
@ -1138,6 +1142,27 @@ void MainWindow::set_gs1_mode(bool gs1_mode)
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::set_smaller_font(QLabel *label)
|
||||
{
|
||||
if (label) {
|
||||
const QFont &appFont = QApplication::font();
|
||||
qreal pointSize = appFont.pointSizeF();
|
||||
if (pointSize != -1.0) {
|
||||
QFont font = label->font();
|
||||
pointSize *= 0.9;
|
||||
font.setPointSizeF(pointSize);
|
||||
label->setFont(font);
|
||||
} else {
|
||||
int pixelSize = appFont.pixelSize();
|
||||
if (pixelSize > 1) {
|
||||
QFont font = label->font();
|
||||
font.setPixelSize(pixelSize - 1);
|
||||
label->setFont(font);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::update_preview()
|
||||
{
|
||||
int symbology = bstyle_items[bstyle->currentIndex()].symbology;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue