zhaoyafan
/
LabelPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240807160200

This commit is contained in:
zhaoyafan 2024-08-07 16:03:37 +08:00
parent d60ad5e61f
commit 7f65825f07
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main.py
View File

@ -549,7 +549,7 @@ class MainWindow(QMainWindow):
def __init__(self, logger: Logger): def __init__(self, logger: Logger):
super().__init__() super().__init__()
self.app_name = '标签打印' self.app_name = '标签打印'
self.app_version = ('1.0.1', '20240401', 'zhaoyafan', 'zhaoyafan@foxmail.com', 'https://www.fanscloud.net/') self.app_version = ('1.0.2', '20240807', 'zhaoyafan', 'zhaoyafan@foxmail.com', 'https://www.fanscloud.net/')
self.logger = logger self.logger = logger
self.setting = Setting(os.path.abspath(os.path.join(os.path.dirname(__file__), 'settings.json')), {}) self.setting = Setting(os.path.abspath(os.path.join(os.path.dirname(__file__), 'settings.json')), {})
self.bt = BarTenderPrint(logger=self.logger) self.bt = BarTenderPrint(logger=self.logger)
@ -557,6 +557,7 @@ class MainWindow(QMainWindow):
self.ditto = Ditto(db_file='%s.db' % (os.path.splitext(__file__)[0],), class_name='LabelPrint', limit_time=7776000, limit_rows=100000) self.ditto = Ditto(db_file='%s.db' % (os.path.splitext(__file__)[0],), class_name='LabelPrint', limit_time=7776000, limit_rows=100000)
self.last_opened_template = ['', ''] self.last_opened_template = ['', '']
self.input_convert_letter = 0 self.input_convert_letter = 0
self.input_scan_prohibited_enter = 0
self.setWindowTitle(self.app_name) self.setWindowTitle(self.app_name)
self.setGeometry(0, 0, 600, 400) self.setGeometry(0, 0, 600, 400)
self.statusBar() self.statusBar()
@ -630,7 +631,7 @@ class MainWindow(QMainWindow):
# Select printer # Select printer
self.slcSPT = CustomComboBox() self.slcSPT = CustomComboBox()
self.slcSPT.addItems(self.bt.printer_list) self.slcSPT.addItems(self.bt.printer_list)
self.slcSPT.setFixedSize(233, 27) self.slcSPT.setFixedSize(213, 27)
self.slcSPT.currentIndexChanged.connect(self.on_printer_changed) self.slcSPT.currentIndexChanged.connect(self.on_printer_changed)
r_layout_1.addWidget(self.slcSPT) r_layout_1.addWidget(self.slcSPT)
# Number of copies # Number of copies
@ -638,7 +639,7 @@ class MainWindow(QMainWindow):
self.labPQT.setFixedSize(82, 27) self.labPQT.setFixedSize(82, 27)
r_layout_1.addWidget(self.labPQT) r_layout_1.addWidget(self.labPQT)
self.edtNQT = CustomLineEditNoPopup('1') self.edtNQT = CustomLineEditNoPopup('1')
self.edtNQT.setFixedSize(40, 27) self.edtNQT.setFixedSize(60, 27)
self.edtNQT.textChanged.connect(self.on_copies_editing_changed) self.edtNQT.textChanged.connect(self.on_copies_editing_changed)
validator = QIntValidator(1, 999) validator = QIntValidator(1, 999)
self.edtNQT.setValidator(validator) self.edtNQT.setValidator(validator)
@ -650,14 +651,19 @@ class MainWindow(QMainWindow):
# Select input verification # Select input verification
self.slcSVR = CustomComboBox() self.slcSVR = CustomComboBox()
self.slcSVR.addItems([data[0] for data in self.sv.checker_list]) self.slcSVR.addItems([data[0] for data in self.sv.checker_list])
self.slcSVR.setFixedSize(233, 27) self.slcSVR.setFixedSize(213, 27)
self.slcSVR.currentIndexChanged.connect(self.on_checker_changed) self.slcSVR.currentIndexChanged.connect(self.on_checker_changed)
r_layout_2.addWidget(self.slcSVR) r_layout_2.addWidget(self.slcSVR)
# Convert letter # Convert letter
self.chkCVL = CustomCheckBox('强制转换大写') self.chkCVL = CustomCheckBox('强制大写')
self.chkCVL.setFixedSize(128, 27) self.chkCVL.setFixedSize(72, 27)
self.chkCVL.stateChanged.connect(self.on_convert_letter_changed) self.chkCVL.stateChanged.connect(self.on_convert_letter_changed)
r_layout_2.addWidget(self.chkCVL) r_layout_2.addWidget(self.chkCVL)
# Disable enter
self.chkDET = CustomCheckBox('禁用回车')
self.chkDET.setFixedSize(72, 27)
self.chkDET.stateChanged.connect(self.on_prohibit_enter_changed)
r_layout_2.addWidget(self.chkDET)
# Scan # Scan
self.edtSCN = CustomLineEdit('') self.edtSCN = CustomLineEdit('')
self.edtSCN.setStyleSheet('QLineEdit {font-size: 28px; font-family: \'Microsoft YaHei\'; color: #000000; background-color: #FFFFCC;}') self.edtSCN.setStyleSheet('QLineEdit {font-size: 28px; font-family: \'Microsoft YaHei\'; color: #000000; background-color: #FFFFCC;}')
@ -667,7 +673,7 @@ class MainWindow(QMainWindow):
self.butSPT = CustomPushButton('打印') self.butSPT = CustomPushButton('打印')
self.butSPT.setFixedSize(455, 45) self.butSPT.setFixedSize(455, 45)
self.butSPT.clicked.connect(self.on_start_printing) self.butSPT.clicked.connect(self.on_start_printing)
self.edtSCN.returnPressed.connect(self.butSPT.click) self.edtSCN.returnPressed.connect(self.on_print_scan_enter)
r_layout_3.addWidget(self.butSPT) r_layout_3.addWidget(self.butSPT)
# 显示界面 # 显示界面
@ -900,6 +906,15 @@ class MainWindow(QMainWindow):
else: else:
self.input_convert_letter = 0 self.input_convert_letter = 0
def on_prohibit_enter_changed(self, checked):
if (checked == 2) == 1:
self.input_scan_prohibited_enter = 1
else:
self.input_scan_prohibited_enter = 0
def on_print_scan_enter(self):
self.input_scan_prohibited_enter or self.on_start_printing()
def on_start_printing(self): def on_start_printing(self):
edit = self.edtSCN edit = self.edtSCN
if (self.input_convert_letter == 1) == 1: if (self.input_convert_letter == 1) == 1: