diff --git a/src/gui/symbol/window.cpp b/src/gui/symbol/window.cpp index 214dac7a..539c1e43 100644 --- a/src/gui/symbol/window.cpp +++ b/src/gui/symbol/window.cpp @@ -209,7 +209,7 @@ void SymbolWindow::onFileNew(wxCommandEvent& ev) { } void SymbolWindow::onFileOpen(wxCommandEvent& ev) { - String name = wxFileSelector(_("Open symbol"),settings.default_symbol_dir,_(""),_(""),_("Symbol files|*.mse-symbol;*.bmp|MSE2 symbol files (*.mse-symbol)|*.mse-symbol|Images/MSE1 symbol files|*.bmp;*.png;*.jpg;*.gif"),wxFD_OPEN|wxFD_FILE_MUST_EXIST, this); + String name = wxFileSelector(_("Open symbol"),settings.default_symbol_dir,_(""),_(""),_("All files|*.mse-symbol;*.bmp;*.jpg;*.jpeg;*.png;*.webp;*.gif;*.tif;*.tiff|MSE2 symbol files (*.mse-symbol)|*.mse-symbol|Images/MSE1 symbol files|*.bmp;*.jpg;*.jpeg;*.png;*.webp;*.gif;*.tif;*.tiff"),wxFD_OPEN|wxFD_FILE_MUST_EXIST, this); if (!name.empty()) { settings.default_symbol_dir = wxPathOnly(name); wxFileName n(name); @@ -221,8 +221,11 @@ void SymbolWindow::onFileOpen(wxCommandEvent& ev) { reader.handle_greedy(symbol); } else { wxBusyCursor busy; - Image image(name); - if (!image.Ok()) return; + Image image(name); + if (!image.Ok()) { + queue_message(MESSAGE_ERROR, _ERROR_("can't load image")); + return; + } symbol = import_symbol(image); } // show... diff --git a/src/gui/value/image.cpp b/src/gui/value/image.cpp index c2ff0d68..c92066ae 100644 --- a/src/gui/value/image.cpp +++ b/src/gui/value/image.cpp @@ -34,7 +34,7 @@ bool ImageValueEditor::onLeftDClick(const RealPoint&, wxMouseEvent&) { } } filename = wxFileSelector(_("Open image file"), directory, filename, _(""), - _("All images|*.bmp;*.jpg;*.jpeg;*.png;*.gif;*.tif;*.tiff|Windows bitmaps (*.bmp)|*.bmp|JPEG images (*.jpg;*.jpeg)|*.jpg;*.jpeg|PNG images (*.png)|*.png|GIF images (*.gif)|*.gif|TIFF images (*.tif;*.tiff)|*.tif;*.tiff"), + _("All images|*.bmp;*.jpg;*.jpeg;*.png;*.webp;*.gif;*.tif;*.tiff|Windows bitmaps (*.bmp)|*.bmp|JPEG images (*.jpg;*.jpeg)|*.jpg;*.jpeg|PNG images (*.png)|*.png|WebP images (*.webp)|*.webp|GIF images (*.gif)|*.gif|TIFF images (*.tif;*.tiff)|*.tif;*.tiff"), wxFD_OPEN, wxGetTopLevelParent(&editor())); if (!filename.empty()) { settings.default_image_dir = wxPathOnly(filename); @@ -42,8 +42,9 @@ bool ImageValueEditor::onLeftDClick(const RealPoint&, wxMouseEvent&) { { wxLogNull noLog; image = wxImage(filename); - } - sliceImage(image, filename, cardname); + } + if (!image.Ok()) queue_message(MESSAGE_ERROR, _ERROR_("can't load image")); + else sliceImage(image, filename, cardname); } return true; }