jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-24 18:33:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into tooomm-qt5

Browse source
This commit is contained in:
tooomm 2026-08-02 21:55:20 +02:00 • committed by GitHub
commit 4fba3c31f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
275 changed files with 66660 additions and 44237 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oracle/src/main.cpp
View file

@ -10,6 +10,7 @@
#include <QLibraryInfo>
#include <QTimer>
#include <QTranslator>
#include <libcockatrice/settings/personal_settings.h>
QTranslator *translator, *qtTranslator;
ThemeManager *themeManager;
@ -21,7 +22,7 @@ bool isBackgrounded;
void installNewTranslator()
{
QString lang = SettingsCache::instance().getLang();
QString lang = SettingsCache::instance().personal().getLang();
QString qtNameHint = "qt_" + lang;
QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);

9
oracle/src/oracleimporter.cpp
View file

@ -291,12 +291,13 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
// per-set properties
PrintingInfo printingInfo = PrintingInfo(currentSet);
QVariantHash printingProps;
for (auto i = setInfoProperties.cbegin(), end = setInfoProperties.cend(); i != end; ++i) {
QString mtgjsonProperty = i.key();
QString xmlPropertyName = i.value();
QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
if (!propertyValue.isEmpty()) {
printingInfo.setProperty(xmlPropertyName, propertyValue);
printingProps.insert(xmlPropertyName, propertyValue);
}
}
@ -304,7 +305,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
QString faceFlavorName = getStringPropertyFromMap(card, "faceFlavorName");
QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getStringPropertyFromMap(card, "flavorName");
if (!flavorName.isEmpty()) {
printingInfo.setProperty("flavorName", flavorName);
printingProps.insert("flavorName", flavorName);
}
// Identifiers
@ -313,10 +314,12 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
QString xmlPropertyName = i.value();
QString propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
if (!propertyValue.isEmpty()) {
printingInfo.setProperty(xmlPropertyName, propertyValue);
printingProps.insert(xmlPropertyName, propertyValue);
}
}
printingInfo.setProperties(printingProps);
QString numComponent;
const QString numProperty = printingInfo.getProperty("num");
const QChar lastChar = numProperty.isEmpty() ? QChar() : numProperty.back();

3
oracle/src/oraclewizard.cpp
View file

@ -15,6 +15,7 @@
#include <QScrollBar>
#include <QtConcurrent>
#include <QtGui>
#include <libcockatrice/settings/personal_settings.h>
OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
{
@ -33,7 +34,7 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
migrateOracleSettings();
}
connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage);
connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &OracleWizard::updateLanguage);
importer = new OracleImporter(this);

3
oracle/src/pages.cpp
View file

@ -28,6 +28,7 @@
#include <QTextEdit>
#include <QtConcurrent>
#include <QtGui>
#include <libcockatrice/settings/personal_settings.h>
#ifdef HAS_LZMA
#include "lzma/decompress.h"
@ -119,7 +120,7 @@ QString IntroPage::languageName(const QString &lang)
void IntroPage::languageBoxChanged(int index)
{
SettingsCache::instance().setLang(languageBox->itemData(index).toString());
SettingsCache::instance().personal().setLang(languageBox->itemData(index).toString());
}
void IntroPage::retranslateUi()

4
oracle/translations/oracle_de.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Platzhalter Edition mit Spielsteinen</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_el.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Εικονικό σετ που περιέχει tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Εισαγωγέας Oracle</translation>
</message>

4
oracle/translations/oracle_en_US.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Dummy set containing tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_es.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Set dedicado para tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Importador de Oracle</translation>
</message>

4
oracle/translations/oracle_et.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Nukk-komplekt mis sisaldab märgistusi</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle sissetooja</translation>
</message>

4
oracle/translations/oracle_fi.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Tokeneja sisältävä mallisetti</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle-lataaja</translation>
</message>

4
oracle/translations/oracle_fr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Fausse édition contenant les jetons</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Importateur Oracle</translation>
</message>

4
oracle/translations/oracle_it.ts
View file

@ -277,7 +277,7 @@ e pedine che verranno usate da Cockatrice.</translation>
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Set finto contenente i token</translation>
</message>
@ -285,7 +285,7 @@ e pedine che verranno usate da Cockatrice.</translation>
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_ja.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>ダミーセットを含むトークン</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle Importer - オラクル・インポーター</translation>
</message>

4
oracle/translations/oracle_ko.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>토큰 정보가 들어있는 더미 확장판</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>오라클</translation>
</message>

4
oracle/translations/oracle_nb.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Dummy sett som inneholder tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle importerer</translation>
</message>

4
oracle/translations/oracle_nl.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Token voorbeeldset</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle importer</translation>
</message>

4
oracle/translations/oracle_pl.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Dodatek-atrapa, zawierający tokeny.</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle – kreator importu</translation>
</message>

4
oracle/translations/oracle_pt.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Set básico contendo fichas</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Importar Oracle</translation>
</message>

4
oracle/translations/oracle_pt_BR.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Esta expansão contém fichas.</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Importador Oracle</translation>
</message>

4
oracle/translations/oracle_ru.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>Пример сета с фишками</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Импортер Oracle</translation>
</message>

4
oracle/translations/oracle_sr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation type="unfinished"/>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation type="unfinished"/>
</message>

4
oracle/translations/oracle_tr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation type="unfinished"/>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation type="unfinished"/>
</message>

4
oracle/translations/oracle_yue.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>包含衍生物的虚拟牌組</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle導入器</translation>
</message>

4
oracle/translations/oracle_zh-Hans.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="540"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation>包含衍生物的虚拟牌组</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="97"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation>Oracle导入器</translation>
</message>