From addad17e92947703fa58de81d9097aa884600284 Mon Sep 17 00:00:00 2001 From: yw1573 Date: Thu, 30 Jul 2026 14:44:33 +0800 Subject: [PATCH] =?UTF-8?q?style(gui):=20=E9=87=8D=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=8C=89=E9=92=AE=E7=A7=BB=E8=87=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=EF=BC=8C=E6=94=BE=E5=9C=A8=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=BB=98=E8=AE=A4=E4=BB=BD=E6=95=B0=E4=B9=8B=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a1_swap_mod_packer/gui.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/a1_swap_mod_packer/gui.py b/a1_swap_mod_packer/gui.py index 9c89a73..276514f 100644 --- a/a1_swap_mod_packer/gui.py +++ b/a1_swap_mod_packer/gui.py @@ -388,9 +388,11 @@ class MainWindow(QMainWindow): self.remove_button.clicked.connect(self.remove_selected) self.remove_all_button.clicked.connect(self.remove_all) self.apply_default_copies_button.clicked.connect(self.apply_default_copies_to_selected) + self.repack_3mf_button = QPushButton(t("gui.options.repack_3mf")) + self.repack_3mf_button.clicked.connect(self.repack_3mf_folder) self.build_button.clicked.connect(self.build_output) - for button in (self.add_button, self.remove_button, self.remove_all_button, self.apply_default_copies_button): + for button in (self.add_button, self.remove_button, self.remove_all_button, self.apply_default_copies_button, self.repack_3mf_button): button.setMinimumHeight(32) file_buttons.addWidget(button) file_buttons.addStretch(1) @@ -499,10 +501,6 @@ class MainWindow(QMainWindow): self.skip_duplicates_check = QCheckBox(t("gui.options.skip_duplicates")) self.skip_duplicates_check.setChecked(True) - # 重新打包解压的 3MF - self.repack_3mf_button = QPushButton(t("gui.options.repack_3mf")) - self.repack_3mf_button.clicked.connect(self.repack_3mf_folder) - # 标签列固定宽度（左对齐），控件列自动对齐（stretch=1 平分空间） grid.setColumnMinimumWidth(0, 120) grid.setColumnMinimumWidth(2, 90) @@ -556,9 +554,6 @@ class MainWindow(QMainWindow): # 第 6 行：构建成功后清空输入列表（独立一行） grid.addWidget(self.clear_after_build_check, 6, 1, 1, 3) - # 第 7 行：重新打包 3MF - grid.addWidget(self.repack_3mf_button, 7, 1, 1, 3) - root.addWidget(self.options_group) # ===================================================================== @@ -1455,6 +1450,7 @@ class MainWindow(QMainWindow): self.remove_button.setText(t("gui.button.remove")) self.remove_all_button.setText(t("gui.button.remove_all")) self.apply_default_copies_button.setText(t("gui.button.apply_copies")) + self.repack_3mf_button.setText(t("gui.options.repack_3mf")) self.build_button.setText(t("gui.button.build")) # 打包选项区 @@ -1479,7 +1475,6 @@ class MainWindow(QMainWindow): self.skip_duplicates_check.setText(t("gui.options.skip_duplicates")) self.bed_cooldown_suffix_label.setText(t("gui.options.bed_cooldown.suffix")) self.wait_suffix_label.setText(t("gui.options.wait_suffix")) - self.repack_3mf_button.setText(t("gui.options.repack_3mf")) # 元数据下拉框 self.metadata_combo.setItemText(0, t("gui.options.metadata.source"))