asd921150/namecreater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. fix QNetworkRequest url is empty issue. 2. release version 2.9.0

Browse Source
This commit is contained in:
shouchih_chen 2024-09-27 11:42:19 +08:00
parent 7aa79287c8
commit 0e9e58a389
4 changed files with 353 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
NameCreater/NameCreater.cpp
View File

@ -37,262 +37,271 @@
//#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf" //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf"
NameCreater::NameCreater(QWidget *parent) NameCreater::NameCreater(QWidget* parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
//connect(ui.fiveold_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); //connect(ui.fiveold_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.birthday_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.towel_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.towel_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.fivenew_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.fivenew_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.fivesingle_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.fivesingle_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
connect(ui.customlogo_btn, &QPushButton::released, this , &NameCreater::OnClickedCustomLogoBtn); connect(ui.customlogo_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogoBtn);
connect(ui.customlogo2_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogo2Btn); connect(ui.customlogo2_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogo2Btn);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
connect(ui.font_comboBox, &QComboBox::currentTextChanged, this, &NameCreater::OnFontComboBoxTextChanged); connect(ui.font_comboBox, &QComboBox::currentTextChanged, this, &NameCreater::OnFontComboBoxTextChanged);
#else #else
connect(ui.font_comboBox, &QComboBox::currentIndexChanged, this, &NameCreater::OnFontComboBoxIndexChanged); connect(ui.font_comboBox, &QComboBox::currentIndexChanged, this, &NameCreater::OnFontComboBoxIndexChanged);
#endif #endif
//qDebug()<<"QSslSocket="<<QSslSocket::sslLibraryBuildVersionString(); //qDebug()<<"QSslSocket="<<QSslSocket::sslLibraryBuildVersionString();
connect(&network_mgr, &QNetworkAccessManager::finished, this, &NameCreater::onFontDownloadFinished); connect(&network_mgr, &QNetworkAccessManager::finished, this, &NameCreater::onFontDownloadFinished);
query(QUrl(FONT_JSON_URL)); query_type = 10;
query(QUrl(FONT_JSON_URL), 10);
} }
void NameCreater::parseFontJson(const QByteArray& data) void NameCreater::parseFontJson(const QByteArray& data)
{ {
QJsonDocument jsonDoc = QJsonDocument::fromJson(data); QJsonDocument jsonDoc = QJsonDocument::fromJson(data);
if (jsonDoc.isNull()) { if (jsonDoc.isNull()) {
qDebug() << "Failed to create JSON doc."; qDebug() << "Failed to create JSON doc.";
return; return;
} }
if (jsonDoc.isObject()) { if (jsonDoc.isObject()) {
QJsonObject jsonObj = jsonDoc.object(); QJsonObject jsonObj = jsonDoc.object();
// Process the JSON object // Process the JSON object
qDebug() << "JSON Object:" << jsonObj; qDebug() << "JSON Object:" << jsonObj;
} }
else if (jsonDoc.isArray()) { else if (jsonDoc.isArray()) {
ui.font_comboBox->clear(); ui.font_comboBox->clear();
QJsonArray jsonArray = jsonDoc.array(); QJsonArray jsonArray = jsonDoc.array();
foreach(auto val, jsonArray) { foreach(auto val, jsonArray) {
auto obj = val.toObject(); auto obj = val.toObject();
QString n = obj["font_name"].toString(); QString n = obj["font_name"].toString();
QString u = obj["font_url"].toString(); QString u = obj["font_url"].toString();
ui.font_comboBox->addItem(n, u); ui.font_comboBox->addItem(n, u);
} }
// Process the JSON array // Process the JSON array
qDebug() << "JSON Array:" << jsonArray; qDebug() << "JSON Array:" << jsonArray;
} }
} }
void NameCreater::query(const QUrl& url) void NameCreater::query(const QUrl& url, int type)
{ {
QNetworkRequest req(url); QNetworkRequest req(url);
network_mgr.get(req); req.setAttribute(QNetworkRequest::User, QVariant(type));
network_mgr.get(req);
} }
void NameCreater::loadFont(const QByteArray& fontdata){ void NameCreater::loadFont(const QByteArray& fontdata) {
int id = QFontDatabase::addApplicationFontFromData(fontdata); int id = QFontDatabase::addApplicationFontFromData(fontdata);
QStringList family_list = QFontDatabase::applicationFontFamilies(id); QStringList family_list = QFontDatabase::applicationFontFamilies(id);
qDebug()<<"font family list:" <<family_list; qDebug() << "font family list:" << family_list;
QString cht_fontname = family_list.at(0); QString cht_fontname = family_list.at(0);
font = QFont(cht_fontname); font = QFont(cht_fontname);
font.setPixelSize(FONT_SIZE); font.setPixelSize(FONT_SIZE);
QString font_path = QString(TOWEL_FONT_PATH); QString font_path = QString(TOWEL_FONT_PATH);
QFile font_res_towel(font_path); QFile font_res_towel(font_path);
if (!font_res_towel.open(QIODevice::ReadOnly)) { if (!font_res_towel.open(QIODevice::ReadOnly)) {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setText("Can not load font file!" + font_path); msgBox.setText("Can not load font file!" + font_path);
msgBox.exec(); msgBox.exec();
font_res_towel.close(); font_res_towel.close();
} }
id = QFontDatabase::addApplicationFontFromData(font_res_towel.readAll()); id = QFontDatabase::addApplicationFontFromData(font_res_towel.readAll());
font_towel = QFont(QFontDatabase::applicationFontFamilies(id).at(0)); font_towel = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
font_towel.setPixelSize(240); font_towel.setPixelSize(240);
font_towel.setLetterSpacing(QFont::PercentageSpacing, 42); font_towel.setLetterSpacing(QFont::PercentageSpacing, 42);
font_path = QString(ENGLISH_FONT_PATH); font_path = QString(ENGLISH_FONT_PATH);
QFile font_res_eng(font_path); QFile font_res_eng(font_path);
if (!font_res_eng.open(QIODevice::ReadOnly)) { if (!font_res_eng.open(QIODevice::ReadOnly)) {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setText("Can not load font file!" + font_path); msgBox.setText("Can not load font file!" + font_path);
msgBox.exec(); msgBox.exec();
font_res_eng.close(); font_res_eng.close();
} }
id = QFontDatabase::addApplicationFontFromData(font_res_eng.readAll()); id = QFontDatabase::addApplicationFontFromData(font_res_eng.readAll());
font_english = QFont(QFontDatabase::applicationFontFamilies(id).at(0)); font_english = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
font_color = QColor(0, 0, 0); font_color = QColor(0, 0, 0);
QFont tital_font = QFont(font); QFont tital_font = QFont(font);
tital_font.setPixelSize(20); tital_font.setPixelSize(20);
QFont version_font = QFont(font); QFont version_font = QFont(font);
version_font.setPixelSize(12); version_font.setPixelSize(12);
//ui.tital_label->setFont(tital_font); //ui.tital_label->setFont(tital_font);
char c_font_name[64] = {0}; char c_font_name[64] = { 0 };
sprintf(c_font_name,"%s", cht_fontname.toStdString().c_str()); sprintf(c_font_name, "%s", cht_fontname.toStdString().c_str());
ui.font_name_label->setFont(version_font); ui.font_name_label->setFont(version_font);
ui.font_name_label->setText(QString::fromLocal8Bit(c_font_name)); ui.font_name_label->setText(QString::fromLocal8Bit(c_font_name));
ui.version_label->setFont(version_font); ui.version_label->setFont(version_font);
ui.version_label->setText(VERSION); ui.version_label->setText(VERSION);
ui.font_comboBox->setFont(version_font);
QList<QLabel*> titals = findChildren<QLabel*>(QRegularExpression("tital_label")); QList<QLabel*> titals = findChildren<QLabel*>(QRegularExpression("tital_label"));
foreach(auto tital, titals) { foreach(auto tital, titals) {
tital->setFont(tital_font); tital->setFont(tital_font);
} }
qDebug() << "Load Font Succeed!"; qDebug() << "Load Font Succeed!";
} }
void NameCreater::OnClickedReadBtn() { void NameCreater::OnClickedReadBtn() {
auto sender =(QPushButton*) QObject::sender(); auto sender = (QPushButton*)QObject::sender();
#ifdef Q_OS_WASM #ifdef Q_OS_WASM
auto fileContentReady = [this, sender](const QString &fileName, const QByteArray &fileContent) { auto fileContentReady = [this, sender](const QString& fileName, const QByteArray& fileContent) {
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
this->execCreater(sender, fileName, fileContent); this->execCreater(sender, fileName, fileContent);
} }
}; };
QFileDialog::getOpenFileContent("CSV (*.csv)", fileContentReady); QFileDialog::getOpenFileContent("CSV (*.csv)", fileContentReady);
#else #else
QString filename = QFileDialog::getOpenFileName(nullptr,"Open Name File", QDir::currentPath(),"CSV file(*.csv)"); QString filename = QFileDialog::getOpenFileName(nullptr, "Open Name File", QDir::currentPath(), "CSV file(*.csv)");
if(!filename.isEmpty()){ if (!filename.isEmpty()) {
QFile _f(filename); QFile _f(filename);
if(_f.open(QIODevice::ReadOnly)){ if (_f.open(QIODevice::ReadOnly)) {
execCreater(sender, filename, _f.readAll()); execCreater(sender, filename, _f.readAll());
} }
} }
#endif #endif
} }
void NameCreater::execCreater(QObject* sender, const QString& fileName, const QByteArray& fileContent) { void NameCreater::execCreater(QObject* sender, const QString& fileName, const QByteArray& fileContent) {
// Use fileName and fileContent // Use fileName and fileContent
if(sender == ui.fivesingle_btn) FiveToSingle().generaImageFromCSV(Name_Type_e::Name_zh,fileName, fileContent, this->font, this->font_color); if (sender == ui.fivesingle_btn) FiveToSingle().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
if(sender == ui.birthday_btn) BirthdayCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color); if (sender == ui.birthday_btn) BirthdayCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
if(sender == ui.fivenew_btn) NewFiveCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color); if (sender == ui.fivenew_btn) NewFiveCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
if(sender == ui.towel_btn) TowelCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font_towel, this->font_color); if (sender == ui.towel_btn) TowelCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font_towel, this->font_color);
if (sender == ui.birthday_zh_eng_btn) { if (sender == ui.birthday_zh_eng_btn) {
BirthdayCreater creater; BirthdayCreater creater;
creater.setEnglishFont(font_english); creater.setEnglishFont(font_english);
creater.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color); creater.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
} }
if (sender == ui.birthday_eng_eng_btn){ if (sender == ui.birthday_eng_eng_btn) {
BirthdayCreater b; BirthdayCreater b;
b.setEnglishFont(font_english); b.setEnglishFont(font_english);
b.generaImageFromCSV(Name_Type_e::Name_eng, fileName,fileContent,this->font, this->font_color); b.generaImageFromCSV(Name_Type_e::Name_eng, fileName, fileContent, this->font, this->font_color);
} }
if (sender == ui.handkerchief_btn) { if (sender == ui.handkerchief_btn) {
QFont newFont(font); QFont newFont(font);
newFont.setPixelSize(78); newFont.setPixelSize(78);
QColor newColor(0,0,0); QColor newColor(0, 0, 0);
HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor); HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor);
} }
if (sender == ui.fivesingle_zh_eng_btn) { if (sender == ui.fivesingle_zh_eng_btn) {
FiveToSingle f; FiveToSingle f;
f.setEnglishFont(this->font_english); f.setEnglishFont(this->font_english);
f.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color); f.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
return; return;
} }
} }
void NameCreater::OnClickedCustomLogoBtn() { void NameCreater::OnClickedCustomLogoBtn() {
QEventLoop loop; QEventLoop loop;
CustomLogo widget(&this->font); CustomLogo widget(&this->font);
widget.show(); widget.show();
connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit); connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
loop.exec(); loop.exec();
qDebug()<<"exit event loop"; qDebug() << "exit event loop";
} }
void NameCreater::OnClickedCustomLogo2Btn(){ void NameCreater::OnClickedCustomLogo2Btn() {
QEventLoop loop; QEventLoop loop;
customlogo2 widget(&this->font); customlogo2 widget(&this->font);
connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit); connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
widget.show(); widget.show();
loop.exec(); loop.exec();
} }
void NameCreater::onFontDownloadFinished(QNetworkReply *reply){ void NameCreater::onFontDownloadFinished(QNetworkReply* reply) {
if(reply->error() == QNetworkReply::NoError){ if (reply->error() == QNetworkReply::NoError) {
QString url = reply->request().url().toString(); QString url = reply->request().url().toString();
qDebug() << "req url:" << url; int attri = reply->request().attribute(QNetworkRequest::User).toInt();
if (url.contains("fonts.json")) { qDebug() << "req url:" << url << "attribi:" << QString::number(attri);
qDebug() << "query fonts json succeed";
parseFontJson(reply->readAll());
} if (url.contains("fonts.json") || attri == 10 || query_type == 10) {
else if(url.contains(".ttf") || url.contains(".otf")) { qDebug() << "query fonts json succeed";
qDebug() << "query font family succeed"; parseFontJson(reply->readAll());
loadFont(reply->readAll());
}
}else{ }else if (url.contains(".ttf") || url.contains(".otf") || attri == 20 || query_type == 20) {
qDebug() << "query font family succeed";
loadFont(reply->readAll());
}
QMessageBox msgBox; }
msgBox.setText("Can not load font file!" + reply->errorString()); else {
msgBox.exec();
reply->deleteLater(); QMessageBox msgBox;
msgBox.setText("Can not load font file!" + reply->errorString());
msgBox.exec();
reply->deleteLater();
return ; return;
} }
} }
void NameCreater::OnFontComboBoxTextChanged(const QString& str) void NameCreater::OnFontComboBoxTextChanged(const QString& str)
{ {
QComboBox* sender = (QComboBox*)QObject::sender(); QComboBox* sender = (QComboBox*)QObject::sender();
QString u = sender->currentData().toString(); QString u = sender->currentData().toString();
query(QUrl(u)); query_type = 20;
query(QUrl(u),20);
} }
void NameCreater::OnFontComboBoxIndexChanged(int idx) void NameCreater::OnFontComboBoxIndexChanged(int idx)
{ {
QComboBox* sender = (QComboBox*)QObject::sender(); QComboBox* sender = (QComboBox*)QObject::sender();
QString u = sender->currentData().toString(); QString u = sender->currentData().toString();
query(QUrl(u)); query_type = 20;
query(QUrl(u),20);
} }

4
NameCreater/NameCreater.h
View File

@ -24,7 +24,9 @@ private:
QColor font_color; QColor font_color;
QNetworkAccessManager network_mgr; QNetworkAccessManager network_mgr;
void query(const QUrl& url); int query_type;
void query(const QUrl& url, int type = -1);
void loadFont(const QByteArray& fontdata); void loadFont(const QByteArray& fontdata);
void execCreater(QObject*sender, const QString&fileName, const QByteArray &fileContent); void execCreater(QObject*sender, const QString&fileName, const QByteArray &fileContent);

187
NameCreater/NameCreater.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 14.0.1, 2024-09-27T09:47:08. --> <!-- Written by QtCreator 14.0.1, 2024-09-27T11:41:02. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -96,16 +96,16 @@
<variable>ProjectExplorer.Project.Target.0</variable> <variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="DeviceType">WebAssemblyDeviceType</value> <value type="QString" key="DeviceType">WebAssemblyDeviceType</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QwbAssembly Qt 5.15.2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">WebAssembly Qt 6.7.2 (single-threaded)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QwbAssembly Qt 5.15.2</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">WebAssembly Qt 6.7.2 (single-threaded)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{7751e2ea-88c1-4df7-b6c4-78f8275796e2}</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.672.wasm_singlethread_kit</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">-1</value> <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">-1</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value> <value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -143,8 +143,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap> </valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -180,12 +180,11 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap> </valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value> <value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">device://WebAssembly DeviceC:/dev/namecreater/NameCreater/build/WebAssembly_Qt_6_7_2_single_threaded-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -221,7 +220,6 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value> <value type="int" key="SeparateDebugInfo">0</value>
</valuemap> </valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value> <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
@ -233,14 +231,16 @@
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value> <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
<valuelist type="QVariantList" key="CustomOutputParsers"/> <valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
<value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value> <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">NameCreater</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">WebAssembly.RunConfiguration.EmrunC:/dev/namecreater/NameCreater/NameCreater.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/dev/namecreater/NameCreater/NameCreater.pro</value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value> <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="WASM.WebBrowserSelectionAspect.Browser">chrome</value>
</valuemap> </valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>
@ -583,6 +583,159 @@
</data> </data>
<data> <data>
<variable>ProjectExplorer.Project.Target.3</variable> <variable>ProjectExplorer.Project.Target.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">WebAssemblyDeviceType</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QwbAssembly Qt 5.15.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QwbAssembly Qt 5.15.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{7751e2ea-88c1-4df7-b6c4-78f8275796e2}</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">-1</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\dev\namecreater\NameCreater\build\QwbAssembly_Qt_5_15_2-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/dev/namecreater/NameCreater/build/QwbAssembly_Qt_5_15_2-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">NameCreater</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">WebAssembly.RunConfiguration.EmrunC:/dev/namecreater/NameCreater/NameCreater.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/dev/namecreater/NameCreater/NameCreater.pro</value>
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="WASM.WebBrowserSelectionAspect.Browser">chrome</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.4</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value> <value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value>
@ -745,7 +898,7 @@
</data> </data>
<data> <data>
<variable>ProjectExplorer.Project.TargetCount</variable> <variable>ProjectExplorer.Project.TargetCount</variable>
<value type="qlonglong">4</value> <value type="qlonglong">5</value>
</data> </data>
<data> <data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable> <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

2
NameCreater/def.h
View File

@ -1,7 +1,7 @@
#ifndef DEF_H #ifndef DEF_H
#define DEF_H #define DEF_H
#define VERSION "v2.8.1" #define VERSION "v2.9.0"