hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V6.7.4 追加更新

Browse Source
This commit is contained in:
byons
2026-07-20 09:21:44 +08:00
parent 6425b11a96
commit e90e80000f
25 changed files with 2830 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/BarcodeEditor.cpp
+8 -5
View File
@@ -57,9 +57,8 @@ BarcodeEditor::BarcodeEditor(QWidget *parent) :
connect(ui->cbBoxType, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BarcodeEditor::onTypeChanged);
connect(&m_barcodeFormatEditor, &DlgBarcodeFormat::accepted, this, &BarcodeEditor::onBarcodeFormatConfirmed);
connect(&m_qrcodeFormatEditor, &DlgQrcodeFormat::accepted, this, &BarcodeEditor::onQrcodeFormatConfirmed);
m_barcodeFormatEditor.setParent(this, m_barcodeFormatEditor.windowFlags());
m_qrcodeFormatEditor.setParent(this, m_qrcodeFormatEditor.windowFlags());
m_barcodeFormatEditor.setWindowModality(Qt::WindowModality::WindowModal);
m_qrcodeFormatEditor.setWindowModality(Qt::WindowModality::WindowModal);
m_barcodeFormatEditor.setWindowTitle(tr("BarCode Format"));
@@ -294,11 +293,15 @@ void BarcodeEditor::onBtnFormatClicked()
{
if(m_vm.type == BARCODE_TYPE_BARCODE) {
m_barcodeFormatEditor.setViewModel(m_vm.format.value<DlgBarcodeFormatVM>());
m_barcodeFormatEditor.show();
if (m_barcodeFormatEditor.exec() == QDialog::Accepted) {
onBarcodeFormatConfirmed();
}
}
else {
m_qrcodeFormatEditor.setViewModel(m_vm.format.value<DlgQrcodeFormatVM>());
m_qrcodeFormatEditor.show();
if (m_qrcodeFormatEditor.exec() == QDialog::Accepted) {
onQrcodeFormatConfirmed();
}
}
}