kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-23 02:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/qelectrotech/qelectrotech-source-mirror

Browse Source
This commit is contained in:
David Varley
2020-08-16 15:57:55 +10:00
parent ddc2afa427 5832e365e9
commit 2b396960d9
50 changed files with 36553 additions and 23392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/main.cpp
View File

@@ -109,8 +109,8 @@ void myMessageOutput(QtMsgType type,
txt+= context.function ? context.function : "";
txt+=")\n";
}
QFile outFile(QDir::homePath()
+"/.qet/"
QFile outFile(QETApp::configDir()
+"/"
+QDate::currentDate().toString("yyyyMMdd")
+".log");
if(outFile.open(QIODevice::WriteOnly | QIODevice::Append))
@@ -129,7 +129,7 @@ void myMessageOutput(QtMsgType type,
void delete_old_log_files(int days)
{
const QDate today = QDate::currentDate();
const QString path = QDir::homePath() + "/.qet/";
const QString path = QETApp::configDir() + "/";
QString filter("%1%1%1%1%1%1%1%1.log"); // pattern
filter = filter.arg("[0123456789]"); // valid characters

2
sources/qeticons.cpp
View File

@@ -194,6 +194,7 @@ namespace QET {
QIcon hr;
QIcon hu;
QIcon it;
QIcon jp;
QIcon pl;
QIcon pt;
QIcon ro;
@@ -658,6 +659,7 @@ void QET::Icons::initIcons() {
hr .addFile(":/ico/24x16/hr.png");
hu .addFile(":/ico/24x16/hu.png");
it .addFile(":/ico/24x16/it.png");
jp .addFile(":/ico/24x16/jp.png");
pl .addFile(":/ico/24x16/pl.png");
pt .addFile(":/ico/24x16/pt.png");
ro .addFile(":/ico/24x16/ro.png");

1
sources/qeticons.h
View File

@@ -202,6 +202,7 @@ namespace QET {
extern QIcon hr;
extern QIcon hu;
extern QIcon it;
extern QIcon jp;
extern QIcon pl;
extern QIcon pt;
extern QIcon ro;

2
sources/qetproject.cpp
View File

@@ -1585,6 +1585,7 @@ NamesList QETProject::namesListForIntegrationCategory() {
const QChar russian_data[24] = { 0x0418, 0x043C, 0x043F, 0x043E, 0x0440, 0x0442, 0x0438, 0x0440, 0x043E, 0x0432, 0x0430, 0x043D, 0x043D, 0x044B, 0x0435, 0x0020, 0x044D, 0x043B, 0x0435, 0x043C, 0x0435, 0x043D, 0x0442, 0x044B };
const QChar greek_data[18] = { 0x0395, 0x03b9, 0x03c3, 0x03b7, 0x03b3, 0x03bc, 0x03ad, 0x03bd, 0x03b1, 0x0020, 0x03c3, 0x03c4, 0x03bf, 0x03b9, 0x03c7, 0x03b5, 0x03af, 0x03b1 };
const QChar japanese_data[10] = { 0x30A4, 0x30F3, 0x30D0, 0x30FC, 0x30C8, 0x3055, 0x308C, 0x305F, 0x8981, 0x7D20 };
names.addName("fr", "Éléments importés");
names.addName("en", "Imported elements");
@@ -1600,6 +1601,7 @@ NamesList QETProject::namesListForIntegrationCategory() {
names.addName("hr", "Uvezeni elementi");
names.addName("ca", "Elements importats");
names.addName("ro", "Elemente importate");
names.addName("ja", QString(japanese_data, 10));
return(names);
}

1
sources/ui/configpage/generalconfigurationpage.cpp
View File

@@ -268,6 +268,7 @@ void GeneralConfigurationPage::fillLang()
ui->m_lang_cb->addItem(QET::Icons::fr, tr("Français"), "fr");
ui->m_lang_cb->addItem(QET::Icons::hr, tr("Croate"), "hr");
ui->m_lang_cb->addItem(QET::Icons::it, tr("Italien"), "it");
ui->m_lang_cb->addItem(QET::Icons::jp, tr("Japonaise"), "ja");
ui->m_lang_cb->addItem(QET::Icons::pl, tr("Polonais"), "pl");
ui->m_lang_cb->addItem(QET::Icons::pt, tr("Portugais"), "pt");
ui->m_lang_cb->addItem(QET::Icons::ro, tr("Roumains"), "ro");