From 7d4bb806ad8a19557fdf4a87609b4b4da1571b64 Mon Sep 17 00:00:00 2001
From: Chris Hennes
Date: Mon, 7 Nov 2022 16:07:50 -0600
Subject: [PATCH] GUI: Remove references to MS Shell DLG2 font
---
src/Gui/AboutApplication.ui | 14 +++++++-------
src/Gui/DlgToolbars.ui | 2 +-
src/Gui/DlgWorkbenches.ui | 2 +-
src/Gui/PreferencePackTemplates/Editor_Font.cfg | 2 +-
src/Gui/Splashscreen.cpp | 4 ++--
src/Mod/Mesh/Gui/DlgSettingsImportExport.ui | 2 +-
src/Mod/Mesh/Gui/DlgSettingsMeshView.ui | 4 ++--
src/Mod/Part/Gui/DlgSettings3DViewPart.ui | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/Gui/AboutApplication.ui b/src/Gui/AboutApplication.ui
index dc8efad099..93ed8714f2 100644
--- a/src/Gui/AboutApplication.ui
+++ b/src/Gui/AboutApplication.ui
@@ -125,7 +125,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
@@ -139,7 +139,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
@@ -153,7 +153,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style=" font-weight:600;">Unknown</span></p></body></html>
@@ -167,7 +167,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
@@ -181,7 +181,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
@@ -195,7 +195,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
@@ -209,7 +209,7 @@
-
- <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html>
+ <html><head/><body><p><span style="font-weight:600;">Unknown</span></p></body></html>
diff --git a/src/Gui/DlgToolbars.ui b/src/Gui/DlgToolbars.ui
index 13a8777974..c3c122701f 100644
--- a/src/Gui/DlgToolbars.ui
+++ b/src/Gui/DlgToolbars.ui
@@ -267,7 +267,7 @@
-
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html>
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html>
diff --git a/src/Gui/DlgWorkbenches.ui b/src/Gui/DlgWorkbenches.ui
index 9fc1d72982..328f7d9fa3 100644
--- a/src/Gui/DlgWorkbenches.ui
+++ b/src/Gui/DlgWorkbenches.ui
@@ -269,7 +269,7 @@
-
- <html><head/><body><p><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600;">Note:</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> The changes become active the next time you start the application</span></p></body></html>
+ <html><head/><body><p><span style=" font-size:8pt; font-weight:600;">Note:</span><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> The changes become active the next time you start the application</span></p></body></html>
diff --git a/src/Gui/PreferencePackTemplates/Editor_Font.cfg b/src/Gui/PreferencePackTemplates/Editor_Font.cfg
index 445b017576..a0ec5481fd 100644
--- a/src/Gui/PreferencePackTemplates/Editor_Font.cfg
+++ b/src/Gui/PreferencePackTemplates/Editor_Font.cfg
@@ -5,7 +5,7 @@
- MS Shell Dlg 2
+ Courier
diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp
index 86b319f9b3..f0baa1a54c 100644
--- a/src/Gui/Splashscreen.cpp
+++ b/src/Gui/Splashscreen.cpp
@@ -328,7 +328,7 @@ void AboutDialog::setupLabels()
ui->labelAuthor->setUrl(mturl);
if (qApp->styleSheet().isEmpty()) {
- ui->labelAuthor->setStyleSheet(QString::fromLatin1("Gui--UrlLabel {color: #0000FF;text-decoration: underline;font-weight: 600;font-family: MS Shell Dlg 2;}"));
+ ui->labelAuthor->setStyleSheet(QString::fromLatin1("Gui--UrlLabel {color: #0000FF;text-decoration: underline;font-weight: 600;}"));
}
QString version = ui->labelBuildVersion->text();
@@ -669,7 +669,7 @@ void AboutDialog::showLibraryInformation()
"proprietary rights belong to their respective owners:");
QString html;
QTextStream out(&html);
- out << "
"
+ out << ""
<< "" << msg << "
\n\n";
for (QList::iterator it = libInfo.begin(); it != libInfo.end(); ++it) {
out << "" << it->name << " " << it->version << "
"
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
index 4ef9128154..d5af012028 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
@@ -28,7 +28,7 @@
Deviation of tessellation to the actual surface
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Tessellation</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-weight:600;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.</span></p></body></html>
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Tessellation</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-weight:600;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.</span></p></body></html>
Maximum mesh deviation
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui b/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
index a3710e081c..52968279b5 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
@@ -353,7 +353,7 @@ to a smoother appearance.
-
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">This is the smallest angle between two faces where normals get calculated to do flat shading.</p><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.</p></body></html>
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">This is the smallest angle between two faces where normals get calculated to do flat shading.</p><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.</p></body></html>
Crease angle
@@ -401,7 +401,7 @@ to a smoother appearance.
-
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Hint</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">Defining the normals per vertex is also called <span style=" font-style:italic;">Phong shading</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-style:italic;"><span style=" font-style:normal;">while defining the normals per face is called </span>Flat shading<span style=" font-style:normal;">.</span></p></body></html>
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Hint</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">Defining the normals per vertex is also called <span style=" font-style:italic;">Phong shading</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-style:italic;"><span style=" font-style:normal;">while defining the normals per face is called </span>Flat shading<span style=" font-style:normal;">.</span></p></body></html>
diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPart.ui b/src/Mod/Part/Gui/DlgSettings3DViewPart.ui
index 7fc7e75f69..09361d1322 100644
--- a/src/Mod/Part/Gui/DlgSettings3DViewPart.ui
+++ b/src/Mod/Part/Gui/DlgSettings3DViewPart.ui
@@ -46,7 +46,7 @@
Defines the deviation of tessellation to the actual surface
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Tessellation</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-weight:600;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.</span></p></body></html>
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Tessellation</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-weight:600;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.</span></p></body></html>
Maximum deviation depending on the model bounding box