Simplify code and trying to fix things on macos

This commit is contained in:
Pengfei
2021-08-18 11:36:11 +08:00
parent 16e41c8fd4
commit b7b5e41908
+15 -26
View File
@@ -514,16 +514,13 @@ void ImportDialog::OnContextMenu(const QPoint& point) {
if (item->parent()) { // Second level if (item->parent()) { // Second level
const auto& specifier = SpecifierFromItem(item); const auto& specifier = SpecifierFromItem(item);
if (specifier.type == Core::ContentType::Application) { if (specifier.type == Core::ContentType::Application) {
QAction* dump_cxi = context_menu.addAction(tr("Dump CXI file")); context_menu.addAction(tr("Dump CXI file"),
connect(dump_cxi, &QAction::triggered, [this, specifier] { StartDumpingCXISingle(specifier); });
[this, specifier] { StartDumpingCXISingle(specifier); });
} }
if (Core::IsTitle(specifier.type)) { if (Core::IsTitle(specifier.type)) {
QAction* build_cia = context_menu.addAction(tr("Build CIA...")); context_menu.addAction(tr("Build CIA..."),
connect(build_cia, &QAction::triggered, [this, specifier] { StartBuildingCIASingle(specifier); });
[this, specifier] { StartBuildingCIASingle(specifier); }); context_menu.addAction(tr("Show Title Info"), [this, specifier] {
QAction* show_title_info = context_menu.addAction(tr("Show Title Info"));
connect(show_title_info, &QAction::triggered, [this, specifier] {
TitleInfoDialog dialog(this, *importer, specifier); TitleInfoDialog dialog(this, *importer, specifier);
dialog.exec(); dialog.exec();
}); });
@@ -536,20 +533,16 @@ void ImportDialog::OnContextMenu(const QPoint& point) {
for (int i = 0; i < item->childCount(); ++i) { for (int i = 0; i < item->childCount(); ++i) {
const auto& specifier = SpecifierFromItem(item->child(i)); const auto& specifier = SpecifierFromItem(item->child(i));
if (specifier.type == Core::ContentType::Application) { if (specifier.type == Core::ContentType::Application) {
QAction* dump_base_cxi = context_menu.addAction(tr("Dump Base CXI file")); context_menu.addAction(tr("Dump Base CXI file"),
connect(dump_base_cxi, &QAction::triggered, [this, specifier] { StartDumpingCXISingle(specifier); });
[this, specifier] { StartDumpingCXISingle(specifier); }); context_menu.addAction(tr("Build Base CIA"),
QAction* build_base_cia = context_menu.addAction(tr("Build Base CIA")); [this, specifier] { StartBuildingCIASingle(specifier); });
connect(build_base_cia, &QAction::triggered,
[this, specifier] { StartBuildingCIASingle(specifier); });
} else if (specifier.type == Core::ContentType::Update) { } else if (specifier.type == Core::ContentType::Update) {
QAction* build_update_cia = context_menu.addAction(tr("Build Update CIA")); context_menu.addAction(tr("Build Update CIA"),
connect(build_update_cia, &QAction::triggered, [this, specifier] { StartBuildingCIASingle(specifier); });
[this, specifier] { StartBuildingCIASingle(specifier); });
} else if (specifier.type == Core::ContentType::DLC) { } else if (specifier.type == Core::ContentType::DLC) {
QAction* build_dlc_cia = context_menu.addAction(tr("Build DLC CIA")); context_menu.addAction(tr("Build DLC CIA"),
connect(build_dlc_cia, &QAction::triggered, [this, specifier] { StartBuildingCIASingle(specifier); });
[this, specifier] { StartBuildingCIASingle(specifier); });
} }
} }
} }
@@ -582,12 +575,8 @@ void ImportDialog::ShowAdvancedMenu() {
} }
AdvancedMenu menu(this); AdvancedMenu menu(this);
menu.addAction(tr("Batch Dump CXI"), this, &ImportDialog::StartBatchDumpingCXI);
QAction* batch_dump_cxi = menu.addAction(tr("Batch Dump CXI")); menu.addAction(tr("Batch Build CIA"), this, &ImportDialog::StartBatchBuildingCIA);
connect(batch_dump_cxi, &QAction::triggered, this, &ImportDialog::StartBatchDumpingCXI);
QAction* batch_build_cia = menu.addAction(tr("Batch Build CIA"));
connect(batch_build_cia, &QAction::triggered, this, &ImportDialog::StartBatchBuildingCIA);
menu.exec(ui->advanced_button->mapToGlobal(ui->advanced_button->rect().bottomLeft())); menu.exec(ui->advanced_button->mapToGlobal(ui->advanced_button->rect().bottomLeft()));
} }