diff options
author | Kai Koehne <kai.koehne@digia.com> | 2014-09-03 16:29:30 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2014-09-04 13:01:05 +0200 |
commit | 8a9723d7420829a2ba0141a9f7d8dc8cd11d8331 (patch) | |
tree | 89981a9b53b657d13d5bd5df7fa47273d2d1f743 | |
parent | 6ab7be33cab68347a2f7ec8902b6d7a0917f7709 (diff) | |
download | qt3d-master.tar.gz |
Style About dialog similar to the other toolsmaster
Don't use hard-coded fonts or sizes. Also rename button from "Ok" to
"Close", and make the dialog non-resizable.
Change-Id: Iec3b79a9bbc2098c12223ac25786fe9804155806
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | tools/qt3d/qglinfo/aboutdialog.ui | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/tools/qt3d/qglinfo/aboutdialog.ui b/tools/qt3d/qglinfo/aboutdialog.ui index f36b4bfed..b6920cf97 100644 --- a/tools/qt3d/qglinfo/aboutdialog.ui +++ b/tools/qt3d/qglinfo/aboutdialog.ui @@ -6,16 +6,25 @@ <rect> <x>0</x> <y>0</y> - <width>375</width> - <height>456</height> + <width>340</width> + <height>266</height> </rect> </property> <property name="windowTitle"> <string>About</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetFixedSize</enum> + </property> <item> <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="maximumSize"> <size> <width>400</width> @@ -24,16 +33,13 @@ </property> <property name="text"> <string><!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:8pt; 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-family:'Lucida Grande'; font-size:20pt;">QGL Info Tool</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:'Lucida Grande'; font-size:20pt;"><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:'Lucida Grande'; font-size:12pt;">Copyright (C) 2014 Digia Corporation and/or its subsidiary(-ies).</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:'Lucida Grande'; font-size:14pt;"><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:'Lucida Grande'; font-size:12pt;">Qt3D gratefully acknowledges the</span><span style=" font-family:'Lucida Grande'; font-size:14pt;"> </span><a href="http://assimp.sourceforge.net/"><span style=" font-family:'Lucida Grande'; font-size:13pt; text-decoration: underline; color:#0000ff;">The Open Asset Importer Library</span></a><span style=" font-family:'Lucida Grande'; font-size:14pt;"> </span><span style=" font-family:'Lucida Grande'; font-size:12pt;">project (AssImp) which provides all 3D asset file loading in the Qt3D project. Qt3D ships with AssImp which in turn includes code from Info-ZIP (by Mark Adler et al), PStdInt (by Paul Hsieh), PicoModel (by Randy Reddig &amp; seaw0lf).</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:'Lucida Grande'; font-size:12pt;"><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:'Lucida Grande'; font-size:12pt;">See the file licensing.html in your documentation package or </span><a href="http://doc-snapshot.qt-project.org/qt3d-1.0/licensing.html"><span style=" font-family:'Lucida Grande'; font-size:13pt; text-decoration: underline; color:#0000ff;">on-line</span></a><span style=" font-family:'Lucida Grande'; font-size:12pt;"> for further details.</span></p></body></html></string> +<html> +<head><meta name="qrichtext" content="1" /></head> +<h3>QGL Info Tool</h3> +<p>Copyright (C) 2014 Digia Corporation and/or its subsidiary(-ies).</p> +<p>Qt3D gratefully acknowledges the <a href="http://assimp.sourceforge.net/">The Open Asset Importer Library</a> project (AssImp) which provides all 3D asset file loading in the Qt3D project. Qt3D ships with AssImp which in turn includes code from Info-ZIP (by Mark Adler et al), PStdInt (by Paul Hsieh), PicoModel (by Randy Reddig &amp; seaw0lf).</p> +<p>See the file licensing.html in your documentation package or <a href="http://doc-snapshot.qt-project.org/qt3d-1.0/licensing.html">on-line</a> for further details.</p> +</body></html></string> </property> <property name="wordWrap"> <bool>true</bool> @@ -54,11 +60,28 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <widget class="QPushButton" name="pushButton"> - <property name="text"> - <string>Ok</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>&Close</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> |