1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/OpenSecurity/Apache License, Version 2.0.txt Fri Jun 13 13:10:48 2014 +0200
1.3 @@ -0,0 +1,202 @@
1.4 +
1.5 + Apache License
1.6 + Version 2.0, January 2004
1.7 + http://www.apache.org/licenses/
1.8 +
1.9 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1.10 +
1.11 + 1. Definitions.
1.12 +
1.13 + "License" shall mean the terms and conditions for use, reproduction,
1.14 + and distribution as defined by Sections 1 through 9 of this document.
1.15 +
1.16 + "Licensor" shall mean the copyright owner or entity authorized by
1.17 + the copyright owner that is granting the License.
1.18 +
1.19 + "Legal Entity" shall mean the union of the acting entity and all
1.20 + other entities that control, are controlled by, or are under common
1.21 + control with that entity. For the purposes of this definition,
1.22 + "control" means (i) the power, direct or indirect, to cause the
1.23 + direction or management of such entity, whether by contract or
1.24 + otherwise, or (ii) ownership of fifty percent (50%) or more of the
1.25 + outstanding shares, or (iii) beneficial ownership of such entity.
1.26 +
1.27 + "You" (or "Your") shall mean an individual or Legal Entity
1.28 + exercising permissions granted by this License.
1.29 +
1.30 + "Source" form shall mean the preferred form for making modifications,
1.31 + including but not limited to software source code, documentation
1.32 + source, and configuration files.
1.33 +
1.34 + "Object" form shall mean any form resulting from mechanical
1.35 + transformation or translation of a Source form, including but
1.36 + not limited to compiled object code, generated documentation,
1.37 + and conversions to other media types.
1.38 +
1.39 + "Work" shall mean the work of authorship, whether in Source or
1.40 + Object form, made available under the License, as indicated by a
1.41 + copyright notice that is included in or attached to the work
1.42 + (an example is provided in the Appendix below).
1.43 +
1.44 + "Derivative Works" shall mean any work, whether in Source or Object
1.45 + form, that is based on (or derived from) the Work and for which the
1.46 + editorial revisions, annotations, elaborations, or other modifications
1.47 + represent, as a whole, an original work of authorship. For the purposes
1.48 + of this License, Derivative Works shall not include works that remain
1.49 + separable from, or merely link (or bind by name) to the interfaces of,
1.50 + the Work and Derivative Works thereof.
1.51 +
1.52 + "Contribution" shall mean any work of authorship, including
1.53 + the original version of the Work and any modifications or additions
1.54 + to that Work or Derivative Works thereof, that is intentionally
1.55 + submitted to Licensor for inclusion in the Work by the copyright owner
1.56 + or by an individual or Legal Entity authorized to submit on behalf of
1.57 + the copyright owner. For the purposes of this definition, "submitted"
1.58 + means any form of electronic, verbal, or written communication sent
1.59 + to the Licensor or its representatives, including but not limited to
1.60 + communication on electronic mailing lists, source code control systems,
1.61 + and issue tracking systems that are managed by, or on behalf of, the
1.62 + Licensor for the purpose of discussing and improving the Work, but
1.63 + excluding communication that is conspicuously marked or otherwise
1.64 + designated in writing by the copyright owner as "Not a Contribution."
1.65 +
1.66 + "Contributor" shall mean Licensor and any individual or Legal Entity
1.67 + on behalf of whom a Contribution has been received by Licensor and
1.68 + subsequently incorporated within the Work.
1.69 +
1.70 + 2. Grant of Copyright License. Subject to the terms and conditions of
1.71 + this License, each Contributor hereby grants to You a perpetual,
1.72 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1.73 + copyright license to reproduce, prepare Derivative Works of,
1.74 + publicly display, publicly perform, sublicense, and distribute the
1.75 + Work and such Derivative Works in Source or Object form.
1.76 +
1.77 + 3. Grant of Patent License. Subject to the terms and conditions of
1.78 + this License, each Contributor hereby grants to You a perpetual,
1.79 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
1.80 + (except as stated in this section) patent license to make, have made,
1.81 + use, offer to sell, sell, import, and otherwise transfer the Work,
1.82 + where such license applies only to those patent claims licensable
1.83 + by such Contributor that are necessarily infringed by their
1.84 + Contribution(s) alone or by combination of their Contribution(s)
1.85 + with the Work to which such Contribution(s) was submitted. If You
1.86 + institute patent litigation against any entity (including a
1.87 + cross-claim or counterclaim in a lawsuit) alleging that the Work
1.88 + or a Contribution incorporated within the Work constitutes direct
1.89 + or contributory patent infringement, then any patent licenses
1.90 + granted to You under this License for that Work shall terminate
1.91 + as of the date such litigation is filed.
1.92 +
1.93 + 4. Redistribution. You may reproduce and distribute copies of the
1.94 + Work or Derivative Works thereof in any medium, with or without
1.95 + modifications, and in Source or Object form, provided that You
1.96 + meet the following conditions:
1.97 +
1.98 + (a) You must give any other recipients of the Work or
1.99 + Derivative Works a copy of this License; and
1.100 +
1.101 + (b) You must cause any modified files to carry prominent notices
1.102 + stating that You changed the files; and
1.103 +
1.104 + (c) You must retain, in the Source form of any Derivative Works
1.105 + that You distribute, all copyright, patent, trademark, and
1.106 + attribution notices from the Source form of the Work,
1.107 + excluding those notices that do not pertain to any part of
1.108 + the Derivative Works; and
1.109 +
1.110 + (d) If the Work includes a "NOTICE" text file as part of its
1.111 + distribution, then any Derivative Works that You distribute must
1.112 + include a readable copy of the attribution notices contained
1.113 + within such NOTICE file, excluding those notices that do not
1.114 + pertain to any part of the Derivative Works, in at least one
1.115 + of the following places: within a NOTICE text file distributed
1.116 + as part of the Derivative Works; within the Source form or
1.117 + documentation, if provided along with the Derivative Works; or,
1.118 + within a display generated by the Derivative Works, if and
1.119 + wherever such third-party notices normally appear. The contents
1.120 + of the NOTICE file are for informational purposes only and
1.121 + do not modify the License. You may add Your own attribution
1.122 + notices within Derivative Works that You distribute, alongside
1.123 + or as an addendum to the NOTICE text from the Work, provided
1.124 + that such additional attribution notices cannot be construed
1.125 + as modifying the License.
1.126 +
1.127 + You may add Your own copyright statement to Your modifications and
1.128 + may provide additional or different license terms and conditions
1.129 + for use, reproduction, or distribution of Your modifications, or
1.130 + for any such Derivative Works as a whole, provided Your use,
1.131 + reproduction, and distribution of the Work otherwise complies with
1.132 + the conditions stated in this License.
1.133 +
1.134 + 5. Submission of Contributions. Unless You explicitly state otherwise,
1.135 + any Contribution intentionally submitted for inclusion in the Work
1.136 + by You to the Licensor shall be under the terms and conditions of
1.137 + this License, without any additional terms or conditions.
1.138 + Notwithstanding the above, nothing herein shall supersede or modify
1.139 + the terms of any separate license agreement you may have executed
1.140 + with Licensor regarding such Contributions.
1.141 +
1.142 + 6. Trademarks. This License does not grant permission to use the trade
1.143 + names, trademarks, service marks, or product names of the Licensor,
1.144 + except as required for reasonable and customary use in describing the
1.145 + origin of the Work and reproducing the content of the NOTICE file.
1.146 +
1.147 + 7. Disclaimer of Warranty. Unless required by applicable law or
1.148 + agreed to in writing, Licensor provides the Work (and each
1.149 + Contributor provides its Contributions) on an "AS IS" BASIS,
1.150 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
1.151 + implied, including, without limitation, any warranties or conditions
1.152 + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
1.153 + PARTICULAR PURPOSE. You are solely responsible for determining the
1.154 + appropriateness of using or redistributing the Work and assume any
1.155 + risks associated with Your exercise of permissions under this License.
1.156 +
1.157 + 8. Limitation of Liability. In no event and under no legal theory,
1.158 + whether in tort (including negligence), contract, or otherwise,
1.159 + unless required by applicable law (such as deliberate and grossly
1.160 + negligent acts) or agreed to in writing, shall any Contributor be
1.161 + liable to You for damages, including any direct, indirect, special,
1.162 + incidental, or consequential damages of any character arising as a
1.163 + result of this License or out of the use or inability to use the
1.164 + Work (including but not limited to damages for loss of goodwill,
1.165 + work stoppage, computer failure or malfunction, or any and all
1.166 + other commercial damages or losses), even if such Contributor
1.167 + has been advised of the possibility of such damages.
1.168 +
1.169 + 9. Accepting Warranty or Additional Liability. While redistributing
1.170 + the Work or Derivative Works thereof, You may choose to offer,
1.171 + and charge a fee for, acceptance of support, warranty, indemnity,
1.172 + or other liability obligations and/or rights consistent with this
1.173 + License. However, in accepting such obligations, You may act only
1.174 + on Your own behalf and on Your sole responsibility, not on behalf
1.175 + of any other Contributor, and only if You agree to indemnify,
1.176 + defend, and hold each Contributor harmless for any liability
1.177 + incurred by, or claims asserted against, such Contributor by reason
1.178 + of your accepting any such warranty or additional liability.
1.179 +
1.180 + END OF TERMS AND CONDITIONS
1.181 +
1.182 + APPENDIX: How to apply the Apache License to your work.
1.183 +
1.184 + To apply the Apache License to your work, attach the following
1.185 + boilerplate notice, with the fields enclosed by brackets "[]"
1.186 + replaced with your own identifying information. (Don't include
1.187 + the brackets!) The text should be enclosed in the appropriate
1.188 + comment syntax for the file format. We also recommend that a
1.189 + file or class name and description of purpose be included on the
1.190 + same "printed page" as the copyright notice for easier
1.191 + identification within third-party archives.
1.192 +
1.193 + Copyright [yyyy] [name of copyright owner]
1.194 +
1.195 + Licensed under the Apache License, Version 2.0 (the "License");
1.196 + you may not use this file except in compliance with the License.
1.197 + You may obtain a copy of the License at
1.198 +
1.199 + http://www.apache.org/licenses/LICENSE-2.0
1.200 +
1.201 + Unless required by applicable law or agreed to in writing, software
1.202 + distributed under the License is distributed on an "AS IS" BASIS,
1.203 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1.204 + See the License for the specific language governing permissions and
1.205 + limitations under the License.
2.1 --- a/OpenSecurity/bin/ui/AboutDialog.ui Fri Jun 13 12:58:06 2014 +0200
2.2 +++ b/OpenSecurity/bin/ui/AboutDialog.ui Fri Jun 13 13:10:48 2014 +0200
2.3 @@ -6,7 +6,7 @@
2.4 <rect>
2.5 <x>0</x>
2.6 <y>0</y>
2.7 - <width>750</width>
2.8 + <width>780</width>
2.9 <height>600</height>
2.10 </rect>
2.11 </property>
2.12 @@ -19,34 +19,62 @@
2.13 </property>
2.14 <layout class="QVBoxLayout" name="lyMain">
2.15 <item>
2.16 - <widget class="QScrollArea" name="scrAbout">
2.17 - <property name="autoFillBackground">
2.18 - <bool>false</bool>
2.19 + <widget class="QTabWidget" name="tabWidget">
2.20 + <property name="currentIndex">
2.21 + <number>0</number>
2.22 </property>
2.23 - <property name="styleSheet">
2.24 - <string notr="true"/>
2.25 - </property>
2.26 - <property name="widgetResizable">
2.27 - <bool>true</bool>
2.28 - </property>
2.29 - <widget class="QWidget" name="scrAboutContent">
2.30 - <property name="geometry">
2.31 - <rect>
2.32 - <x>0</x>
2.33 - <y>0</y>
2.34 - <width>736</width>
2.35 - <height>558</height>
2.36 - </rect>
2.37 - </property>
2.38 - <property name="sizePolicy">
2.39 - <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
2.40 - <horstretch>0</horstretch>
2.41 - <verstretch>0</verstretch>
2.42 - </sizepolicy>
2.43 - </property>
2.44 - <property name="styleSheet">
2.45 - <string notr="true">QWidget { background: white; color: black; };</string>
2.46 - </property>
2.47 + <widget class="QWidget" name="tabAbout">
2.48 + <attribute name="title">
2.49 + <string>About</string>
2.50 + </attribute>
2.51 + <layout class="QVBoxLayout" name="verticalLayout">
2.52 + <item>
2.53 + <widget class="QScrollArea" name="scrAbout">
2.54 + <property name="autoFillBackground">
2.55 + <bool>false</bool>
2.56 + </property>
2.57 + <property name="styleSheet">
2.58 + <string notr="true"/>
2.59 + </property>
2.60 + <property name="widgetResizable">
2.61 + <bool>true</bool>
2.62 + </property>
2.63 + <widget class="QWidget" name="scrAboutContent">
2.64 + <property name="geometry">
2.65 + <rect>
2.66 + <x>0</x>
2.67 + <y>0</y>
2.68 + <width>750</width>
2.69 + <height>522</height>
2.70 + </rect>
2.71 + </property>
2.72 + <property name="sizePolicy">
2.73 + <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
2.74 + <horstretch>0</horstretch>
2.75 + <verstretch>0</verstretch>
2.76 + </sizepolicy>
2.77 + </property>
2.78 + <property name="styleSheet">
2.79 + <string notr="true">QWidget { background: white; color: black; };</string>
2.80 + </property>
2.81 + </widget>
2.82 + </widget>
2.83 + </item>
2.84 + </layout>
2.85 + </widget>
2.86 + <widget class="QWidget" name="tabLicense">
2.87 + <attribute name="title">
2.88 + <string>License</string>
2.89 + </attribute>
2.90 + <layout class="QVBoxLayout" name="verticalLayout_2">
2.91 + <item>
2.92 + <widget class="QPlainTextEdit" name="edtLicense">
2.93 + <property name="readOnly">
2.94 + <bool>true</bool>
2.95 + </property>
2.96 + </widget>
2.97 + </item>
2.98 + </layout>
2.99 </widget>
2.100 </widget>
2.101 </item>
3.1 --- a/OpenSecurity/bin/ui/about_dialog.py Fri Jun 13 12:58:06 2014 +0200
3.2 +++ b/OpenSecurity/bin/ui/about_dialog.py Fri Jun 13 13:10:48 2014 +0200
3.3 @@ -108,16 +108,206 @@
3.4 </div>
3.5
3.6 <div class="footer" align="left">
3.7 - Copyright (C) 2013, 2014 AIT Austrian Institute of Technology<br/>
3.8 - AIT Austrian Institute of Technology GmbH<br/>
3.9 - Donau-City-Strasse 1 | 1220 Vienna | Austria<br/>
3.10 - <a href="http://www.ait.ac.at">http://www.ait.ac.at</a>
3.11 +Copyright 2013, 2014 The OpenSecurity Consortium<br/>
3.12 +<br/>
3.13 +Licensed under the Apache License, Version 2.0 (the "License");<br/>
3.14 +you may not use this file except in compliance with the License.<br/>
3.15 +You may obtain a copy of the License at<br/>
3.16 +<br/>
3.17 +http://www.apache.org/licenses/LICENSE-2.0<br/>
3.18 +<br/>
3.19 +Unless required by applicable law or agreed to in writing, software<br/>
3.20 +distributed under the License is distributed on an "AS IS" BASIS,<br/>
3.21 +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<br/>
3.22 +See the License for the specific language governing permissions and<br/>
3.23 +limitations under the License.<br/>
3.24 </div>
3.25
3.26 </div>
3.27 </body>
3.28 </html>
3.29 -""";
3.30 +"""
3.31 +
3.32 +
3.33 +LICENSE_TEXT = """
3.34 +
3.35 + Apache License
3.36 + Version 2.0, January 2004
3.37 + http://www.apache.org/licenses/
3.38 +
3.39 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3.40 +
3.41 + 1. Definitions.
3.42 +
3.43 + "License" shall mean the terms and conditions for use, reproduction,
3.44 + and distribution as defined by Sections 1 through 9 of this document.
3.45 +
3.46 + "Licensor" shall mean the copyright owner or entity authorized by
3.47 + the copyright owner that is granting the License.
3.48 +
3.49 + "Legal Entity" shall mean the union of the acting entity and all
3.50 + other entities that control, are controlled by, or are under common
3.51 + control with that entity. For the purposes of this definition,
3.52 + "control" means (i) the power, direct or indirect, to cause the
3.53 + direction or management of such entity, whether by contract or
3.54 + otherwise, or (ii) ownership of fifty percent (50%) or more of the
3.55 + outstanding shares, or (iii) beneficial ownership of such entity.
3.56 +
3.57 + "You" (or "Your") shall mean an individual or Legal Entity
3.58 + exercising permissions granted by this License.
3.59 +
3.60 + "Source" form shall mean the preferred form for making modifications,
3.61 + including but not limited to software source code, documentation
3.62 + source, and configuration files.
3.63 +
3.64 + "Object" form shall mean any form resulting from mechanical
3.65 + transformation or translation of a Source form, including but
3.66 + not limited to compiled object code, generated documentation,
3.67 + and conversions to other media types.
3.68 +
3.69 + "Work" shall mean the work of authorship, whether in Source or
3.70 + Object form, made available under the License, as indicated by a
3.71 + copyright notice that is included in or attached to the work
3.72 + (an example is provided in the Appendix below).
3.73 +
3.74 + "Derivative Works" shall mean any work, whether in Source or Object
3.75 + form, that is based on (or derived from) the Work and for which the
3.76 + editorial revisions, annotations, elaborations, or other modifications
3.77 + represent, as a whole, an original work of authorship. For the purposes
3.78 + of this License, Derivative Works shall not include works that remain
3.79 + separable from, or merely link (or bind by name) to the interfaces of,
3.80 + the Work and Derivative Works thereof.
3.81 +
3.82 + "Contribution" shall mean any work of authorship, including
3.83 + the original version of the Work and any modifications or additions
3.84 + to that Work or Derivative Works thereof, that is intentionally
3.85 + submitted to Licensor for inclusion in the Work by the copyright owner
3.86 + or by an individual or Legal Entity authorized to submit on behalf of
3.87 + the copyright owner. For the purposes of this definition, "submitted"
3.88 + means any form of electronic, verbal, or written communication sent
3.89 + to the Licensor or its representatives, including but not limited to
3.90 + communication on electronic mailing lists, source code control systems,
3.91 + and issue tracking systems that are managed by, or on behalf of, the
3.92 + Licensor for the purpose of discussing and improving the Work, but
3.93 + excluding communication that is conspicuously marked or otherwise
3.94 + designated in writing by the copyright owner as "Not a Contribution."
3.95 +
3.96 + "Contributor" shall mean Licensor and any individual or Legal Entity
3.97 + on behalf of whom a Contribution has been received by Licensor and
3.98 + subsequently incorporated within the Work.
3.99 +
3.100 + 2. Grant of Copyright License. Subject to the terms and conditions of
3.101 + this License, each Contributor hereby grants to You a perpetual,
3.102 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
3.103 + copyright license to reproduce, prepare Derivative Works of,
3.104 + publicly display, publicly perform, sublicense, and distribute the
3.105 + Work and such Derivative Works in Source or Object form.
3.106 +
3.107 + 3. Grant of Patent License. Subject to the terms and conditions of
3.108 + this License, each Contributor hereby grants to You a perpetual,
3.109 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
3.110 + (except as stated in this section) patent license to make, have made,
3.111 + use, offer to sell, sell, import, and otherwise transfer the Work,
3.112 + where such license applies only to those patent claims licensable
3.113 + by such Contributor that are necessarily infringed by their
3.114 + Contribution(s) alone or by combination of their Contribution(s)
3.115 + with the Work to which such Contribution(s) was submitted. If You
3.116 + institute patent litigation against any entity (including a
3.117 + cross-claim or counterclaim in a lawsuit) alleging that the Work
3.118 + or a Contribution incorporated within the Work constitutes direct
3.119 + or contributory patent infringement, then any patent licenses
3.120 + granted to You under this License for that Work shall terminate
3.121 + as of the date such litigation is filed.
3.122 +
3.123 + 4. Redistribution. You may reproduce and distribute copies of the
3.124 + Work or Derivative Works thereof in any medium, with or without
3.125 + modifications, and in Source or Object form, provided that You
3.126 + meet the following conditions:
3.127 +
3.128 + (a) You must give any other recipients of the Work or
3.129 + Derivative Works a copy of this License; and
3.130 +
3.131 + (b) You must cause any modified files to carry prominent notices
3.132 + stating that You changed the files; and
3.133 +
3.134 + (c) You must retain, in the Source form of any Derivative Works
3.135 + that You distribute, all copyright, patent, trademark, and
3.136 + attribution notices from the Source form of the Work,
3.137 + excluding those notices that do not pertain to any part of
3.138 + the Derivative Works; and
3.139 +
3.140 + (d) If the Work includes a "NOTICE" text file as part of its
3.141 + distribution, then any Derivative Works that You distribute must
3.142 + include a readable copy of the attribution notices contained
3.143 + within such NOTICE file, excluding those notices that do not
3.144 + pertain to any part of the Derivative Works, in at least one
3.145 + of the following places: within a NOTICE text file distributed
3.146 + as part of the Derivative Works; within the Source form or
3.147 + documentation, if provided along with the Derivative Works; or,
3.148 + within a display generated by the Derivative Works, if and
3.149 + wherever such third-party notices normally appear. The contents
3.150 + of the NOTICE file are for informational purposes only and
3.151 + do not modify the License. You may add Your own attribution
3.152 + notices within Derivative Works that You distribute, alongside
3.153 + or as an addendum to the NOTICE text from the Work, provided
3.154 + that such additional attribution notices cannot be construed
3.155 + as modifying the License.
3.156 +
3.157 + You may add Your own copyright statement to Your modifications and
3.158 + may provide additional or different license terms and conditions
3.159 + for use, reproduction, or distribution of Your modifications, or
3.160 + for any such Derivative Works as a whole, provided Your use,
3.161 + reproduction, and distribution of the Work otherwise complies with
3.162 + the conditions stated in this License.
3.163 +
3.164 + 5. Submission of Contributions. Unless You explicitly state otherwise,
3.165 + any Contribution intentionally submitted for inclusion in the Work
3.166 + by You to the Licensor shall be under the terms and conditions of
3.167 + this License, without any additional terms or conditions.
3.168 + Notwithstanding the above, nothing herein shall supersede or modify
3.169 + the terms of any separate license agreement you may have executed
3.170 + with Licensor regarding such Contributions.
3.171 +
3.172 + 6. Trademarks. This License does not grant permission to use the trade
3.173 + names, trademarks, service marks, or product names of the Licensor,
3.174 + except as required for reasonable and customary use in describing the
3.175 + origin of the Work and reproducing the content of the NOTICE file.
3.176 +
3.177 + 7. Disclaimer of Warranty. Unless required by applicable law or
3.178 + agreed to in writing, Licensor provides the Work (and each
3.179 + Contributor provides its Contributions) on an "AS IS" BASIS,
3.180 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
3.181 + implied, including, without limitation, any warranties or conditions
3.182 + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
3.183 + PARTICULAR PURPOSE. You are solely responsible for determining the
3.184 + appropriateness of using or redistributing the Work and assume any
3.185 + risks associated with Your exercise of permissions under this License.
3.186 +
3.187 + 8. Limitation of Liability. In no event and under no legal theory,
3.188 + whether in tort (including negligence), contract, or otherwise,
3.189 + unless required by applicable law (such as deliberate and grossly
3.190 + negligent acts) or agreed to in writing, shall any Contributor be
3.191 + liable to You for damages, including any direct, indirect, special,
3.192 + incidental, or consequential damages of any character arising as a
3.193 + result of this License or out of the use or inability to use the
3.194 + Work (including but not limited to damages for loss of goodwill,
3.195 + work stoppage, computer failure or malfunction, or any and all
3.196 + other commercial damages or losses), even if such Contributor
3.197 + has been advised of the possibility of such damages.
3.198 +
3.199 + 9. Accepting Warranty or Additional Liability. While redistributing
3.200 + the Work or Derivative Works thereof, You may choose to offer,
3.201 + and charge a fee for, acceptance of support, warranty, indemnity,
3.202 + or other liability obligations and/or rights consistent with this
3.203 + License. However, in accepting such obligations, You may act only
3.204 + on Your own behalf and on Your sole responsibility, not on behalf
3.205 + of any other Contributor, and only if You agree to indemnify,
3.206 + defend, and hold each Contributor harmless for any liability
3.207 + incurred by, or claims asserted against, such Contributor by reason
3.208 + of your accepting any such warranty or additional liability.
3.209 +
3.210 + END OF TERMS AND CONDITIONS
3.211 +"""
3.212
3.213
3.214 # ------------------------------------------------------------
3.215 @@ -141,6 +331,7 @@
3.216 self.ui.lblAbout.setContentsMargins(16, 16, 16, 16)
3.217 self.ui.lblAbout.setStyleSheet(self.ui.scrAboutContent.styleSheet())
3.218 self.ui.scrAbout.setWidget(self.ui.lblAbout)
3.219 + self.ui.edtLicense.setPlainText(LICENSE_TEXT)
3.220
3.221 # connectors
3.222 self.ui.btnOk.clicked.connect(self.accept)
4.1 --- a/OpenSecurity/bin/ui/ui_AboutDialog.py Fri Jun 13 12:58:06 2014 +0200
4.2 +++ b/OpenSecurity/bin/ui/ui_AboutDialog.py Fri Jun 13 13:10:48 2014 +0200
4.3 @@ -2,7 +2,7 @@
4.4
4.5 # Form implementation generated from reading ui file 'AboutDialog.ui'
4.6 #
4.7 -# Created: Fri Jun 13 12:57:11 2014
4.8 +# Created: Fri Jun 13 13:09:03 2014
4.9 # by: PyQt4 UI code generator 4.10.3
4.10 #
4.11 # WARNING! All changes made in this file will be lost!
4.12 @@ -26,19 +26,25 @@
4.13 class Ui_AboutDialog(object):
4.14 def setupUi(self, AboutDialog):
4.15 AboutDialog.setObjectName(_fromUtf8("AboutDialog"))
4.16 - AboutDialog.resize(750, 600)
4.17 + AboutDialog.resize(780, 600)
4.18 icon = QtGui.QIcon()
4.19 icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/opensecurity/gfx/opensecurity_icon_64.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
4.20 AboutDialog.setWindowIcon(icon)
4.21 self.lyMain = QtGui.QVBoxLayout(AboutDialog)
4.22 self.lyMain.setObjectName(_fromUtf8("lyMain"))
4.23 - self.scrAbout = QtGui.QScrollArea(AboutDialog)
4.24 + self.tabWidget = QtGui.QTabWidget(AboutDialog)
4.25 + self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
4.26 + self.tabAbout = QtGui.QWidget()
4.27 + self.tabAbout.setObjectName(_fromUtf8("tabAbout"))
4.28 + self.verticalLayout = QtGui.QVBoxLayout(self.tabAbout)
4.29 + self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
4.30 + self.scrAbout = QtGui.QScrollArea(self.tabAbout)
4.31 self.scrAbout.setAutoFillBackground(False)
4.32 self.scrAbout.setStyleSheet(_fromUtf8(""))
4.33 self.scrAbout.setWidgetResizable(True)
4.34 self.scrAbout.setObjectName(_fromUtf8("scrAbout"))
4.35 self.scrAboutContent = QtGui.QWidget()
4.36 - self.scrAboutContent.setGeometry(QtCore.QRect(0, 0, 736, 558))
4.37 + self.scrAboutContent.setGeometry(QtCore.QRect(0, 0, 750, 522))
4.38 sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
4.39 sizePolicy.setHorizontalStretch(0)
4.40 sizePolicy.setVerticalStretch(0)
4.41 @@ -47,7 +53,18 @@
4.42 self.scrAboutContent.setStyleSheet(_fromUtf8("QWidget { background: white; color: black; };"))
4.43 self.scrAboutContent.setObjectName(_fromUtf8("scrAboutContent"))
4.44 self.scrAbout.setWidget(self.scrAboutContent)
4.45 - self.lyMain.addWidget(self.scrAbout)
4.46 + self.verticalLayout.addWidget(self.scrAbout)
4.47 + self.tabWidget.addTab(self.tabAbout, _fromUtf8(""))
4.48 + self.tabLicense = QtGui.QWidget()
4.49 + self.tabLicense.setObjectName(_fromUtf8("tabLicense"))
4.50 + self.verticalLayout_2 = QtGui.QVBoxLayout(self.tabLicense)
4.51 + self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
4.52 + self.edtLicense = QtGui.QPlainTextEdit(self.tabLicense)
4.53 + self.edtLicense.setReadOnly(True)
4.54 + self.edtLicense.setObjectName(_fromUtf8("edtLicense"))
4.55 + self.verticalLayout_2.addWidget(self.edtLicense)
4.56 + self.tabWidget.addTab(self.tabLicense, _fromUtf8(""))
4.57 + self.lyMain.addWidget(self.tabWidget)
4.58 self.horizontalLayout = QtGui.QHBoxLayout()
4.59 self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
4.60 spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
4.61 @@ -60,10 +77,13 @@
4.62 self.lyMain.addLayout(self.horizontalLayout)
4.63
4.64 self.retranslateUi(AboutDialog)
4.65 + self.tabWidget.setCurrentIndex(0)
4.66 QtCore.QMetaObject.connectSlotsByName(AboutDialog)
4.67
4.68 def retranslateUi(self, AboutDialog):
4.69 AboutDialog.setWindowTitle(_translate("AboutDialog", "About OpenSecurity", None))
4.70 + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabAbout), _translate("AboutDialog", "About", None))
4.71 + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabLicense), _translate("AboutDialog", "License", None))
4.72 self.btnOk.setText(_translate("AboutDialog", "&Ok", None))
4.73
4.74 import opensecurity_rc