@elevatormind:
elevatormind wrote:It should definitely be the default font in QET as you say though, otherwise people will probably not use it.
Based on your “liberation-fonts” branch including osifont, I have implemented the setting of the default font to "Liberation Sans, 9, Regular"in QET.
As I believe this is inseparable from each other, I am providing the patch here for you to integrate it.
diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp
--- a/sources/qetapp.cpp 2025-03-13 22:43:33.000000000 +0100
+++ b/sources/qetapp.cpp 2025-03-14 16:41:05.253397571 +0100
@@ -1236,7 +1236,7 @@
/**
@brief QETApp::diagramTextsFont
The font to use
- By default the font is "sans Serif" and size 9.
+ By default the font is "Liberation Sans" and size 9.
@param size : the size of font
@return the font to use
*/
@@ -1246,7 +1246,7 @@
//Font to use
QString diagram_texts_family = settings.value("diagramfont",
- "Sans Serif").toString();
+ "Liberation Sans").toString();
qreal diagram_texts_size = settings.value("diagramsize",
9.0).toDouble();
@@ -1272,14 +1272,14 @@
//Font to use
QString diagram_texts_item_family = settings.value("diagramitemfont",
- "Sans Serif").toString();
+ "Liberation Sans").toString();
qreal diagram_texts_item_size = settings.value("diagramitemsize",
9.0).toDouble();
auto diagram_texts_item_weight =
static_cast<QFont::Weight>(
settings.value("diagramitemweight", QFont::Normal).toInt());
QString diagram_texts_item_style = settings.value("diagramitemstyle",
- "normal").toString();
+ "Regular").toString();
if (size != -1.0) {
diagram_texts_item_size = size;
diff -r -u a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp
--- a/sources/ui/configpage/generalconfigurationpage.cpp 2025-03-13 22:43:33.000000000 +0100
+++ b/sources/ui/configpage/generalconfigurationpage.cpp 2025-03-14 17:26:10.217643923 +0100
@@ -86,13 +86,11 @@
ui->m_border_0->setChecked(settings.value("border-columns_0", false).toBool());
ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt());
- QString fontInfos = settings.value("diagramitemfont").toString() + " " +
- settings.value("diagramitemsize").toString() + " (" +
- settings.value("diagramitemstyle").toString() + ")";
+ QString fontInfos = settings.value("diagramitemfont", "Liberation Sans").toString() + " " +
+ settings.value("diagramitemsize", "9").toString() + " (" +
+ settings.value("diagramitemstyle", "Regular").toString() + ")";
ui->m_font_pb->setText(fontInfos);
-
-
//Dynamic element text item
ui->m_dyn_text_rotation_sb->setValue(settings.value("diagrameditor/dynamic_text_rotation", 0).toInt());
@@ -106,7 +104,7 @@
QString::number(font.pointSize()) + " (" +
font.styleName() + ")";
ui->m_dyn_text_font_pb->setText(fontInfos);
- }
+ } else { ui->m_dyn_text_font_pb->setText("Liberation Sans 9 (Regular)"); }
//Independent text item
ui->m_indi_text_rotation_sb->setValue(settings.value("diagrameditor/independent_text_rotation",0).toInt());
@@ -119,7 +117,7 @@
QString::number(font.pointSize()) + " (" +
font.styleName() + ")";
ui->m_indi_text_font_pb->setText(fontInfos);
- }
+ } else { ui->m_indi_text_font_pb->setText("Liberation Sans 9 (Regular)"); }
ui->m_highlight_integrated_elements->setChecked(settings.value("diagrameditor/highlight-integrated-elements", true).toBool());
ui->m_default_elements_info->setPlainText(settings.value("elementeditor/default-informations", "").toString());
@@ -399,7 +397,9 @@
{
bool ok;
QSettings settings;
- QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this);
+ QString currentFont = settings.value("diagramitemfont", "Liberation Sans").toString();
+ int currentPointSize = settings.value("diagramitemsize", "9").toInt();
+ QFont font = QFontDialog::getFont(&ok, QFont(currentFont, currentPointSize), this);
if (ok)
{
settings.setValue("diagramitemfont", font.family());
@@ -421,7 +421,9 @@
{
bool ok;
QSettings settings;
- QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this);
+ QFont curFont;
+ curFont.fromString(settings.value("diagrameditor/dynamic_text_font", "Liberation Sans,9,-1,5,50,0,0,0,0,0,Regular").toString());
+ QFont font = QFontDialog::getFont(&ok, QFont(curFont.family(), curFont.pointSize()), this);
if (ok)
{
settings.setValue("diagrameditor/dynamic_text_font", font.toString());
@@ -510,7 +512,9 @@
{
bool ok;
QSettings settings;
- QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this);
+ QFont curFont;
+ curFont.fromString(settings.value("diagrameditor/independent_text_font", "Liberation Sans,9,-1,5,50,0,0,0,0,0,Regular").toString());
+ QFont font = QFontDialog::getFont(&ok, QFont(curFont.family(), curFont.pointSize()), this);
if (ok)
{
settings.setValue("diagrameditor/independent_text_font", font.toString());
At the same time, this also corrects an unattractive feature: When setting the font, the font dialog did not scroll to the current font, but always displayed the default font.
EDIT:
About the licenses: Do you think it is possible to have only one "tab" for all licenses?
The QET-License should of course be the first to display, but I like the idea with the combobox to choose others to view.
EDIT again:
Already have a solution for only having one license tab in about-dialog.
Just waiting for your PR for including the fonts, elevatormind,
Fragen zu QET gehören in dieses Forum und werden nicht per PM beantwortet! – Questions regarding QET belong in this forum and will NOT be answered via PM! – Les questions concernant QET doivent être posées sur ce forum et ne seront pas traitées par MP !