Browse Source

Re-enable license window

Neal Wilson 7 years ago
parent
commit
89dc3f92bb

+ 2
- 2
src/helpmenu.cpp View File

@@ -16,12 +16,12 @@ QAction*aboutTypicaAction= new QAction(tr("About Typica"),this);
16 16
 aboutTypicaAction->setObjectName("aboutTypicaAction");
17 17
 addAction(aboutTypicaAction);
18 18
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
19
-#if 0
19
+
20 20
 QAction*licenseAction= new QAction(tr("License Information"),this);
21 21
 licenseAction->setObjectName("licenseAction");
22 22
 addAction(licenseAction);
23 23
 connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
24
-#endif
24
+
25 25
 }
26 26
 
27 27
 /*:208*//*209:*/

+ 2
- 2
src/helpmenu.w View File

@@ -52,12 +52,12 @@ HelpMenu::HelpMenu() : QMenu()
52 52
 	aboutTypicaAction->setObjectName("aboutTypicaAction");
53 53
 	addAction(aboutTypicaAction);
54 54
 	connect(aboutTypicaAction, SIGNAL(triggered()), this, SLOT(displayAboutTypica()));
55
-#if 0
55
+
56 56
 	QAction *licenseAction = new QAction(tr("License Information"), this);
57 57
 	licenseAction->setObjectName("licenseAction");
58 58
 	addAction(licenseAction);
59 59
 	connect(licenseAction, SIGNAL(triggered()), this, SLOT(displayLicenseWindow()));
60
-#endif
60
+
61 61
 }
62 62
 
63 63
 @ When "About Typica" is selected from the menu, we display an about box. This

+ 3
- 1
src/licensewindow.cpp View File

@@ -2,7 +2,7 @@
2 2
 #line 36 "./licensewindow.w"
3 3
 
4 4
 /*216:*/
5
-#line 97 "./licensewindow.w"
5
+#line 99 "./licensewindow.w"
6 6
 
7 7
 #include "licensewindow.h"
8 8
 
@@ -40,6 +40,8 @@ item= new QListWidgetItem("Tango Desktop Project",projects);
40 40
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/tango.html")));
41 41
 item= new QListWidgetItem("QextSerialPort",projects);
42 42
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextserialport.html")));
43
+item= new QListWidgetItem("qrcode-svg",projects);
44
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qrcode-svg.html")));
43 45
 item= new QListWidgetItem("Qt",projects);
44 46
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
45 47
 

+ 2
- 0
src/licensewindow.w View File

@@ -89,6 +89,8 @@ item = new QListWidgetItem("Tango Desktop Project", projects);
89 89
 item->setData(Qt::UserRole, QVariant(QUrl("qrc:/resources/html/licenses/tango.html")));
90 90
 item = new QListWidgetItem("QextSerialPort", projects);
91 91
 item->setData(Qt::UserRole, QVariant(QUrl("qrc:/resources/html/licenses/qextserialport.html")));
92
+item = new QListWidgetItem("qrcode-svg", projects);
93
+item->setData(Qt::UserRole, QVariant(QUrl("qrc:/resources/html/licenses/qrcode-svg.html")));
92 94
 item = new QListWidgetItem("Qt", projects);
93 95
 item->setData(Qt::UserRole, QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
94 96
 

+ 5
- 0
src/resources.qrc View File

@@ -31,5 +31,10 @@
31 31
         <file>resources/html/licenses/typica.html</file>
32 32
         <file>resources/html/licenses/tango.html</file>
33 33
         <file>resources/html/typica2logo96.png</file>
34
+        <file>resources/html/licenses/qt.html</file>
35
+        <file>resources/html/licenses/d3.html</file>
36
+        <file>resources/html/licenses/entypo.html</file>
37
+        <file>resources/html/licenses/qextserialport.html</file>
38
+        <file>resources/html/licenses/qrcode-svg.html</file>
34 39
     </qresource>
35 40
 </RCC>

+ 26
- 0
src/resources/html/licenses/d3.html View File

@@ -0,0 +1,26 @@
1
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2
+<html xmlns="http://www.w3.org/1999/xhtml">
3
+    <head>
4
+        <title>Typica</title>
5
+        <link rel="stylesheet" type="text/css" href="../style.css" />
6
+    </head>
7
+    <body>
8
+        <div id="page">
9
+            <div id="topmatter">
10
+                <div id="topbanner">
11
+                    <h1><a href="https://d3js.org">d3.js</a></h1>
12
+                </div>
13
+            <div id="maintext">
14
+                <p>Copyright &copy; 2010-2014, Michael Bostock</p>
15
+				<p>All rights reserved.</p>
16
+				<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
17
+				<ul>
18
+					<li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
19
+					<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
20
+					<li>The name Michael Bostock may not be used to endorse or promote products derived from this software without specific prior written permission.
21
+				</ul>
22
+				<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
23
+            </div>
24
+        </div>
25
+    </body>
26
+</html>

+ 19
- 0
src/resources/html/licenses/entypo.html View File

@@ -0,0 +1,19 @@
1
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2
+<html xmlns="http://www.w3.org/1999/xhtml">
3
+    <head>
4
+        <title>Typica</title>
5
+        <link rel="stylesheet" type="text/css" href="../style.css" />
6
+    </head>
7
+    <body>
8
+        <div id="page">
9
+            <div id="topmatter">
10
+                <div id="topbanner">
11
+                    <h1><a href="http://www.entypo.com">Entypo pictograms</a></h1>
12
+                </div>
13
+            <div id="maintext">
14
+                <p>By Daniel Bruce</p>
15
+				<p>Used under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 license.</a></p>
16
+            </div>
17
+        </div>
18
+    </body>
19
+</html>

+ 42
- 0
src/resources/html/licenses/qextserialport.html View File

@@ -0,0 +1,42 @@
1
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2
+<html xmlns="http://www.w3.org/1999/xhtml">
3
+    <head>
4
+        <title>Typica</title>
5
+        <link rel="stylesheet" type="text/css" href="../style.css" />
6
+    </head>
7
+    <body>
8
+        <div id="page">
9
+            <div id="topmatter">
10
+                <div id="topbanner">
11
+                    <h1><a href="http://code.google.com/p/qextserialport/">QextSerialPort</a></h1>
12
+                </div>
13
+            <div id="maintext">
14
+                <p>Copyright &copy; 2000&ndash;2003 Wayne Roth</p>
15
+				<p>Copyright &copy; 2004&ndash;2007 Stefan Sander</p>
16
+				<p>Copyright &copy; 2007 Michal Policht</p>
17
+				<p>Copyright &copy; 2008 Brandon Fosdick</p>
18
+				<p>Copyright &copy; 2009-2010 Liam Staskawicz</p>
19
+				<p>Copyright &copy; 2011 Debao Zhang</p>
20
+				<p>Permission is hereby granted, free of charge, to any person
21
+				obtaining a copy of this software and associated documentation
22
+				files (the "Software"), to deal in the Software without
23
+				restriction, including without limitation the rights to use,
24
+				copy, modify, merge, publish, distribute, sublicense, and/or
25
+				sell copies of the Software, and to permit persons to whom the
26
+				Software is furnished to do so, subject to the following
27
+				conditions:</p>
28
+				<p>The above copyright notice and this permission notice shall
29
+				be included in all copies or substantial portions of the
30
+				Software.</p>
31
+				<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
32
+				KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
33
+				WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
34
+				AND NONNIFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
35
+				HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
36
+				WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
37
+				FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
38
+				OTHER DEALINGS IN THE SOFTWARE.</p>
39
+            </div>
40
+        </div>
41
+    </body>
42
+</html>

+ 24
- 0
src/resources/html/licenses/qrcode-svg.html View File

@@ -0,0 +1,24 @@
1
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2
+<html xmlns="http://www.w3.org/1999/xhtml">
3
+    <head>
4
+        <title>Typica</title>
5
+        <link rel="stylesheet" type="text/css" href="../style.css" />
6
+    </head>
7
+    <body>
8
+        <div id="page">
9
+            <div id="topmatter">
10
+                <div id="topbanner">
11
+                    <h1><a href="https://github.com/papnkukn/qrcode-svg">qrcode-svg</a></h1>
12
+                </div>
13
+            <div id="maintext">
14
+                <p>The MIT License (MIT)</p>
15
+				<p>Copyright (c) 2016 papnkukn</p>
16
+				<p>Modifications for Typica integration (c) 2017 Neal Evan Wilson</p>
17
+				<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
18
+				<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
19
+				<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
20
+				<p>The word "QR Code" is <a href="http://www.denso-wave.com/qrcode/faqpatent-e.html">registered trademark of DENSO WAVE INCORPORATED</a>.</p>
21
+            </div>
22
+        </div>
23
+    </body>
24
+</html>

+ 478
- 0
src/resources/html/licenses/qt.html View File

@@ -0,0 +1,478 @@
1
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2
+<html xmlns="http://www.w3.org/1999/xhtml">
3
+    <head>
4
+        <title>Typica</title>
5
+        <link rel="stylesheet" type="text/css" href="../style.css" />
6
+    </head>
7
+    <body>
8
+        <div id="page">
9
+            <div id="topmatter">
10
+                <div id="topbanner">
11
+                    <h1><a href="http://qt.io/">Qt</a></h1>
12
+                </div>
13
+            <div id="maintext">
14
+                <p>Typica uses Qt under the GNU Lesser General Public License (LGPL) version 2.1.</p>
15
+
16
+<pre>
17
+                  GNU LESSER GENERAL PUBLIC LICENSE
18
+                       Version 2.1, February 1999
19
+
20
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
21
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
22
+ Everyone is permitted to copy and distribute verbatim copies
23
+ of this license document, but changing it is not allowed.
24
+
25
+[This is the first released version of the Lesser GPL.  It also counts
26
+ as the successor of the GNU Library Public License, version 2, hence
27
+ the version number 2.1.]
28
+
29
+                            Preamble
30
+
31
+  The licenses for most software are designed to take away your
32
+freedom to share and change it.  By contrast, the GNU General Public
33
+Licenses are intended to guarantee your freedom to share and change
34
+free software--to make sure the software is free for all its users.
35
+
36
+  This license, the Lesser General Public License, applies to some
37
+specially designated software packages--typically libraries--of the
38
+Free Software Foundation and other authors who decide to use it.  You
39
+can use it too, but we suggest you first think carefully about whether
40
+this license or the ordinary General Public License is the better
41
+strategy to use in any particular case, based on the explanations below.
42
+
43
+  When we speak of free software, we are referring to freedom of use,
44
+not price.  Our General Public Licenses are designed to make sure that
45
+you have the freedom to distribute copies of free software (and charge
46
+for this service if you wish); that you receive source code or can get
47
+it if you want it; that you can change the software and use pieces of
48
+it in new free programs; and that you are informed that you can do
49
+these things.
50
+
51
+  To protect your rights, we need to make restrictions that forbid
52
+distributors to deny you these rights or to ask you to surrender these
53
+rights.  These restrictions translate to certain responsibilities for
54
+you if you distribute copies of the library or if you modify it.
55
+
56
+  For example, if you distribute copies of the library, whether gratis
57
+or for a fee, you must give the recipients all the rights that we gave
58
+you.  You must make sure that they, too, receive or can get the source
59
+code.  If you link other code with the library, you must provide
60
+complete object files to the recipients, so that they can relink them
61
+with the library after making changes to the library and recompiling
62
+it.  And you must show them these terms so they know their rights.
63
+
64
+  We protect your rights with a two-step method: (1) we copyright the
65
+library, and (2) we offer you this license, which gives you legal
66
+permission to copy, distribute and/or modify the library.
67
+
68
+  To protect each distributor, we want to make it very clear that
69
+there is no warranty for the free library.  Also, if the library is
70
+modified by someone else and passed on, the recipients should know
71
+that what they have is not the original version, so that the original
72
+author's reputation will not be affected by problems that might be
73
+introduced by others.
74
+
75
+  Finally, software patents pose a constant threat to the existence of
76
+any free program.  We wish to make sure that a company cannot
77
+effectively restrict the users of a free program by obtaining a
78
+restrictive license from a patent holder.  Therefore, we insist that
79
+any patent license obtained for a version of the library must be
80
+consistent with the full freedom of use specified in this license.
81
+
82
+  Most GNU software, including some libraries, is covered by the
83
+ordinary GNU General Public License.  This license, the GNU Lesser
84
+General Public License, applies to certain designated libraries, and
85
+is quite different from the ordinary General Public License.  We use
86
+this license for certain libraries in order to permit linking those
87
+libraries into non-free programs.
88
+
89
+  When a program is linked with a library, whether statically or using
90
+a shared library, the combination of the two is legally speaking a
91
+combined work, a derivative of the original library.  The ordinary
92
+General Public License therefore permits such linking only if the
93
+entire combination fits its criteria of freedom.  The Lesser General
94
+Public License permits more lax criteria for linking other code with
95
+the library.
96
+
97
+  We call this license the "Lesser" General Public License because it
98
+does Less to protect the user's freedom than the ordinary General
99
+Public License.  It also provides other free software developers Less
100
+of an advantage over competing non-free programs.  These disadvantages
101
+are the reason we use the ordinary General Public License for many
102
+libraries.  However, the Lesser license provides advantages in certain
103
+special circumstances.
104
+
105
+  For example, on rare occasions, there may be a special need to
106
+encourage the widest possible use of a certain library, so that it becomes
107
+a de-facto standard.  To achieve this, non-free programs must be
108
+allowed to use the library.  A more frequent case is that a free
109
+library does the same job as widely used non-free libraries.  In this
110
+case, there is little to gain by limiting the free library to free
111
+software only, so we use the Lesser General Public License.
112
+
113
+  In other cases, permission to use a particular library in non-free
114
+programs enables a greater number of people to use a large body of
115
+free software.  For example, permission to use the GNU C Library in
116
+non-free programs enables many more people to use the whole GNU
117
+operating system, as well as its variant, the GNU/Linux operating
118
+system.
119
+
120
+  Although the Lesser General Public License is Less protective of the
121
+users' freedom, it does ensure that the user of a program that is
122
+linked with the Library has the freedom and the wherewithal to run
123
+that program using a modified version of the Library.
124
+
125
+  The precise terms and conditions for copying, distribution and
126
+modification follow.  Pay close attention to the difference between a
127
+"work based on the library" and a "work that uses the library".  The
128
+former contains code derived from the library, whereas the latter must
129
+be combined with the library in order to run.
130
+
131
+                  GNU LESSER GENERAL PUBLIC LICENSE
132
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
133
+
134
+  0. This License Agreement applies to any software library or other
135
+program which contains a notice placed by the copyright holder or
136
+other authorized party saying it may be distributed under the terms of
137
+this Lesser General Public License (also called "this License").
138
+Each licensee is addressed as "you".
139
+
140
+  A "library" means a collection of software functions and/or data
141
+prepared so as to be conveniently linked with application programs
142
+(which use some of those functions and data) to form executables.
143
+
144
+  The "Library", below, refers to any such software library or work
145
+which has been distributed under these terms.  A "work based on the
146
+Library" means either the Library or any derivative work under
147
+copyright law: that is to say, a work containing the Library or a
148
+portion of it, either verbatim or with modifications and/or translated
149
+straightforwardly into another language.  (Hereinafter, translation is
150
+included without limitation in the term "modification".)
151
+
152
+  "Source code" for a work means the preferred form of the work for
153
+making modifications to it.  For a library, complete source code means
154
+all the source code for all modules it contains, plus any associated
155
+interface definition files, plus the scripts used to control compilation
156
+and installation of the library.
157
+
158
+  Activities other than copying, distribution and modification are not
159
+covered by this License; they are outside its scope.  The act of
160
+running a program using the Library is not restricted, and output from
161
+such a program is covered only if its contents constitute a work based
162
+on the Library (independent of the use of the Library in a tool for
163
+writing it).  Whether that is true depends on what the Library does
164
+and what the program that uses the Library does.
165
+
166
+  1. You may copy and distribute verbatim copies of the Library's
167
+complete source code as you receive it, in any medium, provided that
168
+you conspicuously and appropriately publish on each copy an
169
+appropriate copyright notice and disclaimer of warranty; keep intact
170
+all the notices that refer to this License and to the absence of any
171
+warranty; and distribute a copy of this License along with the
172
+Library.
173
+
174
+  You may charge a fee for the physical act of transferring a copy,
175
+and you may at your option offer warranty protection in exchange for a
176
+fee.
177
+
178
+  2. You may modify your copy or copies of the Library or any portion
179
+of it, thus forming a work based on the Library, and copy and
180
+distribute such modifications or work under the terms of Section 1
181
+above, provided that you also meet all of these conditions:
182
+
183
+    a) The modified work must itself be a software library.
184
+
185
+    b) You must cause the files modified to carry prominent notices
186
+    stating that you changed the files and the date of any change.
187
+
188
+    c) You must cause the whole of the work to be licensed at no
189
+    charge to all third parties under the terms of this License.
190
+
191
+    d) If a facility in the modified Library refers to a function or a
192
+    table of data to be supplied by an application program that uses
193
+    the facility, other than as an argument passed when the facility
194
+    is invoked, then you must make a good faith effort to ensure that,
195
+    in the event an application does not supply such function or
196
+    table, the facility still operates, and performs whatever part of
197
+    its purpose remains meaningful.
198
+
199
+    (For example, a function in a library to compute square roots has
200
+    a purpose that is entirely well-defined independent of the
201
+    application.  Therefore, Subsection 2d requires that any
202
+    application-supplied function or table used by this function must
203
+    be optional: if the application does not supply it, the square
204
+    root function must still compute square roots.)
205
+
206
+These requirements apply to the modified work as a whole.  If
207
+identifiable sections of that work are not derived from the Library,
208
+and can be reasonably considered independent and separate works in
209
+themselves, then this License, and its terms, do not apply to those
210
+sections when you distribute them as separate works.  But when you
211
+distribute the same sections as part of a whole which is a work based
212
+on the Library, the distribution of the whole must be on the terms of
213
+this License, whose permissions for other licensees extend to the
214
+entire whole, and thus to each and every part regardless of who wrote
215
+it.
216
+
217
+Thus, it is not the intent of this section to claim rights or contest
218
+your rights to work written entirely by you; rather, the intent is to
219
+exercise the right to control the distribution of derivative or
220
+collective works based on the Library.
221
+
222
+In addition, mere aggregation of another work not based on the Library
223
+with the Library (or with a work based on the Library) on a volume of
224
+a storage or distribution medium does not bring the other work under
225
+the scope of this License.
226
+
227
+  3. You may opt to apply the terms of the ordinary GNU General Public
228
+License instead of this License to a given copy of the Library.  To do
229
+this, you must alter all the notices that refer to this License, so
230
+that they refer to the ordinary GNU General Public License, version 2,
231
+instead of to this License.  (If a newer version than version 2 of the
232
+ordinary GNU General Public License has appeared, then you can specify
233
+that version instead if you wish.)  Do not make any other change in
234
+these notices.
235
+
236
+  Once this change is made in a given copy, it is irreversible for
237
+that copy, so the ordinary GNU General Public License applies to all
238
+subsequent copies and derivative works made from that copy.
239
+
240
+  This option is useful when you wish to copy part of the code of
241
+the Library into a program that is not a library.
242
+
243
+  4. You may copy and distribute the Library (or a portion or
244
+derivative of it, under Section 2) in object code or executable form
245
+under the terms of Sections 1 and 2 above provided that you accompany
246
+it with the complete corresponding machine-readable source code, which
247
+must be distributed under the terms of Sections 1 and 2 above on a
248
+medium customarily used for software interchange.
249
+
250
+  If distribution of object code is made by offering access to copy
251
+from a designated place, then offering equivalent access to copy the
252
+source code from the same place satisfies the requirement to
253
+distribute the source code, even though third parties are not
254
+compelled to copy the source along with the object code.
255
+
256
+  5. A program that contains no derivative of any portion of the
257
+Library, but is designed to work with the Library by being compiled or
258
+linked with it, is called a "work that uses the Library".  Such a
259
+work, in isolation, is not a derivative work of the Library, and
260
+therefore falls outside the scope of this License.
261
+
262
+  However, linking a "work that uses the Library" with the Library
263
+creates an executable that is a derivative of the Library (because it
264
+contains portions of the Library), rather than a "work that uses the
265
+library".  The executable is therefore covered by this License.
266
+Section 6 states terms for distribution of such executables.
267
+
268
+  When a "work that uses the Library" uses material from a header file
269
+that is part of the Library, the object code for the work may be a
270
+derivative work of the Library even though the source code is not.
271
+Whether this is true is especially significant if the work can be
272
+linked without the Library, or if the work is itself a library.  The
273
+threshold for this to be true is not precisely defined by law.
274
+
275
+  If such an object file uses only numerical parameters, data
276
+structure layouts and accessors, and small macros and small inline
277
+functions (ten lines or less in length), then the use of the object
278
+file is unrestricted, regardless of whether it is legally a derivative
279
+work.  (Executables containing this object code plus portions of the
280
+Library will still fall under Section 6.)
281
+
282
+  Otherwise, if the work is a derivative of the Library, you may
283
+distribute the object code for the work under the terms of Section 6.
284
+Any executables containing that work also fall under Section 6,
285
+whether or not they are linked directly with the Library itself.
286
+
287
+  6. As an exception to the Sections above, you may also combine or
288
+link a "work that uses the Library" with the Library to produce a
289
+work containing portions of the Library, and distribute that work
290
+under terms of your choice, provided that the terms permit
291
+modification of the work for the customer's own use and reverse
292
+engineering for debugging such modifications.
293
+
294
+  You must give prominent notice with each copy of the work that the
295
+Library is used in it and that the Library and its use are covered by
296
+this License.  You must supply a copy of this License.  If the work
297
+during execution displays copyright notices, you must include the
298
+copyright notice for the Library among them, as well as a reference
299
+directing the user to the copy of this License.  Also, you must do one
300
+of these things:
301
+
302
+    a) Accompany the work with the complete corresponding
303
+    machine-readable source code for the Library including whatever
304
+    changes were used in the work (which must be distributed under
305
+    Sections 1 and 2 above); and, if the work is an executable linked
306
+    with the Library, with the complete machine-readable "work that
307
+    uses the Library", as object code and/or source code, so that the
308
+    user can modify the Library and then relink to produce a modified
309
+    executable containing the modified Library.  (It is understood
310
+    that the user who changes the contents of definitions files in the
311
+    Library will not necessarily be able to recompile the application
312
+    to use the modified definitions.)
313
+
314
+    b) Use a suitable shared library mechanism for linking with the
315
+    Library.  A suitable mechanism is one that (1) uses at run time a
316
+    copy of the library already present on the user's computer system,
317
+    rather than copying library functions into the executable, and (2)
318
+    will operate properly with a modified version of the library, if
319
+    the user installs one, as long as the modified version is
320
+    interface-compatible with the version that the work was made with.
321
+
322
+    c) Accompany the work with a written offer, valid for at
323
+    least three years, to give the same user the materials
324
+    specified in Subsection 6a, above, for a charge no more
325
+    than the cost of performing this distribution.
326
+
327
+    d) If distribution of the work is made by offering access to copy
328
+    from a designated place, offer equivalent access to copy the above
329
+    specified materials from the same place.
330
+
331
+    e) Verify that the user has already received a copy of these
332
+    materials or that you have already sent this user a copy.
333
+
334
+  For an executable, the required form of the "work that uses the
335
+Library" must include any data and utility programs needed for
336
+reproducing the executable from it.  However, as a special exception,
337
+the materials to be distributed need not include anything that is
338
+normally distributed (in either source or binary form) with the major
339
+components (compiler, kernel, and so on) of the operating system on
340
+which the executable runs, unless that component itself accompanies
341
+the executable.
342
+
343
+  It may happen that this requirement contradicts the license
344
+restrictions of other proprietary libraries that do not normally
345
+accompany the operating system.  Such a contradiction means you cannot
346
+use both them and the Library together in an executable that you
347
+distribute.
348
+
349
+  7. You may place library facilities that are a work based on the
350
+Library side-by-side in a single library together with other library
351
+facilities not covered by this License, and distribute such a combined
352
+library, provided that the separate distribution of the work based on
353
+the Library and of the other library facilities is otherwise
354
+permitted, and provided that you do these two things:
355
+
356
+    a) Accompany the combined library with a copy of the same work
357
+    based on the Library, uncombined with any other library
358
+    facilities.  This must be distributed under the terms of the
359
+    Sections above.
360
+
361
+    b) Give prominent notice with the combined library of the fact
362
+    that part of it is a work based on the Library, and explaining
363
+    where to find the accompanying uncombined form of the same work.
364
+
365
+  8. You may not copy, modify, sublicense, link with, or distribute
366
+0the Library except as expressly provided under this License.  Any
367
+attempt otherwise to copy, modify, sublicense, link with, or
368
+distribute the Library is void, and will automatically terminate your
369
+rights under this License.  However, parties who have received copies,
370
+or rights, from you under this License will not have their licenses
371
+terminated so long as such parties remain in full compliance.
372
+
373
+  9. You are not required to accept this License, since you have not
374
+signed it.  However, nothing else grants you permission to modify or
375
+distribute the Library or its derivative works.  These actions are
376
+prohibited by law if you do not accept this License.  Therefore, by
377
+modifying or distributing the Library (or any work based on the
378
+Library), you indicate your acceptance of this License to do so, and
379
+all its terms and conditions for copying, distributing or modifying
380
+the Library or works based on it.
381
+
382
+  10. Each time you redistribute the Library (or any work based on the
383
+Library), the recipient automatically receives a license from the
384
+original licensor to copy, distribute, link with or modify the Library
385
+subject to these terms and conditions.  You may not impose any further
386
+restrictions on the recipients' exercise of the rights granted herein.
387
+You are not responsible for enforcing compliance by third parties with
388
+this License.
389
+
390
+  11. If, as a consequence of a court judgment or allegation of patent
391
+infringement or for any other reason (not limited to patent issues),
392
+conditions are imposed on you (whether by court order, agreement or
393
+otherwise) that contradict the conditions of this License, they do not
394
+excuse you from the conditions of this License.  If you cannot
395
+distribute so as to satisfy simultaneously your obligations under this
396
+License and any other pertinent obligations, then as a consequence you
397
+may not distribute the Library at all.  For example, if a patent
398
+license would not permit royalty-free redistribution of the Library by
399
+all those who receive copies directly or indirectly through you, then
400
+the only way you could satisfy both it and this License would be to
401
+refrain entirely from distribution of the Library.
402
+
403
+If any portion of this section is held invalid or unenforceable under any
404
+particular circumstance, the balance of the section is intended to apply,
405
+and the section as a whole is intended to apply in other circumstances.
406
+
407
+It is not the purpose of this section to induce you to infringe any
408
+patents or other property right claims or to contest validity of any
409
+such claims; this section has the sole purpose of protecting the
410
+integrity of the free software distribution system which is
411
+implemented by public license practices.  Many people have made
412
+generous contributions to the wide range of software distributed
413
+through that system in reliance on consistent application of that
414
+system; it is up to the author/donor to decide if he or she is willing
415
+to distribute software through any other system and a licensee cannot
416
+impose that choice.
417
+
418
+This section is intended to make thoroughly clear what is believed to
419
+be a consequence of the rest of this License.
420
+
421
+  12. If the distribution and/or use of the Library is restricted in
422
+certain countries either by patents or by copyrighted interfaces, the
423
+original copyright holder who places the Library under this License may add
424
+an explicit geographical distribution limitation excluding those countries,
425
+so that distribution is permitted only in or among countries not thus
426
+excluded.  In such case, this License incorporates the limitation as if
427
+written in the body of this License.
428
+
429
+  13. The Free Software Foundation may publish revised and/or new
430
+versions of the Lesser General Public License from time to time.
431
+Such new versions will be similar in spirit to the present version,
432
+but may differ in detail to address new problems or concerns.
433
+
434
+Each version is given a distinguishing version number.  If the Library
435
+specifies a version number of this License which applies to it and
436
+"any later version", you have the option of following the terms and
437
+conditions either of that version or of any later version published by
438
+the Free Software Foundation.  If the Library does not specify a
439
+license version number, you may choose any version ever published by
440
+the Free Software Foundation.
441
+
442
+  14. If you wish to incorporate parts of the Library into other free
443
+programs whose distribution conditions are incompatible with these,
444
+write to the author to ask for permission.  For software which is
445
+copyrighted by the Free Software Foundation, write to the Free
446
+Software Foundation; we sometimes make exceptions for this.  Our
447
+decision will be guided by the two goals of preserving the free status
448
+of all derivatives of our free software and of promoting the sharing
449
+and reuse of software generally.
450
+
451
+                            NO WARRANTY
452
+
453
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
454
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
455
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
456
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
457
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
458
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
459
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
460
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
461
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
462
+
463
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
464
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
465
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
466
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
467
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
468
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
469
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
470
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
471
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
472
+DAMAGES.
473
+</pre>
474
+
475
+            </div>
476
+        </div>
477
+    </body>
478
+</html>

+ 1
- 1
src/resources/html/licenses/tango.html View File

@@ -1,7 +1,7 @@
1 1
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">
2 2
 <html xmlns="http://www.w3.org/1999/xhtml">
3 3
     <head>
4
-        <title>Typica - Data for Coffee Roasters</title>
4
+        <title>Typica</title>
5 5
         <link rel="stylesheet" type="text/css" href="../style.css" />
6 6
     </head>
7 7
     <body>

+ 2
- 2
src/resources/html/licenses/typica.html View File

@@ -10,10 +10,10 @@
10 10
                 <div id="topbanner">
11 11
                     <a href="http://www.randomfield.com/programs/typica/"><img src="../../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
12 12
                     <h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
13
-                    <h2>Version 1.6.3</h2>
13
+                    <h2>Version 1.8.1</h2>
14 14
                 </div>
15 15
             <div id="maintext">
16
-                <p>Copyright &copy; 2007&ndash;2015 Neal Evan Wilson</p>
16
+                <p>Copyright &copy; 2007&ndash;2017 Neal Evan Wilson</p>
17 17
                 <p>Permission is hereby granted, free of charge, to any person
18 18
                 obtaining a copy of this software and associated documentation
19 19
                 files (the "Software"), to deal in the Software without

+ 1
- 1
src/typica.cpp View File

@@ -16870,7 +16870,7 @@ setText(QString(tr("Current operator: %1").arg(user)));
16870 16870
 /*:1119*//*1120:*/
16871 16871
 #line 196 "./user.w"
16872 16872
 
16873
-void UserLabel::mouseReleaseEvent(QMouseEvent*event)
16873
+void UserLabel::mouseReleaseEvent(QMouseEvent*)
16874 16874
 {
16875 16875
 LoginDialog*dialog= new LoginDialog;
16876 16876
 dialog->exec();

Loading…
Cancel
Save