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"))