ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `Save` button on Tile Viewer for GB and GBA. 

For some reason this was not implemented yet.
This commit is contained in:
Edênis Freindorfer Azevedo 2020-02-17 00:28:37 -03:00 committed by Rafael Kitover
parent d05e8fc141
commit dcaa1b9abc
3 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/wx/gfxviewers.cpp
View File

@ -1582,6 +1582,44 @@ public:
}
}
void SaveGBATile(wxCommandEvent& ev)
{
(void)ev; // unused params
GameArea* panel = wxGetApp().frame->GetPanel();
wxString bmp_save_dir = wxGetApp().frame->GetGamePath(gopts.scrshot_dir);
// no attempt is made here to translate the dialog type name
// it's just a suggested name, anyway
wxString def_name = panel->game_name() + wxT('-') + dname;
def_name.resize(def_name.size() - 6); // strlen("Viewer")
if (captureFormat)
def_name += wxT(".bmp");
else
def_name += wxT(".png");
wxFileDialog dlg(GetGrandParent(), _("Select output file"), bmp_save_dir, def_name,
_("PNG images|*.png|BMP images|*.bmp"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
dlg.SetFilterIndex(captureFormat);
int ret = dlg.ShowModal();
bmp_save_dir = dlg.GetDirectory();
if (ret != wxID_OK)
return;
wxBitmap obmp = gv->bm->GetSubBitmap(wxRect(0, 0, gv->bmw, gv->bmh));
wxString fn = dlg.GetPath();
wxBitmapType fmt = dlg.GetFilterIndex() ? wxBITMAP_TYPE_BMP : wxBITMAP_TYPE_PNG;
if (fn.size() > 4) {
if (wxString(fn.substr(fn.size() - 4)).IsSameAs(wxT(".bmp"), false))
fmt = wxBITMAP_TYPE_BMP;
else if (wxString(fn.substr(fn.size() - 4)).IsSameAs(wxT(".png"), false))
fmt = wxBITMAP_TYPE_PNG;
}
obmp.SaveFile(fn, fmt);
}
protected:
int charbase, is256, palette;
wxControl *tileno, *addr;
@ -1591,6 +1629,7 @@ protected:
};
BEGIN_EVENT_TABLE(TileViewer, GfxViewer)
EVT_BUTTON(XRCID("SaveGBATile"), TileViewer::SaveGBATile)
EVT_GFX_CLICK(wxID_ANY, TileViewer::UpdateMouseInfoEv)
END_EVENT_TABLE()
@ -1685,6 +1724,44 @@ public:
}
}
void SaveGBTile(wxCommandEvent& ev)
{
(void)ev; // unused params
GameArea* panel = wxGetApp().frame->GetPanel();
wxString bmp_save_dir = wxGetApp().frame->GetGamePath(gopts.scrshot_dir);
// no attempt is made here to translate the dialog type name
// it's just a suggested name, anyway
wxString def_name = panel->game_name() + wxT('-') + dname;
def_name.resize(def_name.size() - 6); // strlen("Viewer")
if (captureFormat)
def_name += wxT(".bmp");
else
def_name += wxT(".png");
wxFileDialog dlg(GetGrandParent(), _("Select output file"), bmp_save_dir, def_name,
_("PNG images|*.png|BMP images|*.bmp"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
dlg.SetFilterIndex(captureFormat);
int ret = dlg.ShowModal();
bmp_save_dir = dlg.GetDirectory();
if (ret != wxID_OK)
return;
wxBitmap obmp = gv->bm->GetSubBitmap(wxRect(0, 0, gv->bmw, gv->bmh));
wxString fn = dlg.GetPath();
wxBitmapType fmt = dlg.GetFilterIndex() ? wxBITMAP_TYPE_BMP : wxBITMAP_TYPE_PNG;
if (fn.size() > 4) {
if (wxString(fn.substr(fn.size() - 4)).IsSameAs(wxT(".bmp"), false))
fmt = wxBITMAP_TYPE_BMP;
else if (wxString(fn.substr(fn.size() - 4)).IsSameAs(wxT(".png"), false))
fmt = wxBITMAP_TYPE_PNG;
}
obmp.SaveFile(fn, fmt);
}
protected:
int bank, charbase, palette;
wxControl *addr, *tileno;
@ -1694,6 +1771,7 @@ protected:
};
BEGIN_EVENT_TABLE(GBTileViewer, GfxViewer)
EVT_BUTTON(XRCID("SaveGBTile"), GBTileViewer::SaveGBTile)
EVT_GFX_CLICK(wxID_ANY, GBTileViewer::UpdateMouseInfoEv)
END_EVENT_TABLE()
}

2
src/wx/xrc/GBTileViewer.xrc
View File

@ -148,7 +148,7 @@
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_SAVE">
<object class="wxButton" name="SaveGBTile">
<label>_Save...</label>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>

2
src/wx/xrc/TileViewer.xrc
View File

@ -164,7 +164,7 @@
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_SAVE">
<object class="wxButton" name="SaveGBATile">
<label>_Save...</label>
</object>
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>