From 693532a8027d5224a779ddb261c20910e23c9e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lie=20Delhaie?= Date: Sun, 15 Jan 2023 21:24:29 +0100 Subject: [PATCH] Fix '-D' char on os version Windows --- src/frames/aboutdialog.cpp | 4 +++- src/frames/aboutdialog.ui | 14 +++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/frames/aboutdialog.cpp b/src/frames/aboutdialog.cpp index 084646b..998cbd1 100644 --- a/src/frames/aboutdialog.cpp +++ b/src/frames/aboutdialog.cpp @@ -7,7 +7,9 @@ AboutDialog::AboutDialog(QWidget *parent) : { ui->setupUi(this); ui->appName->setText(QString("%1 (%2)").arg(APP_NAME, APP_ARCH)); - ui->version->setText(QString("v%1 %2/%3 (qt %4)").arg(APP_VERSION, APP_OS, APP_OS_VERSION, QT_VERSION_STR)); + QString os_version = APP_OS_VERSION; + os_version = os_version.replace("-D", ""); + ui->version->setText(QString("v%1 %2/%3 (qt %4)").arg(APP_VERSION, APP_OS, os_version, QT_VERSION_STR)); ui->textEdit_2->append(QString("Qt Open Source %1").arg(QT_VERSION_STR)); } diff --git a/src/frames/aboutdialog.ui b/src/frames/aboutdialog.ui index 42c3f6d..ed824e5 100644 --- a/src/frames/aboutdialog.ui +++ b/src/frames/aboutdialog.ui @@ -77,9 +77,15 @@ TextLabel + + true + Qt::AlignCenter + + true + @@ -111,8 +117,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } -hr { height: 1px; border-width: 0; } -</style></head><body style=" font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Menlo'; font-size:13pt;">Copyright 2022 Aurélie Delhaie</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Menlo'; font-size:13pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Menlo'; font-size:13pt;">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</span></p> @@ -139,9 +144,8 @@ hr { height: 1px; border-width: 0; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } -hr { height: 1px; border-width: 0; } -</style></head><body style=" font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Noto Sans'; font-size:11pt;"><br /></p></body></html>