mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-23 10:05:10 -07:00
[Refactor] Extract shared deck conversion prompt helper
Move the deck-to-.cod conversion prompt logic (format check, saved preference handling, overwrite confirmation, dialog) out of DeckPreviewWidget into dlg_convert_deck_to_cod_format so the deck editor can reuse it without duplicating it. Took 4 minutes Took 4 minutes Took 1 minute # Commit time for manual adjustment: # Took 3 minutes
This commit is contained in:
parent
83833f4684
commit
b594892ff7
3 changed files with 96 additions and 56 deletions
|
|
@ -1,9 +1,17 @@
|
||||||
#include "dlg_convert_deck_to_cod_format.h"
|
#include "dlg_convert_deck_to_cod_format.h"
|
||||||
|
|
||||||
|
#include "../../../client/settings/cache_settings.h"
|
||||||
|
#include "../../deck_loader/deck_loader.h"
|
||||||
|
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QDialogButtonBox>
|
#include <QDialogButtonBox>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
#include <QMessageBox>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
#include <libcockatrice/settings/visual_deck_storage_settings.h>
|
||||||
|
|
||||||
DialogConvertDeckToCodFormat::DialogConvertDeckToCodFormat(QWidget *parent) : QDialog(parent)
|
DialogConvertDeckToCodFormat::DialogConvertDeckToCodFormat(QWidget *parent) : QDialog(parent)
|
||||||
{
|
{
|
||||||
|
|
@ -38,3 +46,71 @@ bool DialogConvertDeckToCodFormat::dontAskAgain() const
|
||||||
{
|
{
|
||||||
return dontAskAgainCheckbox->isChecked();
|
return dontAskAgainCheckbox->isChecked();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
|
||||||
|
bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
|
||||||
|
{
|
||||||
|
QFileInfo fileInfo(filePath);
|
||||||
|
QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
|
||||||
|
|
||||||
|
if (QFile::exists(newFileName)) {
|
||||||
|
QMessageBox::StandardButton reply =
|
||||||
|
QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"),
|
||||||
|
QObject::tr("A .cod version of this deck already exists. Overwrite it?"),
|
||||||
|
QMessageBox::Yes | QMessageBox::No);
|
||||||
|
return reply == QMessageBox::Yes;
|
||||||
|
}
|
||||||
|
return true; // Safe to proceed
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
bool DialogConvertDeckToCodFormat::promptIfRequired(QWidget *parent,
|
||||||
|
const QString &filePath,
|
||||||
|
const std::function<bool()> &convert)
|
||||||
|
{
|
||||||
|
if (DeckFileFormat::getFormatFromName(filePath) == DeckFileFormat::Cockatrice) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve saved preference if the prompt is disabled
|
||||||
|
if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) {
|
||||||
|
if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!confirmOverwriteIfExists(parent, filePath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return convert();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show the dialog to the user
|
||||||
|
DialogConvertDeckToCodFormat conversionDialog(parent);
|
||||||
|
if (conversionDialog.exec() != QDialog::Accepted) {
|
||||||
|
SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(
|
||||||
|
!conversionDialog.dontAskAgain());
|
||||||
|
SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(false);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to convert file
|
||||||
|
if (!confirmOverwriteIfExists(parent, filePath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!convert()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (conversionDialog.dontAskAgain()) {
|
||||||
|
SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(false);
|
||||||
|
SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@
|
||||||
#include <QDialogButtonBox>
|
#include <QDialogButtonBox>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
#include <functional>
|
||||||
|
|
||||||
|
class QWidget;
|
||||||
|
|
||||||
class DialogConvertDeckToCodFormat : public QDialog
|
class DialogConvertDeckToCodFormat : public QDialog
|
||||||
{
|
{
|
||||||
|
|
@ -24,6 +27,21 @@ public:
|
||||||
|
|
||||||
[[nodiscard]] bool dontAskAgain() const;
|
[[nodiscard]] bool dontAskAgain() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Checks whether the deck file at \a filePath can store tags.
|
||||||
|
*
|
||||||
|
* If the file is not a .cod deck, prompts the user for conversion to the
|
||||||
|
* Cockatrice format, honoring the saved "always convert / don't ask again"
|
||||||
|
* preference. On acceptance \a convert is called to perform the conversion.
|
||||||
|
*
|
||||||
|
* @param parent The widget to parent the prompt to.
|
||||||
|
* @param filePath The path of the deck file to check.
|
||||||
|
* @param convert Called to convert the deck once the user agrees.
|
||||||
|
* @return true if tags can be stored (no conversion needed, or the conversion
|
||||||
|
* was performed), false if the user declined to convert.
|
||||||
|
*/
|
||||||
|
static bool promptIfRequired(QWidget *parent, const QString &filePath, const std::function<bool()> &convert);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QVBoxLayout *layout;
|
QVBoxLayout *layout;
|
||||||
QLabel *label;
|
QLabel *label;
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,6 @@
|
||||||
#include "../visual_deck_storage_widget.h"
|
#include "../visual_deck_storage_widget.h"
|
||||||
#include "deck_preview_deck_tags_display_widget.h"
|
#include "deck_preview_deck_tags_display_widget.h"
|
||||||
|
|
||||||
#include <QDir>
|
|
||||||
#include <QFile>
|
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
|
@ -499,21 +497,6 @@ void DeckPreviewWidget::actDeleteFile()
|
||||||
// The folder widget removes this preview once the row is gone.
|
// The folder widget removes this preview once the row is gone.
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
|
|
||||||
{
|
|
||||||
QFileInfo fileInfo(filePath);
|
|
||||||
QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
|
|
||||||
|
|
||||||
if (QFile::exists(newFileName)) {
|
|
||||||
QMessageBox::StandardButton reply =
|
|
||||||
QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"),
|
|
||||||
QObject::tr("A .cod version of this deck already exists. Overwrite it?"),
|
|
||||||
QMessageBox::Yes | QMessageBox::No);
|
|
||||||
return reply == QMessageBox::Yes;
|
|
||||||
}
|
|
||||||
return true; // Safe to proceed
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the deck's file format supports tags.
|
* Checks if the deck's file format supports tags.
|
||||||
* If not, then prompt the user for file conversion.
|
* If not, then prompt the user for file conversion.
|
||||||
|
|
@ -521,45 +504,8 @@ static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
|
||||||
*/
|
*/
|
||||||
bool DeckPreviewWidget::promptFileConversionIfRequired()
|
bool DeckPreviewWidget::promptFileConversionIfRequired()
|
||||||
{
|
{
|
||||||
if (DeckFileFormat::getFormatFromName(filePath) == DeckFileFormat::Cockatrice) {
|
return DialogConvertDeckToCodFormat::promptIfRequired(this, filePath, [this] {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Retrieve saved preference if the prompt is disabled
|
|
||||||
if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) {
|
|
||||||
if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!confirmOverwriteIfExists(this, filePath)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
model->convertToCockatriceFormat(row());
|
model->convertToCockatriceFormat(row());
|
||||||
return true;
|
return true;
|
||||||
}
|
});
|
||||||
|
|
||||||
// Show the dialog to the user
|
|
||||||
DialogConvertDeckToCodFormat conversionDialog(this);
|
|
||||||
if (conversionDialog.exec() != QDialog::Accepted) {
|
|
||||||
SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(
|
|
||||||
!conversionDialog.dontAskAgain());
|
|
||||||
SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(false);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to convert file
|
|
||||||
if (!confirmOverwriteIfExists(this, filePath)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
model->convertToCockatriceFormat(row());
|
|
||||||
|
|
||||||
if (conversionDialog.dontAskAgain()) {
|
|
||||||
SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(false);
|
|
||||||
SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue