Commit 696792b6 authored by twanvl's avatar twanvl

changed function name (exportCard -> includeCard), because it better describes...

changed function name (exportCard -> includeCard), because it better describes what the function does.
parent 197c61bd
...@@ -63,7 +63,7 @@ void ExportCardImages::exportImages(const SetP& set, wxFileName& fn, const Strin ...@@ -63,7 +63,7 @@ void ExportCardImages::exportImages(const SetP& set, wxFileName& fn, const Strin
// Export // Export
std::set<String> used; // for CONFLICT_NUMBER_OVERWRITE std::set<String> used; // for CONFLICT_NUMBER_OVERWRITE
FOR_EACH(card, set->cards) { FOR_EACH(card, set->cards) {
if (exportCard(card)) { if (includeCard(card)) {
// filename for this card // filename for this card
Context& ctx = set->getContext(card); Context& ctx = set->getContext(card);
String filename = untag(ctx.eval(*filename_script)->toString()); String filename = untag(ctx.eval(*filename_script)->toString());
...@@ -121,7 +121,7 @@ void ImagesExportWindow::onOk(wxCommandEvent&) { ...@@ -121,7 +121,7 @@ void ImagesExportWindow::onOk(wxCommandEvent&) {
EndModal(wxID_OK); EndModal(wxID_OK);
} }
bool ImagesExportWindow::exportCard(const CardP& card) const { bool ImagesExportWindow::includeCard(const CardP& card) const {
return isSelected(card); return isSelected(card);
} }
......
...@@ -22,7 +22,8 @@ class ExportCardImages { ...@@ -22,7 +22,8 @@ class ExportCardImages {
void exportImages(const SetP& set, wxFileName& filename, const String& filename_template, FilenameConflicts conflicts); void exportImages(const SetP& set, wxFileName& filename, const String& filename_template, FilenameConflicts conflicts);
virtual ~ExportCardImages() {} virtual ~ExportCardImages() {}
protected: protected:
virtual bool exportCard(const CardP& card) const { return true; } /// Should the given card be exported?
virtual bool includeCard(const CardP& card) const { return true; }
}; };
// ----------------------------------------------------------------------------- : ImagesExportWindow // ----------------------------------------------------------------------------- : ImagesExportWindow
...@@ -37,7 +38,7 @@ class ImagesExportWindow : public CardSelectWindow, private ExportCardImages { ...@@ -37,7 +38,7 @@ class ImagesExportWindow : public CardSelectWindow, private ExportCardImages {
void onOk(wxCommandEvent&); void onOk(wxCommandEvent&);
virtual bool exportCard(const CardP& card) const; virtual bool includeCard(const CardP& card) const;
wxTextCtrl* format; wxTextCtrl* format;
wxChoice* conflicts; wxChoice* conflicts;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment