mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
cleanup
This commit is contained in:
@@ -172,19 +172,6 @@ void AddJSONWindow::onBrowseFiles(wxCommandEvent&) {
|
||||
}
|
||||
|
||||
void AddJSONWindow::onOk(wxCommandEvent&) {
|
||||
|
||||
|
||||
|
||||
// debug test shit
|
||||
export_image(set, set->cards.front(), "C:\\Users\\Oli\\Desktop\\tetest\\test.png");
|
||||
auto extImg = make_intrusive<ExternalImage>("C:/Users/Oli/Desktop/tetest/test.png");
|
||||
Image img = extImg->generate(GeneratedImage::Options(0, 0, set->stylesheet.get(), set.get()));
|
||||
if (img.HasOption(wxIMAGE_OPTION_FILENAME)) queue_message(MESSAGE_ERROR, img.GetOption(wxIMAGE_OPTION_FILENAME));
|
||||
else queue_message(MESSAGE_ERROR, _("no dice"));
|
||||
return;
|
||||
|
||||
|
||||
|
||||
/// Perform the import
|
||||
wxBusyCursor wait;
|
||||
// Read the file
|
||||
|
||||
@@ -65,7 +65,7 @@ void ImagesExportWindow::onOk(wxCommandEvent&) {
|
||||
if (name.empty()) return;
|
||||
settings.default_export_dir = wxPathOnly(name);
|
||||
// Export
|
||||
export_images(set, getSelection(), name, gs.images_export_filename, gs.images_export_conflicts);
|
||||
export_image(set, getSelection(), name, gs.images_export_filename, gs.images_export_conflicts);
|
||||
// Done
|
||||
EndModal(wxID_OK);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user