From 7bf37d25fc6c0424d72482922dd6b6d6d572c589 Mon Sep 17 00:00:00 2001 From: Doug Brown Date: Sat, 26 May 2012 14:41:31 -0700 Subject: [PATCH] Fixed font size issues on Mac OS X (hopefully) I manually removed any font-size styles in the about box. Unfortunately, Qt Creator automatically puts them in, so this might be an ongoing pain in the ass to deal with. Hopefully I won't ever have to change anything on that screen. Anyway, as long as the sizes are left out, Qt defaults to using whatever the system font is, which is the appropriate font for that screen. --- aboutbox.ui | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/aboutbox.ui b/aboutbox.ui index 360ac5e..80a1d33 100644 --- a/aboutbox.ui +++ b/aboutbox.ui @@ -59,7 +59,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" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">See <a href="http://68kmla.org/forums/viewtopic.php?f=29&amp;t=16544"><span style=" text-decoration: underline; color:#0000ff;">http://68kmla.org/forums/viewtopic.php?f=29&amp;t=16544</span></a> for more information about this project and its history.</p></body></html> @@ -90,30 +90,30 @@ p, li { white-space: pre-wrap; } <!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" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This program is licensed under the terms of the </span><a href="http://www.gnu.org/licenses/gpl-2.0.html"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">GNU General Public License version 2</span></a><span style=" font-size:8pt;">. Code is available </span><a href="http://code.google.com/p/mac-rom-simm-programmer/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</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-size:8pt;"></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-size:8pt;">It also uses the following libraries:</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-size:8pt;"></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-size:8pt;">• </span><a href="http://qt.nokia.com/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">Qt</span></a><span style=" font-size:8pt;"> -- for excellent cross-platform user interface compatibility</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-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">The Qt GUI Toolkit is Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies).</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Contact: Nokia Corporation (</span><a href="qt-info@nokia.com"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">qt-info@nokia.com</span></a><span style=" font-size:8pt;">)</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Qt is licensed under the </span><a href="http://www.gnu.org/licenses/lgpl-2.1.html"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">GNU Lesser General Public License version 2.1</span></a><span style=" font-size:8pt;">.</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-size:8pt;"></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-size:8pt;">• </span><a href="http://code.google.com/p/qextserialport/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">QextSerialPort</span></a><span style=" font-size:8pt;"> -- for communication with the SIMM programmer board (note: I use a custom version of it available at </span><a href="http://code.google.com/r/doug-qextserialport-linuxnotifications/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">this location</span></a><span style=" font-size:8pt;">):</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-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2000-2003 Wayne Roth</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2004-2007 Stefan Sander</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2007 Michal Policht</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2008 Brandon Fosdick</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2009-2010 Liam Staskawicz</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © 2011 Debao Zhang</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-size:8pt;"></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-size:8pt;">• The programmer board firmware uses </span><a href="http://www.fourwalledcubicle.com/LUFA.php"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">LUFA</span></a><span style=" font-size:8pt;"> for its USB communication:</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-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Copyright © Dean Camera, 2012</span></p></body></html> +</style></head><body> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>This program is licensed under the terms of the </span><a href="http://www.gnu.org/licenses/gpl-2.0.html"><span style="text-decoration: underline; color:#0000ff;">GNU General Public License version 2</span></a><span>. Code is available </span><a href="http://code.google.com/p/mac-rom-simm-programmer/"><span style=" text-decoration: underline; color:#0000ff;">here</span></a><span>.</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; "></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>It also uses the following libraries:</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>• </span><a href="http://qt.nokia.com/"><span style=" text-decoration: underline; color:#0000ff;">Qt</span></a><span> -- for excellent cross-platform user interface compatibility</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>The Qt GUI Toolkit is Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies).</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Contact: Nokia Corporation (</span><a href="qt-info@nokia.com"><span style=" text-decoration: underline; color:#0000ff;">qt-info@nokia.com</span></a><span>)</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Qt is licensed under the </span><a href="http://www.gnu.org/licenses/lgpl-2.1.html"><span style=" text-decoration: underline; color:#0000ff;">GNU Lesser General Public License version 2.1</span></a><span>.</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>• </span><a href="http://code.google.com/p/qextserialport/"><span style=" text-decoration: underline; color:#0000ff;">QextSerialPort</span></a><span> -- for communication with the SIMM programmer board (note: I use a custom version of it available at </span><a href="http://code.google.com/r/doug-qextserialport-linuxnotifications/"><span style=" text-decoration: underline; color:#0000ff;">this location</span></a><span>):</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2000-2003 Wayne Roth</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2004-2007 Stefan Sander</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2007 Michal Policht</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2008 Brandon Fosdick</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2009-2010 Liam Staskawicz</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © 2011 Debao Zhang</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>• The programmer board firmware uses </span><a href="http://www.fourwalledcubicle.com/LUFA.php"><span style=" text-decoration: underline; color:#0000ff;">LUFA</span></a><span> for its USB communication:</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:15px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Copyright © Dean Camera, 2012</span></p></body></html> true