mirror of
https://github.com/naruxde/revpicommander.git
synced 2025-11-09 00:53:53 +01:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a96d7d4269 | |||
| 43d4a97edd | |||
| 3eaae9e462 | |||
| 7a1038a5ab | |||
| bfaa07aeb4 | |||
| 43d03cc254 |
873
LICENSE.txt
873
LICENSE.txt
@@ -1,622 +1,281 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
NO WARRANTY
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
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 3 of the License, or
|
||||
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,
|
||||
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
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, see <https://www.gnu.org/licenses/>.
|
||||
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.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
||||
16
Makefile
16
Makefile
@@ -59,7 +59,7 @@ build: build_ui build_rc
|
||||
$(PYTHON) -m setup sdist
|
||||
$(PYTHON) -m setup bdist_wheel
|
||||
|
||||
install:
|
||||
install: build
|
||||
$(PYTHON) -m pip install dist/$(PACKAGE)-*.whl
|
||||
|
||||
.PHONY: build install
|
||||
@@ -96,7 +96,19 @@ installer_mac_dmg: installer_mac
|
||||
dist/$(APP_NAME)\ $(APP_VERSION).dmg \
|
||||
dist/dmg
|
||||
|
||||
.PHONY: installer_mac installer_mac_dmg
|
||||
installer_linux: build_ui build_rc
|
||||
$(PYTHON) -m PyInstaller -n $(APP_NAME) \
|
||||
--add-data="src/$(PACKAGE)/locale:./$(PACKAGE)/locale" \
|
||||
--add-data="data/$(PACKAGE).ico:." \
|
||||
--add-data="data/$(PACKAGE).png:." \
|
||||
--icon=data/$(PACKAGE).ico \
|
||||
--noconfirm \
|
||||
--clean \
|
||||
--onedir \
|
||||
--windowed \
|
||||
src/$(PACKAGE)/__main__.py
|
||||
|
||||
.PHONY: installer_mac installer_mac_dmg installer_linux
|
||||
|
||||
## Clean
|
||||
clean:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "RevPi Commander"
|
||||
#define MyAppVersion "0.9.10rc5"
|
||||
#define MyAppVersion "0.9.10rc6"
|
||||
#define MyAppPublisher "Sven Sager"
|
||||
#define MyAppURL "https://revpimodio.org/"
|
||||
#define MyAppICO "data\revpicommander.ico"
|
||||
|
||||
8
setup.py
8
setup.py
@@ -1,8 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Setupscript for RevPiCommander."""
|
||||
"""Setup script for RevPiCommander."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2018 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from setuptools import find_namespace_packages, setup
|
||||
|
||||
@@ -32,7 +32,7 @@ setup(
|
||||
platforms=["all"],
|
||||
|
||||
url="https://revpimodio.org/revpipyplc/",
|
||||
license="GPLv3",
|
||||
license="GPLv2",
|
||||
author="Sven Sager",
|
||||
author_email="akira@narux.de",
|
||||
maintainer="Sven Sager",
|
||||
@@ -45,6 +45,6 @@ setup(
|
||||
"over the network.",
|
||||
keywords=["revpi", "revolution pi", "revpimodio", "plc"],
|
||||
classifiers=[
|
||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
||||
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -2,5 +2,6 @@
|
||||
"""Package: RevPiCommander."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__version__ = "0.9.10rc5"
|
||||
__license__ = "GPLv2"
|
||||
__package__ = "revpicommander"
|
||||
__version__ = "0.9.10rc6"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Start main application of this package."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
# If we are running from a wheel, add the wheel to sys.path
|
||||
if __package__ == "":
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Manager for ACL lists."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from re import compile
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Revolution Pi search with zeroconf."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import webbrowser
|
||||
from re import compile
|
||||
@@ -130,7 +130,7 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
|
||||
self.act_connect_xmlrpc.setVisible(True)
|
||||
|
||||
@staticmethod
|
||||
def _find_settings(address: str) -> list[RevPiSettings]:
|
||||
def _find_settings(address: str):
|
||||
"""Find all settings with known avahi_id."""
|
||||
return [
|
||||
revpi_setting
|
||||
@@ -258,8 +258,11 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
|
||||
return
|
||||
item = selected_items[0]
|
||||
|
||||
# Till we could not choose https / http we are using the ip address
|
||||
webbrowser.open("http://{0}/".format(item.data(WidgetData.address)))
|
||||
# We should use the hostname on macOS to let safari connect in link local mode (for linux nice too)
|
||||
webbrowser.open("http://{0}/".format(item.data(
|
||||
WidgetData.address if platform == "win32"
|
||||
else WidgetData.host_name_full
|
||||
)))
|
||||
|
||||
@QtCore.pyqtSlot(str, str, int, str, str)
|
||||
def on_avahi_added(self, avahi_id: str, server: str, port: int, conf_type: str, ip: str) -> None:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""File transfer system to handle QThreads."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from logging import getLogger
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Debug control widget to append to main window."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import pickle
|
||||
from xmlrpc.client import Binary, Fault, MultiCall, MultiCallIterator
|
||||
@@ -197,6 +197,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
|
||||
win = self.dict_windows[position]
|
||||
for io in self.dict_ios[io_type][position]: # type: list
|
||||
# ['name', bytelen, byte_address, 'bmk', bitaddress, 'byteorder', signed]
|
||||
# + wordorder since revpipyload 0.9.9
|
||||
value_procimg = bytes(ba_values[io[2]:io[2] + io[1]])
|
||||
if io[4] >= 0:
|
||||
# Bit-IO
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""One device of the Revolution Pi."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import struct
|
||||
|
||||
@@ -82,6 +82,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
bit_address = io[4]
|
||||
byteorder = io[5]
|
||||
signed = io[6]
|
||||
word_order = io[7] if len(io) > 7 else "ignored"
|
||||
|
||||
val = container.findChild(self.search_class, name)
|
||||
if val is not None:
|
||||
@@ -100,14 +101,15 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
lbl.setObjectName("lbl_".format(name))
|
||||
lbl.setStyleSheet(self.style_sheet)
|
||||
|
||||
val = self._create_widget(name, byte_length, bit_address, byteorder, signed, read_only)
|
||||
val = self._create_widget(name, byte_length, bit_address, byteorder, signed, read_only, word_order)
|
||||
val.setParent(container)
|
||||
layout.insertRow(counter, val, lbl)
|
||||
|
||||
self.splitter.setSizes([1, 1])
|
||||
|
||||
def _create_widget(
|
||||
self, name: str, byte_length: int, bit_address: int, byteorder: str, signed: bool, read_only: bool):
|
||||
self, name: str, byte_length: int, bit_address: int, byteorder: str, signed: bool, read_only: bool,
|
||||
word_order: str):
|
||||
"""Create widget in functions address space to use lambda functions."""
|
||||
if bit_address >= 0:
|
||||
val = QtWidgets.QCheckBox()
|
||||
@@ -160,6 +162,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
val.setProperty("bit_address", bit_address)
|
||||
val.setProperty("byte_length", byte_length)
|
||||
val.setProperty("signed", signed)
|
||||
val.setProperty("word_order", word_order)
|
||||
|
||||
self.__qwa[name] = val
|
||||
return val
|
||||
@@ -203,6 +206,9 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
act_as_number = QtWidgets.QAction(self.tr("as number"))
|
||||
men.addAction(act_as_number)
|
||||
men.addSeparator()
|
||||
else:
|
||||
act_as_text = None
|
||||
act_as_number = None
|
||||
|
||||
act_signed = QtWidgets.QAction(self.tr("signed"), men)
|
||||
act_signed.setCheckable(True)
|
||||
@@ -214,6 +220,14 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
act_byteorder.setChecked(sender.property("big_endian") or False)
|
||||
men.addAction(act_byteorder)
|
||||
|
||||
if sender.property("byte_length") > 2:
|
||||
act_wordorder = QtWidgets.QAction(self.tr("switch wordorder"))
|
||||
act_wordorder.setCheckable(True)
|
||||
act_wordorder.setChecked(sender.property("word_order") == "big")
|
||||
men.addAction(act_wordorder)
|
||||
else:
|
||||
act_wordorder = None
|
||||
|
||||
rc = men.exec(sender.mapToGlobal(point))
|
||||
if not rc:
|
||||
men.deleteLater()
|
||||
@@ -232,6 +246,8 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
sender.setMaximum(max_value)
|
||||
elif rc == act_byteorder:
|
||||
sender.setProperty("big_endian", act_byteorder.isChecked())
|
||||
elif rc == act_wordorder:
|
||||
sender.setProperty("word_order", "big" if act_wordorder.isChecked() else "little")
|
||||
|
||||
if sender.property("frm"):
|
||||
sender.setProperty("frm", "{0}{1}".format(
|
||||
@@ -239,11 +255,10 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
sender.property("struct_type").lower() if act_signed.isChecked()
|
||||
else sender.property("struct_type").upper()
|
||||
))
|
||||
elif sender.property("byte_length") > 4:
|
||||
if rc == act_as_text:
|
||||
sender.setProperty("struct_type", "text")
|
||||
elif rc == act_as_number:
|
||||
sender.setProperty("struct_type", "number")
|
||||
elif rc == act_as_text:
|
||||
sender.setProperty("struct_type", "text")
|
||||
elif rc == act_as_number:
|
||||
sender.setProperty("struct_type", "number")
|
||||
|
||||
self.set_value(sender.objectName(), actual_value)
|
||||
men.deleteLater()
|
||||
@@ -335,6 +350,10 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
:param just_last_value: Just set last value property
|
||||
"""
|
||||
child = self.__qwa[io_name]
|
||||
|
||||
if child.property("word_order") == "big" and type(value) == bytes:
|
||||
value = helper.swap_word_order(value)
|
||||
|
||||
if child.property("frm"):
|
||||
value = struct.unpack(child.property("frm"), value)[0]
|
||||
elif type(value) == bytes:
|
||||
@@ -349,6 +368,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
|
||||
).format(value, io_name)
|
||||
)
|
||||
if child.property("struct_type") == "number":
|
||||
# fixme: Crashs with too much bytes
|
||||
value = str(int.from_bytes(
|
||||
value,
|
||||
byteorder="big" if child.property("big_endian") else "little",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Helper functions for this application."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import pickle
|
||||
import socket
|
||||
@@ -11,6 +11,7 @@ from http.client import CannotSendRequest
|
||||
from os import environ, remove
|
||||
from os.path import exists
|
||||
from queue import Queue
|
||||
from re import search
|
||||
from threading import Lock
|
||||
from uuid import uuid4
|
||||
from xmlrpc.client import Binary, ServerProxy
|
||||
@@ -232,6 +233,8 @@ class ConnectionManager(QtCore.QThread):
|
||||
|
||||
self.pyload_version = (0, 0, 0)
|
||||
"""Version number of RevPiPyLoad 0.0.0 with <class 'int'> values."""
|
||||
self.pyload_version_str = ""
|
||||
"""Raw string of RevPyPyLoad version, could contain rc1 at the end."""
|
||||
self.xml_funcs = []
|
||||
"""Name list of all supported functions of RevPiPyLoad."""
|
||||
self.xml_mode = -1
|
||||
@@ -315,6 +318,7 @@ class ConnectionManager(QtCore.QThread):
|
||||
self.ssh_pass = ""
|
||||
|
||||
self.pyload_version = (0, 0, 0)
|
||||
self.pyload_version_str = ""
|
||||
self.xml_funcs.clear()
|
||||
self.xml_mode = -1
|
||||
|
||||
@@ -372,7 +376,9 @@ class ConnectionManager(QtCore.QThread):
|
||||
|
||||
# Load values and test connection to Revolution Pi
|
||||
try:
|
||||
pyload_version = tuple(map(int, sp.version().split(".")))
|
||||
ma = search(r"(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)", sp.version())
|
||||
pyload_version = int(ma.group("major")), int(ma.group("minor")), int(ma.group("patch"))
|
||||
pyload_version_str = ma.string
|
||||
xml_funcs = sp.system.listMethods()
|
||||
xml_mode = sp.xmlmodus()
|
||||
except Exception as e:
|
||||
@@ -382,24 +388,26 @@ class ConnectionManager(QtCore.QThread):
|
||||
if revpi_settings.ssh_use_tunnel:
|
||||
self.connect_error.emit(
|
||||
self.tr("Error"), self.tr(
|
||||
"Can not connect to RevPi XML-RPC Service through SSH tunnel! \n\n"
|
||||
"This could have the following reasons: The XML-RPC service is not "
|
||||
"running / not bind to localhost or the ACL permission is not set for "
|
||||
"127.0.0.1!!!"
|
||||
"Can not connect to RevPiPyLoad service through SSH tunnel!\n\n"
|
||||
"This could have the following reasons:\n"
|
||||
"- The RevPiPyLoad service is not running (activate it on your Revolution Pi)\n"
|
||||
"- The RevPiPyLoad XML-RPC service is NOT bind to localhost\n"
|
||||
"- The ACL permission is not set for 127.0.0.1!!!"
|
||||
),
|
||||
ConnectionFail.NO_XML_RPC,
|
||||
revpi_settings,
|
||||
)
|
||||
else:
|
||||
# todo: Change message, that user can use ssh
|
||||
self.connect_error.emit(
|
||||
self.tr("Error"), self.tr(
|
||||
"Can not connect to RevPi XML-RPC Service! \n\n"
|
||||
"This could have the following reasons: The RevPi is not "
|
||||
"online, the XML-RPC service is not running / bind to "
|
||||
"localhost or the ACL permission is not set for your "
|
||||
"IP!!!\n\nRun 'sudo revpipyload_secure_installation' on "
|
||||
"Revolution Pi to setup this function!"
|
||||
"Can not connect to RevPiPyLoad XML-RPC service! \n\n"
|
||||
"This could have the following reasons:\n"
|
||||
"- The Revolution Pi is not online\n"
|
||||
"- The RevPiPyLoad service is not running (activate it on your Revolution Pi)\n"
|
||||
"- The RevPiPyLoad XML-RPC service is bind to localhost, only\n"
|
||||
"- The ACL permission is not set for your IP!!!\n\n"
|
||||
"Use 'Connect via SSH' to use an encrypted connection or run "
|
||||
"'sudo revpipyload_secure_installation' on Revolution Pi to setup direct remote access!"
|
||||
),
|
||||
ConnectionFail.NO_XML_RPC,
|
||||
revpi_settings,
|
||||
@@ -410,6 +418,7 @@ class ConnectionManager(QtCore.QThread):
|
||||
self.settings = revpi_settings
|
||||
self.ssh_pass = ssh_pass
|
||||
self.pyload_version = pyload_version
|
||||
self.pyload_version_str = pyload_version_str
|
||||
self.xml_funcs = xml_funcs
|
||||
self.xml_mode = xml_mode
|
||||
|
||||
@@ -676,6 +685,16 @@ def all_revpi_settings() -> [RevPiSettings]:
|
||||
return [RevPiSettings(i) for i in range(count_settings)]
|
||||
|
||||
|
||||
def swap_word_order(bytes_to_swap) -> bytes:
|
||||
"""Swap word order of an even byte array."""
|
||||
array_lenght = len(bytes_to_swap)
|
||||
swap_array = bytearray(bytes_to_swap)
|
||||
for i in range(0, array_lenght // 2, 2):
|
||||
swap_array[-i - 2:array_lenght - i], swap_array[i:i + 2] = \
|
||||
swap_array[i:i + 2], swap_array[-i - 2:array_lenght - i]
|
||||
return bytes(swap_array)
|
||||
|
||||
|
||||
def import_old_settings():
|
||||
"""Try to import saved connections from old storage to new setting object."""
|
||||
if settings.value("revpicommander/imported_settings", False, type=bool):
|
||||
|
||||
Binary file not shown.
@@ -93,7 +93,7 @@ Nicht gespeicherte Änderunen gehen verloren</translation>
|
||||
<translation type="obsolete">Der ausgewählte RevPi ist schon in der Verbindungsliste als '{0}'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../avahisearch.py" line="285"/>
|
||||
<location filename="../avahisearch.py" line="288"/>
|
||||
<source> over SSH</source>
|
||||
<translation> über SSH</translation>
|
||||
</message>
|
||||
@@ -229,62 +229,62 @@ Wurde eine Hardwarekonfiguration in piCtory erzeugt?</translation>
|
||||
<context>
|
||||
<name>ConnectionManager</name>
|
||||
<message>
|
||||
<location filename="../helper.py" line="524"/>
|
||||
<location filename="../helper.py" line="533"/>
|
||||
<source>SIMULATING</source>
|
||||
<translation>SIMULATION</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="527"/>
|
||||
<location filename="../helper.py" line="536"/>
|
||||
<source>NOT CONNECTED</source>
|
||||
<translation>NICHT VERBUNDEN</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="544"/>
|
||||
<location filename="../helper.py" line="553"/>
|
||||
<source>SERVER ERROR</source>
|
||||
<translation>SERVER FEHLER</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="569"/>
|
||||
<location filename="../helper.py" line="578"/>
|
||||
<source>RUNNING</source>
|
||||
<translation>LÄUFT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="571"/>
|
||||
<location filename="../helper.py" line="580"/>
|
||||
<source>PLC FILE NOT FOUND</source>
|
||||
<translation>SPS PROGRAMM NICHT GEFUNDEN</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="573"/>
|
||||
<location filename="../helper.py" line="582"/>
|
||||
<source>NOT RUNNING (NO STATUS)</source>
|
||||
<translation>LÄUFT NICHT (KEIN STATUS)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="575"/>
|
||||
<location filename="../helper.py" line="584"/>
|
||||
<source>PROGRAM KILLED</source>
|
||||
<translation>PROGRAMM GETÖTET</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="577"/>
|
||||
<location filename="../helper.py" line="586"/>
|
||||
<source>PROGRAM TERMED</source>
|
||||
<translation>PROGRAMM BEENDET</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="579"/>
|
||||
<location filename="../helper.py" line="588"/>
|
||||
<source>NOT RUNNING</source>
|
||||
<translation>LÄUFT NICHT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="581"/>
|
||||
<location filename="../helper.py" line="590"/>
|
||||
<source>FINISHED WITH CODE {0}</source>
|
||||
<translation>BEENDET MIT CODE {0}</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="395"/>
|
||||
<location filename="../helper.py" line="401"/>
|
||||
<source>Error</source>
|
||||
<translation>Fehler</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="347"/>
|
||||
<location filename="../helper.py" line="351"/>
|
||||
<source>The combination of username and password was rejected from the SSH server.
|
||||
|
||||
Try again.</source>
|
||||
@@ -293,7 +293,7 @@ Try again.</source>
|
||||
Bitte erneut versuchen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="359"/>
|
||||
<location filename="../helper.py" line="363"/>
|
||||
<source>Could not establish a SSH connection to server:
|
||||
|
||||
{0}</source>
|
||||
@@ -308,7 +308,7 @@ Bitte erneut versuchen.</translation>
|
||||
This could have the following reasons: The RevPi is not online, the XML-RPC service is not running / bind to localhost or the ACL permission is not set for your IP!!!
|
||||
|
||||
Run 'sudo revpipyload_secure_installation' on Revolution Pi to setup this function!</source>
|
||||
<translation>Kann keine Verbindung zum RevPi XML-RPC Dienst herstellen!
|
||||
<translation type="obsolete">Kann keine Verbindung zum RevPi XML-RPC Dienst herstellen!
|
||||
|
||||
Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML-RPC Dienst läuft nicht / ist an localhost gebunden order die Berechtigungen sind nicht für diese IP gesetzt!!!
|
||||
|
||||
@@ -328,10 +328,65 @@ Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / is
|
||||
<source>Can not connect to RevPi XML-RPC Service through SSH tunnel!
|
||||
|
||||
This could have the following reasons: The XML-RPC service is not running / not bind to localhost or the ACL permission is not set for 127.0.0.1!!!</source>
|
||||
<translation>Kann keine Verbindung zum RevPi XML-RPC Dienst über SSH herstellen!
|
||||
<translation type="obsolete">Kann keine Verbindung zum RevPi XML-RPC Dienst über SSH herstellen!
|
||||
|
||||
Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / ist nicht an localhost gebunden order die Berechtigungen sind nicht für 127.0.0.1 gesetzt!!!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="389"/>
|
||||
<source>Can not connect to RevPiPyLoad service through SSH tunnel!
|
||||
|
||||
This could have the following reasons:
|
||||
- The RevPiPyLoad service is not running (activate it on your Revolution Pi)
|
||||
- The RevPiPyLoad XML-RPC service is NOT bind to localhost
|
||||
- The ACL permission is not set for 127.0.0.1!!!
|
||||
|
||||
</source>
|
||||
<translation type="obsolete">Kann keine Verbindung zum RevPiPyLoad Dienst über SSH herstellen!
|
||||
|
||||
Das kann eine der folgenden Ursachen haben:
|
||||
- Der RevPiPyLoad Dienst läuft nicht (aktiviere Diesen auf dem Revolution Pi)
|
||||
- Der RevPiPyLoad XML-RPC Dienst ist NICHT an localhost gebunden
|
||||
- Die Berechtigungen sind nicht für 127.0.0.1 gesetzt!!!
|
||||
|
||||
Benutze "Über SSH verbinden" um eine verschlüsselte Verbindung aufzubauen oder führe 'sudo revpipyload_secure_installation' auf dem Revolution Pi aus, um eine direkte Verbindung zu konfigurieren!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="401"/>
|
||||
<source>Can not connect to RevPiPyLoad XML-RPC service!
|
||||
|
||||
This could have the following reasons:
|
||||
- The Revolution Pi is not online
|
||||
- The RevPiPyLoad service is not running (activate it on your Revolution Pi)
|
||||
- The RevPiPyLoad XML-RPC service is bind to localhost, only
|
||||
- The ACL permission is not set for your IP!!!
|
||||
|
||||
Use 'Connect via SSH' to use an encrypted connection or run 'sudo revpipyload_secure_installation' on Revolution Pi to setup direct remote access!</source>
|
||||
<translation>Kann keine Verbindung zum RevPiPyLoad XML-RPC Dienst herstellen!
|
||||
|
||||
Das kann eine der folgenden Ursachen haben:
|
||||
- Der Revolution Pi ist nicht online
|
||||
- Der RevPiPyLoad Dienst läuft nicht (aktiviere Diesen auf dem Revolution Pi)
|
||||
- Der RevPiPyLoad XML-RPC Dienst ist nur an localhost gebunden
|
||||
- Die Berechtigungen sind nicht für diese IP gesetzt!!!
|
||||
|
||||
Benutze "Über SSH verbinden" um eine verschlüsselte Verbindung aufzubauen oder führe 'sudo revpipyload_secure_installation' auf dem Revolution Pi aus, um eine direkte Verbindung zu konfigurieren!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../helper.py" line="389"/>
|
||||
<source>Can not connect to RevPiPyLoad service through SSH tunnel!
|
||||
|
||||
This could have the following reasons:
|
||||
- The RevPiPyLoad service is not running (activate it on your Revolution Pi)
|
||||
- The RevPiPyLoad XML-RPC service is NOT bind to localhost
|
||||
- The ACL permission is not set for 127.0.0.1!!!</source>
|
||||
<translation>Kann keine Verbindung zum RevPiPyLoad Dienst über SSH herstellen!
|
||||
|
||||
Das kann eine der folgenden Ursachen haben:
|
||||
- Der RevPiPyLoad Dienst läuft nicht (aktiviere Diesen auf dem Revolution Pi)
|
||||
- Der RevPiPyLoad XML-RPC Dienst ist NICHT an localhost gebunden
|
||||
- Die Berechtigungen sind nicht für 127.0.0.1 gesetzt!!!</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DebugControl</name>
|
||||
@@ -346,24 +401,24 @@ Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / is
|
||||
<translation>Fehler bei Werteempfang von RevPi.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugcontrol.py" line="228"/>
|
||||
<location filename="../debugcontrol.py" line="229"/>
|
||||
<source>Auto update values...</source>
|
||||
<translation>Werte automatisch aktualisiert...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugcontrol.py" line="230"/>
|
||||
<location filename="../debugcontrol.py" line="231"/>
|
||||
<source>Values updated...</source>
|
||||
<translation>Werte aktualisiert...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugcontrol.py" line="267"/>
|
||||
<location filename="../debugcontrol.py" line="268"/>
|
||||
<source>Error set value of device '{0}' Output '{1}': {2}
|
||||
</source>
|
||||
<translation>Fehler beim Setzen des Ausgangs '{1}' auf Modul '{0}': {2}
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugcontrol.py" line="276"/>
|
||||
<location filename="../debugcontrol.py" line="277"/>
|
||||
<source>Error</source>
|
||||
<translation>Fehler</translation>
|
||||
</message>
|
||||
@@ -371,35 +426,40 @@ Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / is
|
||||
<context>
|
||||
<name>DebugIos</name>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="207"/>
|
||||
<location filename="../debugios.py" line="213"/>
|
||||
<source>signed</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="212"/>
|
||||
<location filename="../debugios.py" line="218"/>
|
||||
<source>big_endian</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="201"/>
|
||||
<location filename="../debugios.py" line="204"/>
|
||||
<source>as text</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="203"/>
|
||||
<location filename="../debugios.py" line="206"/>
|
||||
<source>as number</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="346"/>
|
||||
<location filename="../debugios.py" line="365"/>
|
||||
<source>Can not use format text</source>
|
||||
<translation>Formatierung nicht möglich</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="346"/>
|
||||
<location filename="../debugios.py" line="365"/>
|
||||
<source>Can not convert bytes {0} to a text for IO '{1}'. Switch to number format instead!</source>
|
||||
<translation>Kann bytes {0} für '{1}' nicht in Text konvertieren. Wechseln Sie auf Nummernformat!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../debugios.py" line="224"/>
|
||||
<source>switch wordorder</source>
|
||||
<translation>Wordorder tauschen</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MqttManager</name>
|
||||
@@ -429,86 +489,86 @@ Ungesicherte Änderungen gehen verloren.</translation>
|
||||
<context>
|
||||
<name>RevPiCommander</name>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="306"/>
|
||||
<location filename="../revpicommander.py" line="308"/>
|
||||
<source>Simulator started...</source>
|
||||
<translation>Simulator gestartet...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="315"/>
|
||||
<location filename="../revpicommander.py" line="317"/>
|
||||
<source>Can not start...</source>
|
||||
<translation>Kann nicht gestartet werden...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="508"/>
|
||||
<location filename="../revpicommander.py" line="510"/>
|
||||
<source>Warning</source>
|
||||
<translation>Warnung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="331"/>
|
||||
<location filename="../revpicommander.py" line="333"/>
|
||||
<source>This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1.</source>
|
||||
<translation>Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="381"/>
|
||||
<location filename="../revpicommander.py" line="383"/>
|
||||
<source>XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog!</source>
|
||||
<translation>XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="535"/>
|
||||
<location filename="../revpicommander.py" line="537"/>
|
||||
<source>Error</source>
|
||||
<translation>Fehler</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="361"/>
|
||||
<location filename="../revpicommander.py" line="363"/>
|
||||
<source>The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi!</source>
|
||||
<translation>Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="414"/>
|
||||
<location filename="../revpicommander.py" line="416"/>
|
||||
<source>Question</source>
|
||||
<translation>Frage</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="414"/>
|
||||
<location filename="../revpicommander.py" line="416"/>
|
||||
<source>Are you sure to reset piControl?
|
||||
The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs!</source>
|
||||
<translation>Soll piControl wirklich zurückgesetzt werden?
|
||||
Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="427"/>
|
||||
<location filename="../revpicommander.py" line="429"/>
|
||||
<source>Success</source>
|
||||
<translation>Erfolgreich</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="427"/>
|
||||
<location filename="../revpicommander.py" line="429"/>
|
||||
<source>piControl reset executed successfully</source>
|
||||
<translation>piControl wurde erfolgreich zurückgesetzt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="434"/>
|
||||
<location filename="../revpicommander.py" line="436"/>
|
||||
<source>piControl reset could not be executed successfully</source>
|
||||
<translation>piControl konnte nicht zurückgesetzt werden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="482"/>
|
||||
<location filename="../revpicommander.py" line="484"/>
|
||||
<source>Reset to piCtory defaults...</source>
|
||||
<translation>Standardwerte von piCtory laden...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="508"/>
|
||||
<location filename="../revpicommander.py" line="510"/>
|
||||
<source>The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0.</source>
|
||||
<translation>Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="520"/>
|
||||
<location filename="../revpicommander.py" line="522"/>
|
||||
<source>Can not load this function, because your ACL level is to low!
|
||||
You need at least level 1 to read or level 3 to write.</source>
|
||||
<translation>Für diese Funktion ist das Berechtigungslevel zu gering!
|
||||
Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="535"/>
|
||||
<location filename="../revpicommander.py" line="537"/>
|
||||
<source>Can not load piCtory configuration.
|
||||
Did you create a hardware configuration? Please check this in piCtory!</source>
|
||||
<translation>Kann piCtory Konfiguration nicht laden.
|
||||
@@ -528,7 +588,7 @@ Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML
|
||||
Führe 'sudo revpipyload_secure_installation' auf dem Revolution Pi aus um diese Funktion zu konfigurieren!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="306"/>
|
||||
<location filename="../revpicommander.py" line="308"/>
|
||||
<source>The simulator is running!
|
||||
|
||||
You can work with this simulator if your call RevPiModIO with this additional parameters:
|
||||
@@ -545,39 +605,39 @@ configrsc={1}
|
||||
Dies kann aus der Textbox oben kopiert werden.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="315"/>
|
||||
<location filename="../revpicommander.py" line="317"/>
|
||||
<source>Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for '{0}'.</source>
|
||||
<translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für '{0}'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="482"/>
|
||||
<location filename="../revpicommander.py" line="484"/>
|
||||
<source>Do you want to reset your process image to {0} values?
|
||||
You have to stop other RevPiModIO programs before doing that, because they could reset the outputs.</source>
|
||||
<translation>Soll das virtuelle Prozessabbild auf {0} zurückgesetzt werden?
|
||||
Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="482"/>
|
||||
<location filename="../revpicommander.py" line="484"/>
|
||||
<source>zero</source>
|
||||
<translation>null</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="482"/>
|
||||
<location filename="../revpicommander.py" line="484"/>
|
||||
<source>piCtory default</source>
|
||||
<translation>piCtory Standardwerte</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="236"/>
|
||||
<location filename="../revpicommander.py" line="238"/>
|
||||
<source>Revolution Pi connected!</source>
|
||||
<translation>Revolution Pi verbunden!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="273"/>
|
||||
<location filename="../revpicommander.py" line="275"/>
|
||||
<source>Connecting...</source>
|
||||
<translation>Verbinde...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpicommander.py" line="236"/>
|
||||
<location filename="../revpicommander.py" line="238"/>
|
||||
<source>Establish a connection to the Revolution Pi...</source>
|
||||
<translation>Baue eine Verbindung zum Revolution Pi auf...</translation>
|
||||
</message>
|
||||
@@ -738,12 +798,12 @@ Wählen Sie 'Ja' zum Überschreiben, 'Nein' um nur fehlende
|
||||
<context>
|
||||
<name>RevPiOption</name>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="300"/>
|
||||
<location filename="../revpioption.py" line="342"/>
|
||||
<source>Question</source>
|
||||
<translation>Frage</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="149"/>
|
||||
<location filename="../revpioption.py" line="185"/>
|
||||
<source>The settings will be set on the Revolution Pi now.
|
||||
|
||||
ACL changes and service settings are applied immediately.</source>
|
||||
@@ -752,76 +812,76 @@ ACL changes and service settings are applied immediately.</source>
|
||||
Berechtigungseinstellungen werden sofort gesetzt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="196"/>
|
||||
<location filename="../revpioption.py" line="232"/>
|
||||
<source>Error</source>
|
||||
<translation>Fehler</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="196"/>
|
||||
<location filename="../revpioption.py" line="232"/>
|
||||
<source>The settings could not be saved on the Revolution Pi!
|
||||
Try to save the values one mor time and check the log files of RevPiPyLoad if the error rises again.</source>
|
||||
<translation>Die Einstellungen konnten nicht auf dem Revolution Pi gespeichert werden!
|
||||
Versuche es erneut und prüfe die Logdateien von RevPiPyLoad, wenn der Fehler erneut auftritt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="206"/>
|
||||
<location filename="../revpioption.py" line="242"/>
|
||||
<source>Do you really want to quit?
|
||||
Unsaved changes will be lost.</source>
|
||||
<translation>Soll das Fenster wirklich geschlossen werden?
|
||||
Ungesicherte Änderungen gehen verloren.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="249"/>
|
||||
<location filename="../revpioption.py" line="291"/>
|
||||
<source>running</source>
|
||||
<translation>läuft</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="249"/>
|
||||
<location filename="../revpioption.py" line="291"/>
|
||||
<source>stopped</source>
|
||||
<translation>angehalten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="240"/>
|
||||
<location filename="../revpioption.py" line="282"/>
|
||||
<source>The MQTT service is not available on your RevPiPyLoad version.</source>
|
||||
<translation>MQTT ist in der RevPiPyLoad Version nicht verfügbar.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="280"/>
|
||||
<location filename="../revpioption.py" line="322"/>
|
||||
<source>read only</source>
|
||||
<translation>Nur lesen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="280"/>
|
||||
<location filename="../revpioption.py" line="322"/>
|
||||
<source>read and write</source>
|
||||
<translation>lesen und schreiben</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="300"/>
|
||||
<location filename="../revpioption.py" line="342"/>
|
||||
<source>Are you sure you want to deactivate the XML-RPC server? You will NOT be able to access the Revolution Pi with this program after saving the options!</source>
|
||||
<translation>Willst du den XML-RPC Server wirklich deaktivieren? Du wirst dich NICHT mehr mit diesem Programm zum Revolution Pi verbinden können!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="312"/>
|
||||
<location filename="../revpioption.py" line="354"/>
|
||||
<source>Start/Stop PLC program and read logs</source>
|
||||
<translation>SPS Programm starten/stoppen und Logs lesen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="312"/>
|
||||
<location filename="../revpioption.py" line="354"/>
|
||||
<source>+ read IOs in watch mode</source>
|
||||
<translation>+ EAs in SPS Betrachter lesen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="312"/>
|
||||
<location filename="../revpioption.py" line="354"/>
|
||||
<source>+ read properties and download PLC program</source>
|
||||
<translation>+ Einstellungen lesen und SPS Programm herunterladen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="312"/>
|
||||
<location filename="../revpioption.py" line="354"/>
|
||||
<source>+ upload PLC program</source>
|
||||
<translation>+ SPS Programm hochladen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpioption.py" line="312"/>
|
||||
<location filename="../revpioption.py" line="354"/>
|
||||
<source>+ set properties</source>
|
||||
<translation>+ Einstellungen ändern</translation>
|
||||
</message>
|
||||
@@ -834,19 +894,19 @@ Ungesicherte Änderungen gehen verloren.</translation>
|
||||
<translation type="obsolete">Neue Verbindung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpiplclist.py" line="282"/>
|
||||
<location filename="../revpiplclist.py" line="301"/>
|
||||
<source>Question</source>
|
||||
<translation>Frage</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpiplclist.py" line="121"/>
|
||||
<location filename="../revpiplclist.py" line="132"/>
|
||||
<source>Do you really want to quit?
|
||||
Unsaved changes will be lost.</source>
|
||||
<translation>Soll das Fenster wirklich geschlossen werden?
|
||||
Ungesicherte Änderungen gehen verloren.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpiplclist.py" line="282"/>
|
||||
<location filename="../revpiplclist.py" line="301"/>
|
||||
<source>If you remote this folder, all containing elements will be removed, too.
|
||||
|
||||
Do you want to delete folder and all elements?</source>
|
||||
@@ -855,7 +915,7 @@ Do you want to delete folder and all elements?</source>
|
||||
Wollen sie den Ordner und alle Elemente löschen?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../revpiplclist.py" line="324"/>
|
||||
<location filename="../revpiplclist.py" line="341"/>
|
||||
<source>New folder</source>
|
||||
<translation>Neuer Ordner</translation>
|
||||
</message>
|
||||
@@ -1240,12 +1300,12 @@ Dies ist kein Fehler von RevPi Commander.</translation>
|
||||
<translation>Revolution Pi Verbindungen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="194"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="197"/>
|
||||
<source>Connection name</source>
|
||||
<translation>Verbindungsname</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="199"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="202"/>
|
||||
<source>Address</source>
|
||||
<translation>Adresse</translation>
|
||||
</message>
|
||||
@@ -1290,22 +1350,22 @@ Dies ist kein Fehler von RevPi Commander.</translation>
|
||||
<translation>Verbindung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="122"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="125"/>
|
||||
<source>Over SSH</source>
|
||||
<translation>Über SSH</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="128"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="131"/>
|
||||
<source>Connect over SSH tunnel:</source>
|
||||
<translation>Über SSH Tunnel verbinden:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="145"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="148"/>
|
||||
<source>SSH port:</source>
|
||||
<translation>SSH Port:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="162"/>
|
||||
<location filename="../../../ui_dev/revpiplclist.ui" line="165"/>
|
||||
<source>SSH user name:</source>
|
||||
<translation>SSH Benutzername:</translation>
|
||||
</message>
|
||||
@@ -1387,7 +1447,9 @@ Dies ist kein Fehler von RevPi Commander.</translation>
|
||||
<source>The base topic is the first part of any mqtt topic, the Revolution Pi will publish. You can use any character includig '/' to structure the messages on your broker.
|
||||
|
||||
For example: revpi0000/data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Der Basistopic wird allen MQTT Topics vorangestellt, welche der Revolution Pi veröffentlicht. Es können alle Zeichen inklusive '/' verwendet werden, um die Nachrichten auf dem Broker zu strukturieren.
|
||||
|
||||
Zum Beispiel: revpi0000/data</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/mqttmanager.ui" line="80"/>
|
||||
@@ -1404,7 +1466,9 @@ For example: revpi0000/data</source>
|
||||
<source>The Revolution Pi will subscribe a topic on which your mqtt client can publish messages with the new io value as payload.
|
||||
|
||||
Publish values with topic: [basetopic]/set/[outputname]</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Der Revolution Pi abonniert ein Topic, auf dem die MQTT Clients über den Inhalt einer Nachricht einen neuen Ausgangswert setzen können.
|
||||
|
||||
Sende Werte mit Topic: [basistopic]/set/[ausgangsname]</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/mqttmanager.ui" line="175"/>
|
||||
@@ -1671,22 +1735,17 @@ Publish values with topic: [basetopic]/set/[outputname]</source>
|
||||
<translation>RevPi Python SPS - Commander</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiinfo.ui" line="69"/>
|
||||
<source><html><head/><body><p><a href="https://revpimodio.org/"><span style=" text-decoration: underline; color:#0000ff;">https://revpimodio.org/</span></a></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiinfo.ui" line="96"/>
|
||||
<location filename="../../../ui_dev/revpiinfo.ui" line="86"/>
|
||||
<source>Version:</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/revpiinfo.ui" line="126"/>
|
||||
<location filename="../../../ui_dev/revpiinfo.ui" line="116"/>
|
||||
<source>RevPiModIO, RevPiPyLoad and RevPiPyControl are community driven projects. They are all free and open source software.
|
||||
All of them comes with ABSOLUTELY NO WARRANTY, to the extent permitted by
|
||||
applicable law.
|
||||
|
||||
(c) Sven Sager, License: GPLv3</source>
|
||||
(c) Sven Sager, License: GPLv2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
@@ -1745,7 +1804,7 @@ applicable law.
|
||||
<message>
|
||||
<location filename="../../../ui_dev/avahisearch.ui" line="140"/>
|
||||
<source>Connect via SSH (recommended)</source>
|
||||
<translation>Über SSH verbinden (empfholen)</translation>
|
||||
<translation>Über SSH verbinden (empfohlen)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../ui_dev/avahisearch.ui" line="143"/>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from PyQt5 import QtGui, QtWidgets
|
||||
|
||||
@@ -61,7 +61,7 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
|
||||
return True
|
||||
|
||||
def accept(self) -> None:
|
||||
"""Save values to master dict."""
|
||||
"""Save values to value dict."""
|
||||
self.dc["mqttbasetopic"] = self.txt_basetopic.text()
|
||||
self.dc["mqttsendinterval"] = self.sbx_sendinterval.value()
|
||||
self.dc["mqttsend_on_event"] = int(self.cbx_send_on_event.isChecked())
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Global program initialization."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "LGPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import logging
|
||||
import sys
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2018 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import webbrowser
|
||||
from os.path import dirname, join
|
||||
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
from revpicommander.backgroundworker import BackgroundWaiter
|
||||
from . import __version__
|
||||
from . import helper
|
||||
from . import proginit as pi
|
||||
from . import revpilogfile
|
||||
from .avahisearch import AvahiSearch
|
||||
from .backgroundworker import BackgroundWaiter
|
||||
from .debugcontrol import DebugControl
|
||||
from .helper import ConnectionFail, RevPiSettings
|
||||
from .revpifiles import RevPiFiles
|
||||
@@ -215,6 +215,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
|
||||
parent_menu = self.men_connections
|
||||
|
||||
display_name = settings.name
|
||||
if settings.name != settings.address:
|
||||
display_name += " [{0}]".format(settings.address)
|
||||
if settings.ssh_use_tunnel:
|
||||
display_name += " (SSH)"
|
||||
|
||||
@@ -402,8 +404,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
|
||||
@QtCore.pyqtSlot()
|
||||
def on_act_pictory_triggered(self):
|
||||
"""Open piCtory in default browser of operating system."""
|
||||
if helper.cm.address:
|
||||
webbrowser.open("http://{0}/".format(helper.cm.address))
|
||||
if helper.cm.settings.address:
|
||||
webbrowser.open("http://{0}/".format(helper.cm.settings.address))
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def on_act_reset_triggered(self):
|
||||
@@ -548,6 +550,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
|
||||
|
||||
|
||||
def main() -> int:
|
||||
"""Entry point for RevPiCommander."""
|
||||
from sys import argv
|
||||
|
||||
if hasattr(QtCore.Qt, 'AA_EnableHighDpiScaling'):
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""File manager for up und download PLC program."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import gzip
|
||||
import os
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Program information of local an remote system."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
@@ -24,7 +24,7 @@ class RevPiInfo(QtWidgets.QDialog, Ui_diag_revpiinfo):
|
||||
|
||||
def exec(self) -> int:
|
||||
self.lbl_version_pyload.setText(
|
||||
"{0}.{1}.{2}".format(*helper.cm.pyload_version)
|
||||
helper.cm.pyload_version_str
|
||||
if helper.cm.connected else "-"
|
||||
)
|
||||
self._load_lst_files()
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""View log files from Revolution Pi."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from enum import IntEnum
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""RevPiPyLoad options window."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
@@ -22,9 +22,10 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.setFixedSize(self.size())
|
||||
|
||||
self.dc = {}
|
||||
self.acl_plcslave = ""
|
||||
self.acl_plcserver = ""
|
||||
self.acl_xmlrpc = ""
|
||||
self.mrk_xml_ask = True
|
||||
self.wrong_names = False
|
||||
|
||||
self._dict_mqttsettings = {
|
||||
"mqttbasetopic": "revpi01",
|
||||
@@ -56,7 +57,7 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.cbx_zeroonerror.setEnabled(allow)
|
||||
self.cbb_replace_io.setEnabled(allow)
|
||||
self.txt_replace_io.setEnabled(allow and self.cbb_replace_io.currentIndex() == 3)
|
||||
self.cbx_plcslave.setEnabled(allow)
|
||||
self.cbx_plcserver.setEnabled(allow)
|
||||
self.cbx_mqtt.setEnabled(allow)
|
||||
self.cbx_xmlrpc.setEnabled(allow)
|
||||
|
||||
@@ -85,8 +86,8 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.cbb_reset_driver_action.currentIndex() != self.dc.get("reset_driver_action", 2) or
|
||||
# todo: self.dc.get("rtlevel", 2)
|
||||
|
||||
int(self.cbx_plcslave.isChecked()) != self.dc.get("plcslave", 0) or
|
||||
self.acl_plcslave != self.dc.get("plcslaveacl", "") or
|
||||
int(self.cbx_plcserver.isChecked()) != self.dc.get("plcserver", 0) or
|
||||
self.acl_plcserver != self.dc.get("plcserveracl", "") or
|
||||
|
||||
int(self.cbx_mqtt.isChecked()) != self.dc.get("mqtt", 0) or
|
||||
self._changesdone_mqtt() or
|
||||
@@ -120,8 +121,8 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.cbx_zeroonerror.setChecked(bool(self.dc.get("zeroonerror", 0)))
|
||||
self.txt_replace_io.setText(self.dc.get("replace_ios", ""))
|
||||
self.cbb_reset_driver_action.setCurrentIndex(self.dc.get("reset_driver_action", 2))
|
||||
self.cbx_plcslave.setChecked(bool(self.dc.get("plcslave", 0)))
|
||||
self.acl_plcslave = self.dc.get("plcslaveacl", "")
|
||||
self.cbx_plcserver.setChecked(bool(self.dc.get("plcserver", 0)))
|
||||
self.acl_plcserver = self.dc.get("plcserveracl", "")
|
||||
self.cbx_mqtt.setChecked(bool(self.dc.get("mqtt", 0)))
|
||||
self.cbx_xmlrpc.setChecked(bool(self.dc.get("xmlrpc", 0)))
|
||||
self.acl_xmlrpc = self.dc.get("xmlrpcacl", "")
|
||||
@@ -141,6 +142,41 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
if key in self.dc:
|
||||
self._dict_mqttsettings[key] = self.dc[key]
|
||||
|
||||
def _translate_wrong_names(self) -> dict:
|
||||
"""
|
||||
Translate settings values of revpipyload < 0.10.0.
|
||||
|
||||
With RevPiPyLoad 0.10.0 we replaced the words master-slave with
|
||||
client-server. Unfortunately we cannot expect that everyone will be
|
||||
able to switch to the new version of RevPiPyLoad immediately.
|
||||
Therefore, for a few versions of this software, we need to do a
|
||||
translation of the values.
|
||||
|
||||
This function will translate the self.dc always to the new values and
|
||||
return a copy of it with new or old values, depending on previous
|
||||
detections.
|
||||
|
||||
:return: Settings with wrong values, if detected in previous calls
|
||||
"""
|
||||
name_mappings = (
|
||||
("plcslave", "plcserver"),
|
||||
("plcslaveacl", "plcserveracl"),
|
||||
)
|
||||
for wrong, right in name_mappings:
|
||||
if wrong in self.dc:
|
||||
self.wrong_names = True
|
||||
self.dc[right] = self.dc[wrong]
|
||||
del self.dc[wrong]
|
||||
|
||||
translated_settings = self.dc.copy()
|
||||
if self.wrong_names:
|
||||
for wrong, right in name_mappings:
|
||||
if right in translated_settings:
|
||||
translated_settings[wrong] = self.dc[right]
|
||||
del translated_settings[right]
|
||||
|
||||
return translated_settings
|
||||
|
||||
def accept(self) -> None:
|
||||
if not self._changesdone():
|
||||
super(RevPiOption, self).accept()
|
||||
@@ -164,9 +200,9 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.dc["zeroonerror"] = int(self.cbx_zeroonerror.isChecked())
|
||||
self.dc["replace_ios"] = self.txt_replace_io.text()
|
||||
|
||||
# PLCSlave Settings
|
||||
self.dc["plcslave"] = int(self.cbx_plcslave.isChecked())
|
||||
self.dc["plcslaveacl"] = self.acl_plcslave
|
||||
# PLCServer Settings
|
||||
self.dc["plcserver"] = int(self.cbx_plcserver.isChecked())
|
||||
self.dc["plcserveracl"] = self.acl_plcserver
|
||||
|
||||
# MQTT Settings
|
||||
self.dc["mqtt"] = int(self.cbx_mqtt.isChecked())
|
||||
@@ -186,7 +222,7 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.dc["xmlrpcacl"] = self.acl_xmlrpc
|
||||
|
||||
saved = helper.cm.call_remote_function(
|
||||
"set_config", self.dc, ask,
|
||||
"set_config", self._translate_wrong_names(), ask,
|
||||
default_value=False
|
||||
)
|
||||
|
||||
@@ -223,14 +259,20 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
if len(self.dc) == 0:
|
||||
return QtWidgets.QDialog.Rejected
|
||||
|
||||
self.wrong_names = False
|
||||
self._translate_wrong_names()
|
||||
|
||||
self._load_settings()
|
||||
self._apply_acl()
|
||||
|
||||
running = helper.cm.call_remote_function("plcslaverunning", default_value=False)
|
||||
self.lbl_slave_status.setText(
|
||||
running = helper.cm.call_remote_function(
|
||||
"plcslaverunning" if self.wrong_names else "plcserverrunning",
|
||||
default_value=False
|
||||
)
|
||||
self.lbl_server_status.setText(
|
||||
self.tr("running") if running else self.tr("stopped")
|
||||
)
|
||||
self.lbl_slave_status.setStyleSheet(
|
||||
self.lbl_server_status.setStyleSheet(
|
||||
"color: green" if running else "color: red"
|
||||
)
|
||||
|
||||
@@ -275,15 +317,15 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
|
||||
self.txt_replace_io.setEnabled(index == 3)
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def on_btn_aclplcslave_clicked(self):
|
||||
def on_btn_aclplcserver_clicked(self):
|
||||
"""Start ACL manager to edit ACL entries."""
|
||||
self.diag_aclmanager.setup_acl_manager(self.acl_plcslave, {
|
||||
self.diag_aclmanager.setup_acl_manager(self.acl_plcserver, {
|
||||
0: self.tr("read only"),
|
||||
1: self.tr("read and write"),
|
||||
})
|
||||
self.diag_aclmanager.read_only = helper.cm.xml_mode < 4
|
||||
if self.diag_aclmanager.exec() == QtWidgets.QDialog.Accepted:
|
||||
self.acl_plcslave = self.diag_aclmanager.get_acl()
|
||||
self.acl_plcserver = self.diag_aclmanager.get_acl()
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def on_btn_mqtt_clicked(self):
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Saved connections of Revolution Pi devices."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from enum import IntEnum
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Revolution Pi PLC program configuration."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import gzip
|
||||
import os
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Simulator for piControl."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from os import W_OK, access
|
||||
from os.path import basename, dirname, exists, join
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
"""Package of ssh tunnel connections."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
@@ -7,7 +7,7 @@ GitHub https://github.com/paramiko/paramiko/blob/main/demos/forward.py
|
||||
"""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
import select
|
||||
from socketserver import BaseRequestHandler, ThreadingTCPServer
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Authentication dialog for SSH."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
from logging import getLogger
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
"""Package of compiled Qt ui files."""
|
||||
__author__ = "Sven Sager"
|
||||
__copyright__ = "Copyright (C) 2023 Sven Sager"
|
||||
__license__ = "GPLv3"
|
||||
__license__ = "GPLv2"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -45,10 +45,6 @@ class Ui_diag_revpiinfo(object):
|
||||
self.lbl_version_pyload.setAlignment(QtCore.Qt.AlignCenter)
|
||||
self.lbl_version_pyload.setObjectName("lbl_version_pyload")
|
||||
self.gridLayout.addWidget(self.lbl_version_pyload, 3, 1, 1, 1)
|
||||
self.lbl_link = QtWidgets.QLabel(diag_revpiinfo)
|
||||
self.lbl_link.setOpenExternalLinks(True)
|
||||
self.lbl_link.setObjectName("lbl_link")
|
||||
self.gridLayout.addWidget(self.lbl_link, 6, 0, 1, 1)
|
||||
self.btn_box = QtWidgets.QDialogButtonBox(diag_revpiinfo)
|
||||
self.btn_box.setOrientation(QtCore.Qt.Horizontal)
|
||||
self.btn_box.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
|
||||
@@ -78,6 +74,11 @@ class Ui_diag_revpiinfo(object):
|
||||
self.gridLayout.addWidget(self.lbl_info, 4, 0, 1, 2)
|
||||
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
||||
self.gridLayout.addItem(spacerItem, 5, 0, 1, 1)
|
||||
self.lbl_link = QtWidgets.QLabel(diag_revpiinfo)
|
||||
self.lbl_link.setText("<html><head/><body><p><a href=\"https://revpimodio.org/\"><span style=\" text-decoration: underline; color:#0000ff;\">https://revpimodio.org/</span></a></p></body></html>")
|
||||
self.lbl_link.setOpenExternalLinks(True)
|
||||
self.lbl_link.setObjectName("lbl_link")
|
||||
self.gridLayout.addWidget(self.lbl_link, 6, 0, 1, 2)
|
||||
|
||||
self.retranslateUi(diag_revpiinfo)
|
||||
self.btn_box.accepted.connect(diag_revpiinfo.accept) # type: ignore
|
||||
@@ -89,13 +90,12 @@ class Ui_diag_revpiinfo(object):
|
||||
diag_revpiinfo.setWindowTitle(_translate("diag_revpiinfo", "Program information"))
|
||||
self.lbl_head.setText(_translate("diag_revpiinfo", "RevPi Python PLC - Commander"))
|
||||
self.lbl_lbl_version_pyload.setText(_translate("diag_revpiinfo", "RevPiPyLoad version on RevPi:"))
|
||||
self.lbl_link.setText(_translate("diag_revpiinfo", "<html><head/><body><p><a href=\"https://revpimodio.org/\"><span style=\" text-decoration: underline; color:#0000ff;\">https://revpimodio.org/</span></a></p></body></html>"))
|
||||
self.lbl_lbl_version_control.setText(_translate("diag_revpiinfo", "Version:"))
|
||||
self.lbl_info.setText(_translate("diag_revpiinfo", "RevPiModIO, RevPiPyLoad and RevPiPyControl are community driven projects. They are all free and open source software.\n"
|
||||
"All of them comes with ABSOLUTELY NO WARRANTY, to the extent permitted by\n"
|
||||
"applicable law.\n"
|
||||
"\n"
|
||||
"(c) Sven Sager, License: GPLv3"))
|
||||
"(c) Sven Sager, License: GPLv2"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -74,23 +74,23 @@ class Ui_diag_options(object):
|
||||
self.gb_server.setObjectName("gb_server")
|
||||
self.gridLayout_2 = QtWidgets.QGridLayout(self.gb_server)
|
||||
self.gridLayout_2.setObjectName("gridLayout_2")
|
||||
self.btn_aclplcslave = QtWidgets.QPushButton(self.gb_server)
|
||||
self.btn_aclplcslave.setObjectName("btn_aclplcslave")
|
||||
self.gridLayout_2.addWidget(self.btn_aclplcslave, 0, 1, 1, 1)
|
||||
self.btn_aclplcserver = QtWidgets.QPushButton(self.gb_server)
|
||||
self.btn_aclplcserver.setObjectName("btn_aclplcserver")
|
||||
self.gridLayout_2.addWidget(self.btn_aclplcserver, 0, 1, 1, 1)
|
||||
self.cbx_mqtt = QtWidgets.QCheckBox(self.gb_server)
|
||||
self.cbx_mqtt.setObjectName("cbx_mqtt")
|
||||
self.gridLayout_2.addWidget(self.cbx_mqtt, 2, 0, 1, 1)
|
||||
self.cbx_plcslave = QtWidgets.QCheckBox(self.gb_server)
|
||||
self.cbx_plcslave.setObjectName("cbx_plcslave")
|
||||
self.gridLayout_2.addWidget(self.cbx_plcslave, 0, 0, 1, 1)
|
||||
self.lbl_slave_status = QtWidgets.QLabel(self.gb_server)
|
||||
self.lbl_slave_status.setAlignment(QtCore.Qt.AlignCenter)
|
||||
self.lbl_slave_status.setObjectName("lbl_slave_status")
|
||||
self.gridLayout_2.addWidget(self.lbl_slave_status, 1, 1, 1, 1)
|
||||
self.lbl_lbl_slave_status = QtWidgets.QLabel(self.gb_server)
|
||||
self.lbl_lbl_slave_status.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
|
||||
self.lbl_lbl_slave_status.setObjectName("lbl_lbl_slave_status")
|
||||
self.gridLayout_2.addWidget(self.lbl_lbl_slave_status, 1, 0, 1, 1)
|
||||
self.cbx_plcserver = QtWidgets.QCheckBox(self.gb_server)
|
||||
self.cbx_plcserver.setObjectName("cbx_plcserver")
|
||||
self.gridLayout_2.addWidget(self.cbx_plcserver, 0, 0, 1, 1)
|
||||
self.lbl_server_status = QtWidgets.QLabel(self.gb_server)
|
||||
self.lbl_server_status.setAlignment(QtCore.Qt.AlignCenter)
|
||||
self.lbl_server_status.setObjectName("lbl_server_status")
|
||||
self.gridLayout_2.addWidget(self.lbl_server_status, 1, 1, 1, 1)
|
||||
self.lbl_lbl_server_status = QtWidgets.QLabel(self.gb_server)
|
||||
self.lbl_lbl_server_status.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
|
||||
self.lbl_lbl_server_status.setObjectName("lbl_lbl_server_status")
|
||||
self.gridLayout_2.addWidget(self.lbl_lbl_server_status, 1, 0, 1, 1)
|
||||
self.lbl_mqtt_status = QtWidgets.QLabel(self.gb_server)
|
||||
self.lbl_mqtt_status.setAlignment(QtCore.Qt.AlignCenter)
|
||||
self.lbl_mqtt_status.setObjectName("lbl_mqtt_status")
|
||||
@@ -141,11 +141,11 @@ class Ui_diag_options(object):
|
||||
self.cbx_autoreload.setText(_translate("diag_options", "Restart PLC program after exit or crash"))
|
||||
self.lbl_lbl_reset_driver_action.setText(_translate("diag_options", "PLC program behavior after piCtory driver reset clicked"))
|
||||
self.gb_server.setTitle(_translate("diag_options", "RevPiPyLoad server services"))
|
||||
self.btn_aclplcslave.setText(_translate("diag_options", "Edit ACL"))
|
||||
self.btn_aclplcserver.setText(_translate("diag_options", "Edit ACL"))
|
||||
self.cbx_mqtt.setText(_translate("diag_options", "MQTT process image publisher"))
|
||||
self.cbx_plcslave.setText(_translate("diag_options", "Start RevPi piControl server"))
|
||||
self.lbl_slave_status.setText(_translate("diag_options", "status"))
|
||||
self.lbl_lbl_slave_status.setText(_translate("diag_options", "piControl server is:"))
|
||||
self.cbx_plcserver.setText(_translate("diag_options", "Start RevPi piControl server"))
|
||||
self.lbl_server_status.setText(_translate("diag_options", "status"))
|
||||
self.lbl_lbl_server_status.setText(_translate("diag_options", "piControl server is:"))
|
||||
self.lbl_mqtt_status.setText(_translate("diag_options", "status"))
|
||||
self.lbl_lbl_mqtt_status.setText(_translate("diag_options", "MQTT publish service is:"))
|
||||
self.btn_mqtt.setText(_translate("diag_options", "Settings"))
|
||||
|
||||
@@ -63,16 +63,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="lbl_link">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><a href="https://revpimodio.org/"><span style=" text-decoration: underline; color:#0000ff;">https://revpimodio.org/</span></a></p></body></html></string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0" colspan="3">
|
||||
<widget class="QDialogButtonBox" name="btn_box">
|
||||
<property name="orientation">
|
||||
@@ -127,7 +117,7 @@
|
||||
All of them comes with ABSOLUTELY NO WARRANTY, to the extent permitted by
|
||||
applicable law.
|
||||
|
||||
(c) Sven Sager, License: GPLv3</string>
|
||||
(c) Sven Sager, License: GPLv2</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
@@ -147,6 +137,16 @@ applicable law.
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QLabel" name="lbl_link">
|
||||
<property name="text">
|
||||
<string notr="true"><html><head/><body><p><a href="https://revpimodio.org/"><span style=" text-decoration: underline; color:#0000ff;">https://revpimodio.org/</span></a></p></body></html></string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="1">
|
||||
<widget class="QPushButton" name="btn_aclplcslave">
|
||||
<widget class="QPushButton" name="btn_aclplcserver">
|
||||
<property name="text">
|
||||
<string>Edit ACL</string>
|
||||
</property>
|
||||
@@ -163,14 +163,14 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QCheckBox" name="cbx_plcslave">
|
||||
<widget class="QCheckBox" name="cbx_plcserver">
|
||||
<property name="text">
|
||||
<string>Start RevPi piControl server</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="lbl_slave_status">
|
||||
<widget class="QLabel" name="lbl_server_status">
|
||||
<property name="text">
|
||||
<string>status</string>
|
||||
</property>
|
||||
@@ -180,7 +180,7 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="lbl_lbl_slave_status">
|
||||
<widget class="QLabel" name="lbl_lbl_server_status">
|
||||
<property name="text">
|
||||
<string>piControl server is:</string>
|
||||
</property>
|
||||
|
||||
Reference in New Issue
Block a user