kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-08-06 21:34:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into qt6_cmake_joshua

Browse Source
This commit is contained in:
joshua
2026-07-31 21:15:21 +02:00
parent f16cf7dac8
commit e6d29cf345
297 changed files with 82691 additions and 27463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/factory/ui/addtabledialog.cpp
+8 -6
View File
@@ -221,12 +221,12 @@ void AddTableDialog::saveConfig()
header_object.insert("margins", QETUtils::marginsToString(this->headerMargins()));
auto me = QMetaEnum::fromType<Qt::Alignment>();
header_object.insert("alignment", me.valueToKey(int(this->headerAlignment())));
header_object.insert("font", this->headerFont().toString());
header_object.insert("font", QETUtils::fontToString(this->headerFont()));
QJsonObject table_object;
table_object.insert("margins", QETUtils::marginsToString(this->tableMargins()));
table_object.insert("alignment", me.valueToKey(int(this->tableAlignment())));
table_object.insert("font", this->tableFont().toString());
table_object.insert("font", QETUtils::fontToString(this->tableFont()));
QJsonObject config_object;
config_object.insert("header", header_object);
@@ -268,13 +268,14 @@ void AddTableDialog::loadConfig()
case Qt::AlignLeft :
ui->m_header_alignment_cb->setCurrentIndex(0);
break;
case Qt::AlignCenter :
case Qt::AlignHCenter :
case Qt::AlignCenter : // accept AlignCenter in case it was hand-edited by the user
ui->m_header_alignment_cb->setCurrentIndex(1);
break;
default:
ui->m_header_alignment_cb->setCurrentIndex(2);
}
m_header_font.fromString(header_object.value("font").toString());
QETUtils::fontFromString(m_header_font, header_object.value("font").toString());
ui->m_header_font_pb->setText(m_header_font.family());
//Table
@@ -284,13 +285,14 @@ void AddTableDialog::loadConfig()
case Qt::AlignLeft :
ui->m_table_alignment_cb->setCurrentIndex(0);
break;
case Qt::AlignCenter :
case Qt::AlignHCenter :
case Qt::AlignCenter : // accept AlignCenter in case it was hand-edited by the user
ui->m_table_alignment_cb->setCurrentIndex(1);
break;
default:
ui->m_table_alignment_cb->setCurrentIndex(2);
}
m_table_font.fromString(table_object.value("font").toString());
QETUtils::fontFromString(m_table_font, table_object.value("font").toString());
ui->m_table_font_pb->setText(m_table_font.family());
}