diff options
| -rw-r--r-- | doc/contributor_copyright.txt | 6 | ||||
| -rw-r--r-- | icons/flattr.png | bin | 0 -> 1639 bytes | |||
| -rw-r--r-- | openscad.pro | 2 | ||||
| -rw-r--r-- | openscad.qrc | 1 | ||||
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 5 | ||||
| -rw-r--r-- | src/AboutDialog.h | 18 | ||||
| -rw-r--r-- | src/AboutDialog.ui | 107 | ||||
| -rw-r--r-- | src/mainwin.cc | 5 | ||||
| -rw-r--r-- | src/version_check.h | 1 | ||||
| -rwxr-xr-x | tests/test_pretty_print.py | 18 |
10 files changed, 147 insertions, 16 deletions
diff --git a/doc/contributor_copyright.txt b/doc/contributor_copyright.txt new file mode 100644 index 0000000..c916fe4 --- /dev/null +++ b/doc/contributor_copyright.txt @@ -0,0 +1,6 @@ +WE the undersigned contributors, grant perpetual license for the +original authors of OpenSCAD, Marius Kintel and Clifford Wolf, to +change the license under which the code we have contributed to OpenSCAD is +released, in future versions of OpenSCAD. + +Don Bright <hugh.m.bright@gmail.com> 2012 diff --git a/icons/flattr.png b/icons/flattr.png Binary files differnew file mode 100644 index 0000000..1105305 --- /dev/null +++ b/icons/flattr.png diff --git a/openscad.pro b/openscad.pro index 3dfd1c5..f11a494 100644 --- a/openscad.pro +++ b/openscad.pro @@ -154,6 +154,7 @@ RESOURCES = openscad.qrc FORMS += src/MainWindow.ui \ src/Preferences.ui \ src/OpenCSGWarningDialog.ui \ + src/AboutDialog.ui \ src/ProgressWidget.ui HEADERS += src/version_check.h \ @@ -168,6 +169,7 @@ HEADERS += src/version_check.h \ src/MainWindow.h \ src/Preferences.h \ src/OpenCSGWarningDialog.h \ + src/AboutDialog.h \ src/builtin.h \ src/context.h \ src/csgterm.h \ diff --git a/openscad.qrc b/openscad.qrc index 73639ce..beee19a 100644 --- a/openscad.qrc +++ b/openscad.qrc @@ -4,5 +4,6 @@ <file>icons/prefsAdvanced.png</file> <file>icons/prefs3DView.png</file> <file>icons/prefsEditor.png</file> + <file>icons/flattr.png</file> </qresource> </RCC> diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 5339de1..aee423c 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -1,4 +1,9 @@ #!/bin/sh -e + +# test_pretty_print copyright 2012 don bright. released under the GPL 2, or +# later, as described in the file named 'COPYING' in OpenSCAD's project root. +# permission to change this license is given to Marius Kintel & Clifford Wolf + # # This script builds all library dependencies of OpenSCAD for Linux # diff --git a/src/AboutDialog.h b/src/AboutDialog.h new file mode 100644 index 0000000..529d8b4 --- /dev/null +++ b/src/AboutDialog.h @@ -0,0 +1,18 @@ +#ifndef ABOUTDIALOG_H_ +#define ABOUTDIALOG_H_ + +#include "ui_AboutDialog.h" + +class AboutDialog : public QDialog, public Ui::AboutDialog +{ + Q_OBJECT; +public: + AboutDialog(QWidget *parent) { + setupUi(this); + this->aboutText->setOpenExternalLinks(true); + QUrl flattr_qurl(":icons/flattr.png" ); + this->aboutText->loadResource( QTextDocument::ImageResource, flattr_qurl ); + } +}; + +#endif diff --git a/src/AboutDialog.ui b/src/AboutDialog.ui new file mode 100644 index 0000000..93f1401 --- /dev/null +++ b/src/AboutDialog.ui @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>AboutDialog</class> + <widget class="QDialog" name="AboutDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>567</width> + <height>359</height> + </rect> + </property> + <property name="windowTitle"> + <string>About OpenSCAD</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTextBrowser" name="aboutText"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="html"> + <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:'Ubuntu'; font-size:11pt; 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;"><a href="https://flattr.com/submit/auto?user_id=openscad&amp;url=http://openscad.org&amp;title=OpenSCAD&amp;language=&amp;tags=github&amp;category=software"><img src=":icons/flattr.png" /></a></p> +<p align="right" 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> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openscad.org"><span style=" text-decoration: underline; color:#0000ff;">OpenSCAD</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> is Copyright (C) 2009-2011 </span><a href="https://github.com/kintel"><span style=" text-decoration: underline; color:#0000ff;">Marius Kintel </span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> &lt;marius@kintel.net&gt; and </span><a href="http://clifford.at"><span style=" text-decoration: underline; color:#0000ff;">Clifford Wolf</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> &lt;clifford@clifford.at&gt;</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:10pt;"><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:10pt; font-weight:600;">License</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:10pt; font-weight:600;"><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:10pt;">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</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:10pt;"><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:10pt;">Please visit this link for a copy of the license: </span><a href="http://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL 2.0</span></a></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:10pt;"><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:10pt; font-weight:600;">Tools &amp; Libraries used</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:10pt; font-weight:600;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gmplib.org/"><span style=" text-decoration: underline; color:#0000ff;">GNU GMP</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.mpfr.org/"><span style=" text-decoration: underline; color:#0000ff;">GNU MPFR</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.cgal.org"><span style=" text-decoration: underline; color:#0000ff;">CGAL</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://eigen.tuxfamily.org"><span style=" text-decoration: underline; color:#0000ff;">Eigen2</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.opencsg.org"><span style=" text-decoration: underline; color:#0000ff;">OpenCSG</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.opengl.org/"><span style=" text-decoration: underline; color:#0000ff;">OpenGL</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://glew.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">GLEW</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://qt.nokia.com"><span style=" text-decoration: underline; color:#0000ff;">Qt Toolkit</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.boost.org"><span style=" text-decoration: underline; color:#0000ff;">Boost</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gnu.org/software/bison/"><span style=" text-decoration: underline; color:#0000ff;">Bison</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://flex.sourceforge.net/"><span style=" text-decoration: underline; color:#0000ff;">Flex</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.cmake.org"><span style=" text-decoration: underline; color:#0000ff;">CMake</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://lodev.org/lodepng/"><span style=" text-decoration: underline; color:#0000ff;">LodePNG</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.mingw.org/"><span style=" text-decoration: underline; color:#0000ff;">MingW</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.mxe.cc"><span style=" text-decoration: underline; color:#0000ff;">MXE</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.linux.org"><span style=" text-decoration: underline; color:#0000ff;">Linux</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.apple.com/osx/"><span style=" text-decoration: underline; color:#0000ff;">Mac OSX</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.stroustrup.com/C++.html"><span style=" text-decoration: underline; color:#0000ff;">C++</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600;">, </span><a href="http://gcc.gnu.org/"><span style=" text-decoration: underline; color:#0000ff;">GCC</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600;">, </span><a href="http://clang.llvm.org/"><span style=" text-decoration: underline; color:#0000ff;">clang</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.python.org"><span style=" text-decoration: underline; color:#0000ff;">python</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nsis.sourceforge.net/Main_Page"><span style=" text-decoration: underline; color:#0000ff;">Nullsoft installer</span></a></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; text-decoration: underline; color:#0000ff;"><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:10pt; font-weight:600;">Acknowledgements</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:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.github.com/openscad"><span style=" text-decoration: underline; color:#0000ff;">OpenSCAD Github Project</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> members (public):</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;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/kintel"><span style=" text-decoration: underline; color:#0000ff;">Marius Kintel </span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://clifford.at"><span style=" text-decoration: underline; color:#0000ff;">Clifford Wolf</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.github.com/GilesBathgate"><span style=" text-decoration: underline; color:#0000ff;">Giles Bathgate</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/brad"><span style=" text-decoration: underline; color:#0000ff;">Brad Pitcher</span></a></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; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.debian.org"><span style=" text-decoration: underline; color:#0000ff;">Debian </span></a>maintainer:</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; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://christian.amsuess.com/"><span style=" text-decoration: underline; color:#0000ff;">Christian M. Amsüss</span></a></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; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Patches:</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;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/meta23"><span style=" text-decoration: underline; color:#0000ff;">meta23</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/jasonblewis"><span style=" text-decoration: underline; color:#0000ff;">jasonblewis</span></a> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/gregjurman"><span style=" text-decoration: underline; color:#0000ff;">gregjurman</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/brianolson"><span style=" text-decoration: underline; color:#0000ff;">brianolson</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/tjhowse"><span style=" text-decoration: underline; color:#0000ff;">tjhowse</span></a> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/logxen"><span style=" text-decoration: underline; color:#0000ff;">logxen</span></a> (Mark A Cooper)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/iamwilhelm"><span style=" text-decoration: underline; color:#0000ff;">iamwilhelm</span></a> (Wil Chung)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/clothbot"><span style=" text-decoration: underline; color:#0000ff;">clothbot</span></a> (Andrew Plumb)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/colah"><span style=" text-decoration: underline; color:#0000ff;">colah</span></a> (Christopher Olah)</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline; color:#0000ff;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Bug reports:</p> +<p style=" 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 style=" font-family:'Lucida Grande'; font-size:10pt;">nop head, Triffid Hunter, Len Trigg, </span>Kliment Yanev, Christian Siefkes, Whosawhatsis, MichaelAtOz, mrhdias, ibyte8bits, Koen Kooi, Tomas Mudrunka, knuds, cadr, mshearn, Hans L, Brett Sutton, hmnapier, Eero af Heurlin, caliston, 5263, ghost, 42loop, uniqx, Michael Thomson, Michael Ivko, Pierre Doucet, myglc2, Alan Cox, Peter Falke, Michael Ambrus, Gordon Wrigley, Ed Nisley, Stony Smith, Pasca Andrei, David Goodenough, William A Adams ... and many others</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-style:italic;"><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:10pt; font-weight:600;">Hosting &amp; resources</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:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.github.com"><span style=" text-decoration: underline; color:#0000ff;">Github</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> source repository</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;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://rocklinux.net/pipermail/openscad/"><span style=" text-decoration: underline; color:#0000ff;">Rock Linux</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> mailing list</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; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.thingiverse.com"><span style=" text-decoration: underline; color:#0000ff;">Thingiverse</span></a></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:10pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://guerby.org/"><span style=" text-decoration: underline; color:#0000ff;">Laurent Guerby</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> and the </span><a href="http://gcc.gnu.org/wiki/CompileFarm"><span style=" text-decoration: underline; color:#0000ff;">GCC Compile Farm,</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> with </span><a href="http://osuosl.org/"><span style=" text-decoration: underline; color:#0000ff;">OSUOSL,</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> </span><a href="http://www.ibm.com"><span style=" text-decoration: underline; color:#0000ff;">IBM</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;">, </span><a href="http://www.irill.org"><span style=" text-decoration: underline; color:#0000ff;">IRILL,</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> </span><a href="http://www.intel.com"><span style=" text-decoration: underline; color:#0000ff;">Intel</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;">, </span><a href="http://www.fsffrance.org"><span style=" text-decoration: underline; color:#0000ff;">FSF France,</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> and </span><a href="http://www.amd.com"><span style=" text-decoration: underline; color:#0000ff;">AMD</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;">.</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:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Apologies to anyone accidentally left out. </p></body></html></string> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/mainwin.cc b/src/mainwin.cc index 3fdee6b..dc738d7 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -39,6 +39,7 @@ #include "builtin.h" #include "progress.h" #include "dxfdim.h" +#include "AboutDialog.h" #ifdef ENABLE_OPENCSG #include "CSGTermEvaluator.h" #include "OpenCSGRenderer.h" @@ -1735,7 +1736,9 @@ void MainWindow::helpAbout() { qApp->setWindowIcon(QApplication::windowIcon()); - QMessageBox::information(this, "About OpenSCAD", QString(helptitle) + QString(copyrighttext)); + AboutDialog *dialog = new AboutDialog(this); + dialog->exec(); + //QMessageBox::information(this, "About OpenSCAD", QString(helptitle) + QString(copyrighttext)); } void diff --git a/src/version_check.h b/src/version_check.h index 16a54a2..a9556e9 100644 --- a/src/version_check.h +++ b/src/version_check.h @@ -1,5 +1,6 @@ // version_check.h copyright 2012 don bright. released under the GPL 2, or // later, as described in the file named 'COPYING' in OpenSCAD's project root. +// permission to change this license is given to Marius Kintel & Clifford Wolf /* This file will check versions of libraries at compile time. If they are too old, the user will be warned. If the user wishes to force diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py index 5e25052..8c57f1c 100755 --- a/tests/test_pretty_print.py +++ b/tests/test_pretty_print.py @@ -1,20 +1,8 @@ #!/usr/bin/python -# Copyright (C) 2011 Don Bright <hugh.m.bright@gmail.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# test_pretty_print copyright 2012 don bright. released under the GPL 2, or +# later, as described in the file named 'COPYING' in OpenSCAD's project root. +# permission to change this license is given to Marius Kintel & Clifford Wolf # # This program 'pretty prints' the ctest output, namely |
