refactor: 移除局域网发送至打印机功能
This commit is contained in:
@@ -59,7 +59,6 @@ except ImportError as exc: # pragma: no cover
|
||||
|
||||
from . import APP_NAME, APP_TITLE
|
||||
from .i18n import t, switch as i18n_switch, current_locale
|
||||
from .printer import PrinterConfig, send_to_printer
|
||||
from .batch import IndividualBuildTask, individual_batch_worker_count, run_individual_batch_builds
|
||||
from .core import (
|
||||
BuildOptions,
|
||||
@@ -689,35 +688,6 @@ class MainWindow(QMainWindow):
|
||||
self.output_preview_label_title = QLabel(t("gui.output.preview"))
|
||||
output_layout.addRow(self.output_preview_label_title, self.output_preview_label)
|
||||
|
||||
# ---- 发送至打印机 ----
|
||||
self.send_to_printer_check = QCheckBox(t("gui.output.printer.send"))
|
||||
self.send_to_printer_check.setChecked(False)
|
||||
self.send_to_printer_check.setToolTip(t("gui.output.printer.send.tooltip"))
|
||||
self.printer_label = QLabel(t("gui.output.printer.send"))
|
||||
output_layout.addRow(self.printer_label, self.send_to_printer_check)
|
||||
|
||||
# 打印机配置行(IP、访问码、序列号)
|
||||
printer_config_widget = QWidget()
|
||||
printer_config_layout = QHBoxLayout(printer_config_widget)
|
||||
printer_config_layout.setContentsMargins(0, 0, 0, 0)
|
||||
printer_config_layout.setSpacing(6)
|
||||
|
||||
self.printer_ip_edit = QLineEdit()
|
||||
self.printer_ip_edit.setPlaceholderText(t("gui.output.printer.ip"))
|
||||
self.printer_ip_edit.setMaximumWidth(140)
|
||||
self.printer_access_code_edit = QLineEdit()
|
||||
self.printer_access_code_edit.setPlaceholderText(t("gui.output.printer.access_code"))
|
||||
self.printer_access_code_edit.setMaximumWidth(120)
|
||||
self.printer_serial_edit = QLineEdit()
|
||||
self.printer_serial_edit.setPlaceholderText(t("gui.output.printer.serial"))
|
||||
self.printer_serial_edit.setMaximumWidth(180)
|
||||
|
||||
printer_config_layout.addWidget(self.printer_ip_edit)
|
||||
printer_config_layout.addWidget(self.printer_access_code_edit)
|
||||
printer_config_layout.addWidget(self.printer_serial_edit)
|
||||
printer_config_layout.addStretch(1)
|
||||
output_layout.addRow("", printer_config_widget)
|
||||
|
||||
root.addWidget(self.output_group)
|
||||
|
||||
# =====================================================================
|
||||
@@ -778,10 +748,6 @@ class MainWindow(QMainWindow):
|
||||
self.individual_batch_check.stateChanged.connect(self.on_individual_batch_toggled)
|
||||
self.clear_after_build_check.stateChanged.connect(self.save_current_settings)
|
||||
self.skip_duplicates_check.stateChanged.connect(self.save_current_settings)
|
||||
self.send_to_printer_check.stateChanged.connect(self.save_current_settings)
|
||||
self.printer_ip_edit.textChanged.connect(self.save_current_settings)
|
||||
self.printer_access_code_edit.textChanged.connect(self.save_current_settings)
|
||||
self.printer_serial_edit.textChanged.connect(self.save_current_settings)
|
||||
self.output_dir_edit.textChanged.connect(self.on_output_rule_changed)
|
||||
self.output_name_edit.textChanged.connect(self.on_output_rule_changed)
|
||||
self.language_combo.currentIndexChanged.connect(self.on_language_changed)
|
||||
@@ -806,10 +772,6 @@ class MainWindow(QMainWindow):
|
||||
locale_index = self.language_combo.findData(saved_locale)
|
||||
if locale_index >= 0:
|
||||
self.language_combo.setCurrentIndex(locale_index)
|
||||
self.send_to_printer_check.setChecked(bool(options.get("send_to_printer_enabled", False)))
|
||||
self.printer_ip_edit.setText(str(options.get("printer_ip", "")))
|
||||
self.printer_access_code_edit.setText(str(options.get("printer_access_code", "")))
|
||||
self.printer_serial_edit.setText(str(options.get("printer_serial", "")))
|
||||
self.output_dir_edit.setText(str(options.get("output_directory", "")))
|
||||
self.output_name_edit.setText(str(options.get("output_filename_rule", DEFAULT_OUTPUT_PATTERN)))
|
||||
metadata_mode = options.get("metadata_mode", "sum")
|
||||
@@ -849,10 +811,6 @@ class MainWindow(QMainWindow):
|
||||
"clear_after_build": self.clear_after_build_check.isChecked(),
|
||||
"skip_duplicates": self.skip_duplicates_check.isChecked(),
|
||||
"locale": self.language_combo.currentData() or "zh_CN",
|
||||
"send_to_printer_enabled": self.send_to_printer_check.isChecked(),
|
||||
"printer_ip": self.printer_ip_edit.text().strip(),
|
||||
"printer_access_code": self.printer_access_code_edit.text().strip(),
|
||||
"printer_serial": self.printer_serial_edit.text().strip(),
|
||||
"output_directory": self.output_dir_edit.text().strip(),
|
||||
"output_filename_rule": self.output_name_edit.text().strip() or DEFAULT_OUTPUT_PATTERN,
|
||||
}
|
||||
@@ -1402,21 +1360,6 @@ class MainWindow(QMainWindow):
|
||||
"""显示构建成功的浮动提示条。"""
|
||||
self.success_toast.show_message(message)
|
||||
|
||||
def _send_to_printer(self, file_path: Path) -> None:
|
||||
"""将构建好的 3MF 文件发送至打印机。"""
|
||||
config = PrinterConfig(
|
||||
ip=self.printer_ip_edit.text().strip(),
|
||||
access_code=self.printer_access_code_edit.text().strip(),
|
||||
serial=self.printer_serial_edit.text().strip(),
|
||||
)
|
||||
try:
|
||||
send_to_printer(file_path, config)
|
||||
self.log.append(t("gui.toast.send_success", name=file_path.name))
|
||||
except ImportError:
|
||||
self.log.append(t("gui.log.printer_missing"))
|
||||
except Exception as exc:
|
||||
self.log.append(t("gui.toast.send_failed", error=str(exc)))
|
||||
|
||||
def build_output(self) -> None:
|
||||
"""主构建入口:根据批处理模式分发到合并构建或独立构建。"""
|
||||
jobs = self.collect_jobs()
|
||||
@@ -1440,8 +1383,6 @@ class MainWindow(QMainWindow):
|
||||
options = self.build_options_for_output(output_path)
|
||||
result = build_packed_3mf(jobs, options)
|
||||
self.log_build_result(result)
|
||||
if self.send_to_printer_check.isChecked():
|
||||
self._send_to_printer(result.output_3mf)
|
||||
self.show_success_toast(t("gui.toast.combined_success"))
|
||||
if self.clear_after_build_check.isChecked():
|
||||
self.remove_all()
|
||||
@@ -1471,8 +1412,6 @@ class MainWindow(QMainWindow):
|
||||
batch_result = run_individual_batch_builds(tasks, max_workers=worker_count)
|
||||
for result in batch_result.results:
|
||||
self.log_build_result(result)
|
||||
if self.send_to_printer_check.isChecked():
|
||||
self._send_to_printer(result.output_3mf)
|
||||
success_count = len(batch_result.results)
|
||||
for failure in batch_result.failures:
|
||||
errors.append(f"{failure.job.source_3mf.name}: {failure.error}")
|
||||
@@ -1589,12 +1528,6 @@ class MainWindow(QMainWindow):
|
||||
self.output_dir_label.setText(t("gui.output.dir.label"))
|
||||
self.output_filename_rule_label.setText(t("gui.output.filename_rule"))
|
||||
self.output_preview_label_title.setText(t("gui.output.preview"))
|
||||
self.printer_label.setText(t("gui.output.printer.send"))
|
||||
self.send_to_printer_check.setText(t("gui.output.printer.send"))
|
||||
self.send_to_printer_check.setToolTip(t("gui.output.printer.send.tooltip"))
|
||||
self.printer_ip_edit.setPlaceholderText(t("gui.output.printer.ip"))
|
||||
self.printer_access_code_edit.setPlaceholderText(t("gui.output.printer.access_code"))
|
||||
self.printer_serial_edit.setPlaceholderText(t("gui.output.printer.serial"))
|
||||
|
||||
# 语言标签
|
||||
self.language_label.setText(t("gui.options.language") + ":")
|
||||
|
||||
Reference in New Issue
Block a user