amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 05:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use LocalFileName class for file names inside a package.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-29 23:57:36 +02:00
parent f92c09e87a
commit a1d54f36fc
19 changed files with 143 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/image_card_list.cpp
+7 -7
View File
@@ -50,10 +50,10 @@ ImageFieldP ImageCardList::findImageField() {
/// A request for a thumbnail of a card image
class CardThumbnailRequest : public ThumbnailRequest {
public:
CardThumbnailRequest(ImageCardList* parent, const String& filename)
CardThumbnailRequest(ImageCardList* parent, const LocalFileName& filename)
: ThumbnailRequest(
parent,
_("card") + parent->set->absoluteFilename() + _("-") + filename,
_("card") + parent->set->absoluteFilename() + _("-") + filename.toStringForKey(),
wxDateTime::Now()) // TODO: Find mofication time of card image
, filename(filename)
{}
@@ -78,23 +78,23 @@ class CardThumbnailRequest : public ThumbnailRequest {
if (img.Ok()) {
wxImageList* il = parent->GetImageList(wxIMAGE_LIST_SMALL);
int id = il->Add(wxBitmap(img));
parent->thumbnails.insert(make_pair(filename, id));
parent->thumbnails.insert(make_pair(filename.toStringForKey(), id));
parent->Refresh(false);
}
}
virtual bool threadSafe() const {return true;}
private:
String filename;
private:
LocalFileName filename;
};
int ImageCardList::OnGetItemImage(long pos) const {
if (image_field) {
// Image = thumbnail of first image field of card
ImageValue& val = static_cast<ImageValue&>(*getCard(pos)->data[image_field]);
if (!val.filename) return -1; // no image
if (val.filename.empty()) return -1; // no image
// is there already a thumbnail?
map<String,int>::const_iterator it = thumbnails.find(val.filename);
map<String,int>::const_iterator it = thumbnails.find(val.filename.toStringForKey());
if (it != thumbnails.end()) {
return it->second;
} else {