jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 02:53:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Consolidate accepted decklist file extensions (#5749)

Browse source 
* Consolidate accepted decklist file extensions

* rename the other const
This commit is contained in:
RickyRister 2025-03-18 18:53:14 -07:00 • committed by GitHub
parent 42301d4f1a
commit 0fa744f6ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp
View file

@ -355,7 +355,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs()
dialog.setDirectory(SettingsCache::instance().getDeckPath()); dialog.setDirectory(SettingsCache::instance().getDeckPath());
dialog.setAcceptMode(QFileDialog::AcceptSave); dialog.setAcceptMode(QFileDialog::AcceptSave);
dialog.setDefaultSuffix("cod"); dialog.setDefaultSuffix("cod");
dialog.setNameFilters(DeckLoader::fileNameFilters); dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
dialog.selectFile(getDeckList()->getName().trimmed()); dialog.selectFile(getDeckList()->getName().trimmed());
if (!dialog.exec()) if (!dialog.exec())
return false; return false;

2
cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
View file

@ -71,7 +71,7 @@ static QStringList getAllFiles(const QString &filePath, bool recursive)
// QDirIterator with QDir::Files ensures only files are listed (no directories) // QDirIterator with QDir::Files ensures only files are listed (no directories)
auto flags = auto flags =
recursive ? QDirIterator::Subdirectories | QDirIterator::FollowSymlinks : QDirIterator::NoIteratorFlags; recursive ? QDirIterator::Subdirectories | QDirIterator::FollowSymlinks : QDirIterator::NoIteratorFlags;
QDirIterator it(filePath, {"*.txt", "*.cod"}, QDir::Files, flags); QDirIterator it(filePath, DeckLoader::ACCEPTED_FILE_EXTENSIONS, QDir::Files, flags);
while (it.hasNext()) { while (it.hasNext()) {
allFiles << it.next(); // Add each file path to the list allFiles << it.next(); // Add each file path to the list

7
cockatrice/src/deck/deck_loader.cpp
View file

@ -16,9 +16,10 @@
#include <QStringList> #include <QStringList>
#include <QtConcurrentRun> #include <QtConcurrentRun>
const QStringList DeckLoader::fileNameFilters = QStringList() const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
<< QObject::tr("Common deck formats (*.cod *.dec *.dek *.txt *.mwDeck)")
<< QObject::tr("All files (*.*)"); const QStringList DeckLoader::FILE_NAME_FILTERS = {
tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")};
DeckLoader::DeckLoader() : DeckList(), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1) DeckLoader::DeckLoader() : DeckList(), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
{ {

11
cockatrice/src/deck/deck_loader.h
View file

@ -20,7 +20,16 @@ public:
PlainTextFormat, PlainTextFormat,
CockatriceFormat CockatriceFormat
}; };
static const QStringList fileNameFilters;
/**
* Supported file extensions for decklist files
*/
static const QStringList ACCEPTED_FILE_EXTENSIONS;
/**
* For use with `QFileDialog::setNameFilters`
*/
static const QStringList FILE_NAME_FILTERS;
private: private:
QString lastFileName; QString lastFileName;

2
cockatrice/src/dialogs/dlg_load_deck.cpp
View file

@ -11,7 +11,7 @@ DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
} }
setDirectory(startingDir); setDirectory(startingDir);
setNameFilters(DeckLoader::fileNameFilters); setNameFilters(DeckLoader::FILE_NAME_FILTERS);
connect(this, &DlgLoadDeck::accepted, this, &DlgLoadDeck::actAccepted); connect(this, &DlgLoadDeck::accepted, this, &DlgLoadDeck::actAccepted);
} }