diff --git a/src/Gui/AboutApplication.ui b/src/Gui/AboutApplication.ui index d3f530546cc1..d866efcc921d 100644 --- a/src/Gui/AboutApplication.ui +++ b/src/Gui/AboutApplication.ui @@ -88,7 +88,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; text-decoration: underline; color:#0000ff;"> Unknown Application (c) Unknown Author</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600; text-decoration: underline; color:#0000ff;"> Unknown Application (c) Unknown Author</span></p></body></html> @@ -125,7 +125,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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> @@ -139,14 +139,14 @@ - <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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - <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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> @@ -160,7 +160,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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> @@ -181,14 +181,14 @@ - <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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> - <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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> @@ -209,7 +209,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;">Unknown</span></p></body></html> + <html><head/><body><p><span style=" font-family: MS Shell Dlg 2; font-weight:600;">Unknown</span></p></body></html> diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index bf207b38ead1..363b28c34fa0 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -280,6 +280,16 @@ static QString getOperatingSystem() void AboutDialog::setupLabels() { + //fonts are rendered smaller on Mac so point size can't be the same for all platforms + int fontSize = 8; +#ifdef Q_OS_MAC + fontSize = 11; +#endif + //avoid overriding user set style sheet + if (qApp->styleSheet().isEmpty()) { + setStyleSheet(QString::fromAscii("Gui--Dialog--AboutDialog QLabel {font-size: %1pt;}").arg(fontSize)); + } + QString exeName = qApp->applicationName(); std::map& config = App::Application::Config(); std::map::iterator it; @@ -317,7 +327,7 @@ void AboutDialog::setupLabels() platform.replace(QString::fromAscii("Unknown"), QString::fromAscii("%1-bit").arg(QSysInfo::WordSize)); ui->labelBuildPlatform->setText(platform); - + // branch name it = config.find("BuildRevisionBranch"); if (it != config.end()) {